diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-11-22 18:52:30 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-11-22 18:52:30 +0000 |
| commit | 04e6fb8b543ef41d99b2f4ce3cc652a6b5d38060 (patch) | |
| tree | 6bff7d34e798d584930293dbb4210c6ed896d55a /sci-geosciences | |
| parent | Move remind from x11-misc to app-misc (#391221) (diff) | |
| download | gentoo-2-04e6fb8b543ef41d99b2f4ce3cc652a6b5d38060.tar.gz gentoo-2-04e6fb8b543ef41d99b2f4ce3cc652a6b5d38060.tar.bz2 gentoo-2-04e6fb8b543ef41d99b2f4ce3cc652a6b5d38060.zip | |
QA: fix handling of LDFLAGS.
(Portage version: 2.2.0_alpha76/cvs/Linux x86_64)
Diffstat (limited to 'sci-geosciences')
| -rw-r--r-- | sci-geosciences/gpsd/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-geosciences/gpsd/files/gpsd-3.3-ldflags.patch | 13 | ||||
| -rw-r--r-- | sci-geosciences/gpsd/gpsd-3.3.ebuild | 3 |
3 files changed, 20 insertions, 2 deletions
diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog index 820f756c6ac9..50cb44766a2e 100644 --- a/sci-geosciences/gpsd/ChangeLog +++ b/sci-geosciences/gpsd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-geosciences/gpsd # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.76 2011/11/22 15:54:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.77 2011/11/22 18:52:30 flameeyes Exp $ + + 22 Nov 2011; Diego E. Pettenò <flameeyes@gentoo.org> + +files/gpsd-3.3-ldflags.patch, gpsd-3.3.ebuild: + QA: fix handling of LDFLAGS. 22 Nov 2011; Mike Frysinger <vapier@gentoo.org> gpsd-3.3.ebuild: Replace STAGING_PREFIX with SYSROOT. diff --git a/sci-geosciences/gpsd/files/gpsd-3.3-ldflags.patch b/sci-geosciences/gpsd/files/gpsd-3.3-ldflags.patch new file mode 100644 index 000000000000..3fa23aee64ad --- /dev/null +++ b/sci-geosciences/gpsd/files/gpsd-3.3-ldflags.patch @@ -0,0 +1,13 @@ +Index: gpsd-3.3/SConstruct +=================================================================== +--- gpsd-3.3.orig/SConstruct ++++ gpsd-3.3/SConstruct +@@ -214,7 +214,7 @@ for i in ["AR", "ARFLAGS", "CCFLAGS", "C + env.Replace(**{j: os.getenv(i)}) + for flags in ["LDFLAGS", "LINKFLAGS", "SHLINKFLAGS", "CPPFLAGS"]: + if os.environ.has_key(flags): +- env.MergeFlags({flags : [os.getenv(flags)]}) ++ env.MergeFlags({flags : Split(os.getenv(flags))}) + + + # Placeholder so we can kluge together something like VPATH builds. diff --git a/sci-geosciences/gpsd/gpsd-3.3.ebuild b/sci-geosciences/gpsd/gpsd-3.3.ebuild index 5a7c27cfaecc..9cb9965f5fe7 100644 --- a/sci-geosciences/gpsd/gpsd-3.3.ebuild +++ b/sci-geosciences/gpsd/gpsd-3.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-3.3.ebuild,v 1.3 2011/11/22 15:54:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-3.3.ebuild,v 1.4 2011/11/22 18:52:30 flameeyes Exp $ EAPI="4" @@ -53,6 +53,7 @@ src_prepare() { epatch "${FILESDIR}"/${P}-release-rev.patch epatch "${FILESDIR}"/${P}-udev-install.patch epatch "${FILESDIR}"/${P}-pkg-config.patch + epatch "${FILESDIR}"/${P}-ldflags.patch # Avoid useless -L paths to the install dir sed -i \ |