Add patch to respect LDFLAGS while building shared libraries.

(Portage version: 2.1_pre6-r3)

3 files changed, 87 insertions, 2 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 523d7752dca8..cca21a451282 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/cups
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.159 2006/02/07 03:03:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.160 2006/03/18 21:10:59 flameeyes Exp $
+
+  18 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/cups-1.1.23-respectldflags.patch, cups-1.1.23-r7.ebuild:
+  Add patch to respect LDFLAGS while building shared libraries.
 
   07 Feb 2006; Aron Griffis <agriffis@gentoo.org> cups-1.1.23-r7.ebuild:
   Mark 1.1.23-r7 stable on alpha
diff --git a/net-print/cups/cups-1.1.23-r7.ebuild b/net-print/cups/cups-1.1.23-r7.ebuild
index 80a7f4999a82..702db660db6d 100644
--- a/net-print/cups/cups-1.1.23-r7.ebuild
+++ b/net-print/cups/cups-1.1.23-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.23-r7.ebuild,v 1.13 2006/02/07 03:03:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.23-r7.ebuild,v 1.14 2006/03/18 21:10:59 flameeyes Exp $
 
 inherit eutils flag-o-matic pam autotools
 
@@ -50,6 +50,7 @@ src_unpack() {
 	epatch ${FILESDIR}/cups-gentooalt.patch
 	epatch ${FILESDIR}/${P}-bindnow.patch
 	epatch ${FILESDIR}/cupsaddsmb.patch
+	epatch ${FILESDIR}/${P}-respectldflags.patch
 	eautoconf
 
 	# disable builtin xpdf
diff --git a/net-print/cups/files/cups-1.1.23-respectldflags.patch b/net-print/cups/files/cups-1.1.23-respectldflags.patch
new file mode 100644
index 000000000000..073000f2f9a5
--- /dev/null
+++ b/net-print/cups/files/cups-1.1.23-respectldflags.patch
@@ -0,0 +1,80 @@
+Index: cups-1.1.23/cups/Makefile
+===================================================================
+--- cups-1.1.23.orig/cups/Makefile
++++ cups-1.1.23/cups/Makefile
+@@ -109,7 +109,7 @@ installhdrs:
+ 
+ libcups.so.2 libcups.sl.2:	$(LIBOBJS) ../Makedefs
+ 	echo Linking $@...
+-	$(DSO) $(DSOFLAGS) -o $@ $(LIBOBJS) $(SSLLIBS) $(COMMONLIBS)
++	$(DSO) $(LDFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(SSLLIBS) $(COMMONLIBS)
+ 	$(RM) `basename $@ .2`
+ 	$(LN) $@ `basename $@ .2`
+ 
+@@ -120,7 +120,7 @@ libcups.so.2 libcups.sl.2:	$(LIBOBJS) ..
+ 
+ libcups.2.dylib:	$(LIBOBJS) ../Makedefs
+ 	echo Linking $@...
+-	$(DSO) $(DSOFLAGS) -o $@ \
++	$(DSO) $(LDFLAGS) $(DSOFLAGS) -o $@ \
+ 		-install_name $(libdir)/$@ \
+ 		-current_version 2.7.0 \
+ 		-compatibility_version 2.0.0 \
+@@ -137,7 +137,7 @@ libcups_s.a:	$(LIBOBJS) ../Makedefs
+ 	echo Creating $@...
+ 	$(RM) libcups_s.exp
+ 	(echo _ipp_add_attr; echo _ipp_free_attr) >libcups_s.exp
+-	$(DSO) $(DSOFLAGS) -Wl,-bexport:libcups_s.exp -o libcups_s.o $(LIBOBJS) $(SSLLIBS) $(COMMONLIBS) -lm
++	$(DSO) $(LDFLAGS) $(DSOFLAGS) -Wl,-bexport:libcups_s.exp -o libcups_s.o $(LIBOBJS) $(SSLLIBS) $(COMMONLIBS) -lm
+ 	$(RM) $@
+ 	$(AR) $(ARFLAGS) $@ libcups_s.o
+ 
+@@ -148,7 +148,7 @@ libcups_s.a:	$(LIBOBJS) ../Makedefs
+ 
+ libcups.la:    $(LIBOBJS) ../Makedefs
+ 	echo Linking $@...
+-	$(DSO) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
++	$(DSO) $(LDFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
+ 		-version-info 2:7 $(SSLLIBS) $(COMMONLIBS)
+ 
+ 
+Index: cups-1.1.23/filter/Makefile
+===================================================================
+--- cups-1.1.23.orig/filter/Makefile
++++ cups-1.1.23/filter/Makefile
+@@ -130,7 +130,7 @@ hpgltops:	$(HPGLOBJS) common.o ../Makede
+ 
+ libcupsimage.so.2 libcupsimage.sl.2:	$(IMAGEOBJS) ../Makedefs
+ 	echo Linking $@...
+-	$(DSO) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) -lm
++	$(DSO) $(LDFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) -lm
+ 	$(RM) `basename $@ .2`
+ 	$(LN) $@ `basename $@ .2`
+ 
+@@ -141,7 +141,7 @@ libcupsimage.so.2 libcupsimage.sl.2:	$(I
+ 
+ libcupsimage.2.dylib:	$(IMAGEOBJS) ../Makedefs
+ 	echo Linking $@...
+-	$(DSO) $(DSOFLAGS) -o $@  \
++	$(DSO) $(LDFLAGS) $(DSOFLAGS) -o $@  \
+ 		-install_name $(libdir)/$@ \
+ 		-current_version 2.1.0 \
+ 		-compatibility_version 2.0.0 \
+@@ -156,7 +156,7 @@ libcupsimage.2.dylib:	$(IMAGEOBJS) ../Ma
+ 
+ libcupsimage_s.a:	$(IMAGEOBJS) ../Makedefs
+ 	echo Linking $@...
+-	$(DSO) $(DSOFLAGS) -Wl,-berok -o libcupsimage_s.o $(IMAGEOBJS) \
++	$(DSO) $(LDFLAGS) $(DSOFLAGS) -Wl,-berok -o libcupsimage_s.o $(IMAGEOBJS) \
+ 		$(DSOLIBS) -lm
+ 	$(RM) $@
+ 	$(AR) $(ARFLAGS) $@ libcupsimage_s.o
+@@ -168,7 +168,7 @@ libcupsimage_s.a:	$(IMAGEOBJS) ../Makede
+ 
+ libcupsimage.la:       $(IMAGEOBJS) ../Makedefs
+ 	echo Linking $@...
+-	$(DSO) $(DSOFLAGS) -o $@ $(IMAGEOBJS:.o=.lo) $(DSOLIBS) \
++	$(DSO) $(LDFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS:.o=.lo) $(DSOLIBS) \
+ 		-rpath $(LIBDIR) -version-info 2:1
+ 
+