diff options
| author | obache <obache@pkgsrc.org> | 2014-08-23 07:46:38 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2014-08-23 07:46:38 +0000 |
| commit | 1fe09528c0a6d1cdb4dfb5de0fc61183becd3d1c (patch) | |
| tree | 81f486e3b49ebe62a8192accd5436ad58486cccd /devel/flex/patches | |
| parent | 2fcc63356a442b1aaa9c5d65a2628a419345b9ac (diff) | |
| download | pkgsrc-1fe09528c0a6d1cdb4dfb5de0fc61183becd3d1c.tar.gz | |
Prevent libfi to be linked with libintl.
Gettext is just used in flex tool, not in library.
Bump PKGREVISION.
Diffstat (limited to 'devel/flex/patches')
| -rw-r--r-- | devel/flex/patches/patch-Makefile.am | 39 | ||||
| -rw-r--r-- | devel/flex/patches/patch-ab | 23 |
2 files changed, 59 insertions, 3 deletions
diff --git a/devel/flex/patches/patch-Makefile.am b/devel/flex/patches/patch-Makefile.am new file mode 100644 index 00000000000..92900d1fdf0 --- /dev/null +++ b/devel/flex/patches/patch-Makefile.am @@ -0,0 +1,39 @@ +$NetBSD: patch-Makefile.am,v 1.1 2014/08/23 07:46:38 obache Exp $ + +* Prevent libfi to be linked with libintl. +* Avoid -no-undefined flags, or missing symbols might occur. + +--- Makefile.am.orig 2014-03-26 12:46:44.000000000 +0000 ++++ Makefile.am +@@ -67,19 +67,19 @@ flex_SOURCES = \ + 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 \ +@@ -124,7 +124,7 @@ SUBDIRS = \ + + localedir = $(datadir)/locale + AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl +-LIBS = @LIBINTL@ @LIBS@ ++LIBS = @LIBS@ + + skel.c: flex.skl mkskel.sh flexint.h tables_shared.h + sed 's/m4_/m4postproc_/g; s/m4preproc_/m4_/g' $(srcdir)/flex.skl | $(m4) -P -DFLEX_MAJOR_VERSION=`echo $(VERSION)|cut -f 1 -d .` -DFLEX_MINOR_VERSION=`echo $(VERSION)|cut -f 2 -d .` -DFLEX_SUBMINOR_VERSION=`echo $(VERSION)|cut -f 3 -d .` | sed 's/m4postproc_/m4_/g' | $(SHELL) $(srcdir)/mkskel.sh >skel.c diff --git a/devel/flex/patches/patch-ab b/devel/flex/patches/patch-ab index 6f82e19f878..8618efb3091 100644 --- a/devel/flex/patches/patch-ab +++ b/devel/flex/patches/patch-ab @@ -1,6 +1,8 @@ -$NetBSD: patch-ab,v 1.6 2014/04/17 16:44:30 adam Exp $ +$NetBSD: patch-ab,v 1.7 2014/08/23 07:46:38 obache Exp $ -Avoid -no-undefined flags, or missing symbols might occur. +* 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 @@ -13,7 +15,22 @@ Avoid -no-undefined flags, or missing symbols might occur. flex_LDADD = $(LDADD) flex_DEPENDENCIES = lib/libcompat.la DEFAULT_INCLUDES = -I.@am__isrc@ -@@ -435,12 +435,12 @@ libfl_la_SOURCES = \ +@@ -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 |