Respect CFLAGS and LDFLAGS set by user.

Package-Manager: portage-2.1_pre6-r4

4 files changed, 46 insertions, 13 deletions

diff --git a/app-arch/xar/ChangeLog b/app-arch/xar/ChangeLog
index 83329fe5b36e..3a5b0a765ee6 100644
--- a/app-arch/xar/ChangeLog
+++ b/app-arch/xar/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/xar
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xar/ChangeLog,v 1.2 2005/06/28 18:24:48 flameeyes Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xar/ChangeLog,v 1.3 2006/03/19 18:18:12 flameeyes Exp $
+
+  19 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/xar-20050423-ldflags.patch, xar-20050423.ebuild:
+  Respect CFLAGS and LDFLAGS set by user.
 
   28 Jun 2005; Diego Pettenò <flameeyes@gentoo.org>
   +files/xar-20050423-amd64.patch, xar-20050423.ebuild:
diff --git a/app-arch/xar/Manifest b/app-arch/xar/Manifest
index ea8d90fd7878..dac08d3447b4 100644
--- a/app-arch/xar/Manifest
+++ b/app-arch/xar/Manifest
@@ -1,15 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 28738e856a3bdd2261ed6f5f8d1da385 ChangeLog 637
-MD5 66261856e93724759f19cabcb0e3e3cc metadata.xml 933
-MD5 71b1a6334b454938ef2d309aaf24d2b3 xar-20050423.ebuild 1084
+MD5 09f19252aa87c8dca26e2feec632977a ChangeLog 791
+RMD160 84d210eeb5990aabf86c05559c96799c8bf24728 ChangeLog 791
+SHA256 c1617f5d558498cd5c08b2d73f609d06888993aefc8ab6b875079aa840de07a9 ChangeLog 791
 MD5 659c72ad6f5348b02f615073bc38f5f8 files/digest-xar-20050423 64
+RMD160 5228ad4de958192ea67a06be783dd11e68354a39 files/digest-xar-20050423 64
+SHA256 c9b010f84f60aa2eb3bdea5dc7dcc9a578df382e5ec400011ba0276984e1dc89 files/digest-xar-20050423 64
 MD5 685993b8b4270f7252084973decaba3d files/xar-20050423-amd64.patch 982
+RMD160 203e2cfc8be3e6b07a68a919bb5318506be75917 files/xar-20050423-amd64.patch 982
+SHA256 be48ad77795afcdedff4bcace93f4853e4042e4fce14b47593226ef8df9234c0 files/xar-20050423-amd64.patch 982
+MD5 5c08904b0beefe5dfb9aea1d33f01843 files/xar-20050423-ldflags.patch 691
+RMD160 072ed46312ff1672acea58299fc753242673921e files/xar-20050423-ldflags.patch 691
+SHA256 c9e7549cc1ebcad378c94b345e0b2b27ac2d52770db4fb1a5e9b555e3ba53d42 files/xar-20050423-ldflags.patch 691
+MD5 66261856e93724759f19cabcb0e3e3cc metadata.xml 933
+RMD160 ec897b05f2ceba6a2679fb3308ac70ad7a894d2b metadata.xml 933
+SHA256 6407af4e8e004341b5034c0728c2d99f632b7aa4bdb9f6ce2e90473ae67f8b62 metadata.xml 933
+MD5 de4a26dae555db24f4570b55a6d43b46 xar-20050423.ebuild 1207
+RMD160 24601a7c74376702936efb5290266088d7a64147 xar-20050423.ebuild 1207
+SHA256 f55a1a228eaa1a67a2b254fb54d2e054a1d35f9b63284b42b64b8e6712c5e933 xar-20050423.ebuild 1207
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFCwZYTj5H05b2HAEkRAhJ8AJ0b2TmVpBelU7pzwBpaY9YO999yMwCfajil
-OoiC+VkYVoI7eEPBRlqCEQc=
-=Iz9i
+iD8DBQFEHaCdAiZjviIA2XgRAs8hAJ9RdofwQGjuU+sPRoYlBUUbXPlG4wCeNhkk
+DyDF5FxvtKOwSO9XH2M1Gl0=
+=XB0N
 -----END PGP SIGNATURE-----
diff --git a/app-arch/xar/files/xar-20050423-ldflags.patch b/app-arch/xar/files/xar-20050423-ldflags.patch
new file mode 100644
index 000000000000..cb715da690b0
--- /dev/null
+++ b/app-arch/xar/files/xar-20050423-ldflags.patch
@@ -0,0 +1,13 @@
+Index: xar-20050423/platform.m4
+===================================================================
+--- xar-20050423.orig/platform.m4
++++ xar-20050423/platform.m4
+@@ -927,7 +927,7 @@ AC_DEFUN(SC_CONFIG_BUILD, [
+         LIB_SUFFIX=${SHARED_LIB_SUFFIX}
+ 	LIB_FILE='${LIB_NAME}.${LIB_SUFFIX}'
+ 	if test "x${MAKE_LIB}" = "x"; then
+-	    MAKE_LIB='${SHLIB_LD} -o [$]@ ${SHLIB_LD_FLAGS} ${LIB_OBJS} ${SHLIB_LD_LIBS} ${SHLIB_LD_EXTRAS}'
++	    MAKE_LIB='${SHLIB_LD} ${LDFLAGS} -o [$]@ ${SHLIB_LD_FLAGS} ${LIB_OBJS} ${SHLIB_LD_LIBS} ${SHLIB_LD_EXTRAS}'
+ 	fi
+ 	if test "x${SYMLINK_LIB}" = "x"; then
+ 	    SYMLINK_LIB='rm -f $(LIB_NAME)$(SHLIB_SUFFIX); ${LN_S} $(LIB_FILE) ${LIB_NAME}${SHLIB_SUFFIX}'
diff --git a/app-arch/xar/xar-20050423.ebuild b/app-arch/xar/xar-20050423.ebuild
index 952a39f3f407..fba748859c97 100644
--- a/app-arch/xar/xar-20050423.ebuild
+++ b/app-arch/xar/xar-20050423.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xar/xar-20050423.ebuild,v 1.2 2005/06/28 18:24:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xar/xar-20050423.ebuild,v 1.3 2006/03/19 18:18:12 flameeyes Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic autotools
 
 DESCRIPTION="The XAR project aims to provide an easily extensible archive format."
 HOMEPAGE="http://www.opendarwin.org/projects/xar/"
@@ -23,6 +23,9 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-amd64.patch
+	epatch "${FILESDIR}/${P}-ldflags.patch"
+
+	eautoreconf
 }
 
 src_compile() {
@@ -35,7 +38,7 @@ src_compile() {
 	unset SYMLINK_LIB
 
 	econf ${myconf} || die
-	emake || die
+	emake CFLAGS_OPTIMIZE="${CFLAGS}" LDFLAGS_OPTIMIZE="${LDFLAGS}" || die
 }
 
 src_install() {