summaryrefslogtreecommitdiff
path: root/devel/flex/patches/patch-ab
blob: 8618efb3091c4913fc46012d838659c47dd10676 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
$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 \