Tue Oct 9 19:57:02 2012 UTC ()
editors/abiword: Fix linker flag bug

GCC 4.6+ does not tolerate flags starting with "--" like older versions
of GCC do.  These flags were meant to fall to the linker but starting
with GCC 4.6, they must be explicitly prefixed with "-Wl,"

Fixes the gcc 4.7.2 breakage on "--no-undefined".


(marino)
diff -r1.63 -r1.64 pkgsrc/editors/abiword/distinfo
diff -r0 -r1.1 pkgsrc/editors/abiword/patches/patch-src_Makefile.in
cvs diff -r1.63 -r1.64 pkgsrc/editors/abiword/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/abiword/distinfo 2012/05/03 06:16:42 1.63
+++ pkgsrc/editors/abiword/distinfo 2012/10/09 19:57:02 1.64
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1$NetBSD: distinfo,v 1.63 2012/05/03 06:16:42 wiz Exp $ 1$NetBSD: distinfo,v 1.64 2012/10/09 19:57:02 marino Exp $
2 2
3SHA1 (abiword-2.8.6.tar.gz) = 998f69d038000b3fc027d4259548f02d67c8d0df 3SHA1 (abiword-2.8.6.tar.gz) = 998f69d038000b3fc027d4259548f02d67c8d0df
4RMD160 (abiword-2.8.6.tar.gz) = caabab25d197f9553ea12376de36fc7f5a771a58 4RMD160 (abiword-2.8.6.tar.gz) = caabab25d197f9553ea12376de36fc7f5a771a58
5Size (abiword-2.8.6.tar.gz) = 9218827 bytes 5Size (abiword-2.8.6.tar.gz) = 9218827 bytes
6SHA1 (patch-aa) = dea737eb09e271f99e2b50f5ffc3037a68116451 6SHA1 (patch-aa) = dea737eb09e271f99e2b50f5ffc3037a68116451
7SHA1 (patch-ab) = fa589d531c08bf293eeeaa9a775015e27eaf6da4 7SHA1 (patch-ab) = fa589d531c08bf293eeeaa9a775015e27eaf6da4
8SHA1 (patch-ac) = a82fd781195e9ff52dbc33258fd4774cd23fe5c9 8SHA1 (patch-ac) = a82fd781195e9ff52dbc33258fd4774cd23fe5c9
9SHA1 (patch-ad) = 48ff4fcce593f9996e90cce718b2f774b271d5a3 9SHA1 (patch-ad) = 48ff4fcce593f9996e90cce718b2f774b271d5a3
10SHA1 (patch-ae) = ec3bb0a00100fea97f46b3a25440d7a4e46e30eb 10SHA1 (patch-ae) = ec3bb0a00100fea97f46b3a25440d7a4e46e30eb
11SHA1 (patch-af) = fc6927eb963c4be956825d1656e8957b358ed1ad 11SHA1 (patch-af) = fc6927eb963c4be956825d1656e8957b358ed1ad
12SHA1 (patch-goffice-bits_goffice_app_goffice-app.h) = 894647ea5d2176db1793673befe703f5be603278 12SHA1 (patch-goffice-bits_goffice_app_goffice-app.h) = 894647ea5d2176db1793673befe703f5be603278
13SHA1 (patch-plugins_bmp_xp_ie__impGraphic__BMP.cpp) = 65852f6f934c9fdf2aa9bf02d0a2ad66b5c2db09 13SHA1 (patch-plugins_bmp_xp_ie__impGraphic__BMP.cpp) = 65852f6f934c9fdf2aa9bf02d0a2ad66b5c2db09
14SHA1 (patch-plugins_garble_xp_abiword-garble-png.cpp) = c9b4b7030fa038da9ba37b5489d8d8571a0e6c77 14SHA1 (patch-plugins_garble_xp_abiword-garble-png.cpp) = c9b4b7030fa038da9ba37b5489d8d8571a0e6c77
15SHA1 (patch-sa) = 29ee7e9891b11773217ec73bbda01e2591e78b56 15SHA1 (patch-sa) = 29ee7e9891b11773217ec73bbda01e2591e78b56
 16SHA1 (patch-src_Makefile.in) = cbc7d5e042421b92aa2b1004b2a7d6ca8ea5346d
16SHA1 (patch-src_af_util_xp_ut__go__file.h) = 07a9d580ca9f6b5c1e8814d182d9f56d3f3a7e72 17SHA1 (patch-src_af_util_xp_ut__go__file.h) = 07a9d580ca9f6b5c1e8814d182d9f56d3f3a7e72
File Added: pkgsrc/editors/abiword/patches/Attic/patch-src_Makefile.in
$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