48 lines
1.3 KiB
Plaintext
48 lines
1.3 KiB
Plaintext
$NetBSD: patch-ab,v 1.7 2014/08/23 07:46:38 obache Exp $
|
|
|
|
* XXX:
|
|
* Prevent libfi to be linked with libintl.
|
|
* Avoid -no-undefined flags, or missing symbols might occur.
|
|
|
|
--- Makefile.in.orig 2014-03-26 18:58:57.000000000 +0000
|
|
+++ Makefile.in
|
|
@@ -165,7 +165,7 @@ am_flex_OBJECTS = ccl.$(OBJEXT) dfa.$(OB
|
|
options.$(OBJEXT) scanopt.$(OBJEXT) buf.$(OBJEXT) \
|
|
tables.$(OBJEXT) tables_shared.$(OBJEXT) filter.$(OBJEXT) \
|
|
regex.$(OBJEXT)
|
|
-flex_OBJECTS = $(am_flex_OBJECTS)
|
|
+flex_OBJECTS = $(am_flex_OBJECTS) $(LIBOBJS)
|
|
flex_LDADD = $(LDADD)
|
|
flex_DEPENDENCIES = lib/libcompat.la
|
|
DEFAULT_INCLUDES = -I.@am__isrc@
|
|
@@ -304,7 +304,7 @@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
|
|
LIBICONV = @LIBICONV@
|
|
LIBINTL = @LIBINTL@
|
|
LIBOBJS = @LIBOBJS@
|
|
-LIBS = @LIBINTL@ @LIBS@
|
|
+LIBS = @LIBS@
|
|
LIBTOOL = @LIBTOOL@
|
|
LIPO = @LIPO@
|
|
LN_S = @LN_S@
|
|
@@ -430,17 +430,17 @@ flex_SOURCES = \
|
|
filter.c \
|
|
regex.c
|
|
|
|
-LDADD = lib/libcompat.la
|
|
+LDADD = lib/libcompat.la @LIBINTL@
|
|
libfl_la_SOURCES = \
|
|
libmain.c \
|
|
libyywrap.c
|
|
|
|
-libfl_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@
|
|
+libfl_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
|
|
libfl_pic_la_SOURCES = \
|
|
libmain.c \
|
|
libyywrap.c
|
|
|
|
-libfl_pic_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@
|
|
+libfl_pic_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
|
|
noinst_HEADERS = \
|
|
flexdef.h \
|
|
flexint.h \
|