ports/161784: [PATCH] editors/abiword: Fix build with gcc46

[Christian Mangin]

>Number:         161784
>Category:       ports
>Synopsis:       [PATCH] editors/abiword: Fix build with gcc46
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 18 21:00:19 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Christian Mangin
>Release:        FreeBSD 8.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD titan 8.2-STABLE FreeBSD 8.2-STABLE #5: Thu Oct 6 12:36:11 EDT 2011 cmangin at titan:/usr/obj/usr/src/sys/TITAN amd64


>Description:
	This port fails to build with USE_GCC=4.6
>How-To-Repeat:
>Fix:

	Options passed to the linker must be preceded by -Wl,  
        Patch attached with submission.

--- patch.abiword begins here ---
diff -ruN abiword.orig/files/patch-src-Makefile.am abiword/files/patch-src-Makefile.am
--- abiword.orig/files/patch-src-Makefile.am	1969-12-31 19:00:00.000000000 -0500
+++ abiword/files/patch-src-Makefile.am	2011-10-18 15:06:00.869244000 -0400
@@ -0,0 +1,29 @@
+--- src/Makefile.am.orig	2011-10-18 13:46:11.340392408 -0400
++++ src/Makefile.am	2011-10-18 13:47:53.946366792 -0400
+@@ -44,7 +44,7 @@
+ 
+ libabiword_2_8_la_LDFLAGS = \
+ 	$(DEPS_LIBS) \
+-	--no-undefined \
++	-Wl,--no-undefined \
+ 	-avoid-version \
+ 	-export-dynamic
+ 
+@@ -107,7 +107,7 @@
+ 
+ AbiWord_LDFLAGS = \
+ 	$(DEPS_LIBS) \
+-	--no-undefined \
++	-Wl,--no-undefined \
+ 	-avoid-version \
+ 	-export-dynamic \
+ 	-headerpad_max_install_names 
+@@ -129,7 +129,7 @@
+ 
+ abiword_LDFLAGS = \
+ 	$(platform_ldflags) \
+-	--no-undefined      \
++	-Wl,--no-undefined  \
+ 	-avoid-version      \
+ 	-export-dynamic
+ 
diff -ruN abiword.orig/files/patch-src-Makefile.in abiword/files/patch-src-Makefile.in
--- abiword.orig/files/patch-src-Makefile.in	1969-12-31 19:00:00.000000000 -0500
+++ abiword/files/patch-src-Makefile.in	2011-10-18 15:06:00.868244000 -0400
@@ -0,0 +1,29 @@
+--- src/Makefile.in.orig	2011-10-18 13:46:19.263699367 -0400
++++ src/Makefile.in	2011-10-18 13:48:41.402205325 -0400
+@@ -500,7 +500,7 @@
+ 	$(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 \
+@@ -535,7 +535,7 @@
+ 
+ @TOOLKIT_COCOA_TRUE at AbiWord_LDFLAGS = \
+ @TOOLKIT_COCOA_TRUE@	$(DEPS_LIBS) \
+- at TOOLKIT_COCOA_TRUE@	--no-undefined \
++ at TOOLKIT_COCOA_TRUE@	-Wl,--no-undefined \
+ @TOOLKIT_COCOA_TRUE@	-avoid-version \
+ @TOOLKIT_COCOA_TRUE@	-export-dynamic \
+ @TOOLKIT_COCOA_TRUE@	-headerpad_max_install_names 
+@@ -551,7 +551,7 @@
+ 
+ @TOOLKIT_COCOA_FALSE at abiword_LDFLAGS = \
+ @TOOLKIT_COCOA_FALSE@	$(platform_ldflags) \
+- at TOOLKIT_COCOA_FALSE@	--no-undefined      \
++ at TOOLKIT_COCOA_FALSE@	-Wl,--no-undefined      \
+ @TOOLKIT_COCOA_FALSE@	-avoid-version      \
+ @TOOLKIT_COCOA_FALSE@	-export-dynamic
+ 
--- patch.abiword ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: