diff options
| -rw-r--r-- | editors/abiword/distinfo | 3 | ||||
| -rw-r--r-- | editors/abiword/patches/patch-src_Makefile.in | 34 |
2 files changed, 36 insertions, 1 deletions
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo index b645ab1a60d..e17754bb0a3 100644 --- a/editors/abiword/distinfo +++ b/editors/abiword/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.63 2012/05/03 06:16:42 wiz Exp $ +$NetBSD: distinfo,v 1.64 2012/10/09 19:57:02 marino Exp $ SHA1 (abiword-2.8.6.tar.gz) = 998f69d038000b3fc027d4259548f02d67c8d0df RMD160 (abiword-2.8.6.tar.gz) = caabab25d197f9553ea12376de36fc7f5a771a58 @@ -13,4 +13,5 @@ SHA1 (patch-goffice-bits_goffice_app_goffice-app.h) = 894647ea5d2176db1793673bef SHA1 (patch-plugins_bmp_xp_ie__impGraphic__BMP.cpp) = 65852f6f934c9fdf2aa9bf02d0a2ad66b5c2db09 SHA1 (patch-plugins_garble_xp_abiword-garble-png.cpp) = c9b4b7030fa038da9ba37b5489d8d8571a0e6c77 SHA1 (patch-sa) = 29ee7e9891b11773217ec73bbda01e2591e78b56 +SHA1 (patch-src_Makefile.in) = cbc7d5e042421b92aa2b1004b2a7d6ca8ea5346d SHA1 (patch-src_af_util_xp_ut__go__file.h) = 07a9d580ca9f6b5c1e8814d182d9f56d3f3a7e72 diff --git a/editors/abiword/patches/patch-src_Makefile.in b/editors/abiword/patches/patch-src_Makefile.in new file mode 100644 index 00000000000..644ab789df2 --- /dev/null +++ b/editors/abiword/patches/patch-src_Makefile.in @@ -0,0 +1,34 @@ +$NetBSD: patch-src_Makefile.in,v 1.1 2012/10/09 19:57:02 marino Exp $ + +GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall to +the linker. Prefix with "-Wl," to fix build. + +--- src/Makefile.in.orig 2012-10-09 18:55:25.000000000 +0000 ++++ src/Makefile.in +@@ -503,7 +503,7 @@ libabiword_2_8_la_CPPFLAGS = \ + $(WP_CPPFLAGS) \ + -DABIWORD_DATADIR="\"$(ABIWORD_DATADIR)\"" + +-libabiword_2_8_la_LDFLAGS = $(DEPS_LIBS) --no-undefined -avoid-version \ ++libabiword_2_8_la_LDFLAGS = $(DEPS_LIBS) -Wl,--no-undefined -avoid-version \ + -export-dynamic $(am__append_6) + libabiword_2_8_la_LIBADD = $(opt_libs) plugins/libplugins.la \ + text/fmt/xp/libxp.la text/ptbl/xp/libxp.la \ +@@ -538,7 +538,7 @@ WINDRES_CPPFLAGS = -I$(top_srcdir)/src/a + + @TOOLKIT_COCOA_TRUE@AbiWord_LDFLAGS = \ + @TOOLKIT_COCOA_TRUE@ $(DEPS_LIBS) \ +-@TOOLKIT_COCOA_TRUE@ --no-undefined \ ++@TOOLKIT_COCOA_TRUE@ -Wl,--no-undefined \ + @TOOLKIT_COCOA_TRUE@ -avoid-version \ + @TOOLKIT_COCOA_TRUE@ -export-dynamic \ + @TOOLKIT_COCOA_TRUE@ -headerpad_max_install_names +@@ -554,7 +554,7 @@ WINDRES_CPPFLAGS = -I$(top_srcdir)/src/a + + @TOOLKIT_COCOA_FALSE@abiword_LDFLAGS = \ + @TOOLKIT_COCOA_FALSE@ $(platform_ldflags) \ +-@TOOLKIT_COCOA_FALSE@ --no-undefined \ ++@TOOLKIT_COCOA_FALSE@ -Wl,--no-undefined \ + @TOOLKIT_COCOA_FALSE@ -avoid-version \ + @TOOLKIT_COCOA_FALSE@ -export-dynamic + |