From 91d80b3031f0b318e0af0832d30ea75e9f96d68b Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 21 Nov 2011 22:09:57 +0000 Subject: [PATCH] Respect PKG_CONFIG env var when building. Package-Manager: portage-2.2.0_alpha75/cvs/Linux x86_64 --- sci-geosciences/gpsd/ChangeLog | 6 ++- sci-geosciences/gpsd/Manifest | 11 +++-- .../gpsd/files/gpsd-3.3-pkg-config.patch | 49 +++++++++++++++++++ sci-geosciences/gpsd/gpsd-3.3.ebuild | 5 +- 4 files changed, 63 insertions(+), 8 deletions(-) create mode 100644 sci-geosciences/gpsd/files/gpsd-3.3-pkg-config.patch diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog index b09049f0cd1a..73aa9fd94c26 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.74 2011/11/20 06:59:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.75 2011/11/21 22:09:57 vapier Exp $ + + 21 Nov 2011; Mike Frysinger gpsd-3.3.ebuild, + +files/gpsd-3.3-pkg-config.patch: + Respect PKG_CONFIG env var when building. *gpsd-3.3 (20 Nov 2011) diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest index 88e670ae2960..a6369c9ef04d 100644 --- a/sci-geosciences/gpsd/Manifest +++ b/sci-geosciences/gpsd/Manifest @@ -6,6 +6,7 @@ AUX 2.95-fix-ldflags.patch 721 RMD160 4be1b2ea581d8aef35896acd9098bc298b3199ad S AUX 2.96-fix-ldflags.patch 1000 RMD160 a1d4fa399bf9dee71b7adebd2ed2f01d39e7c4f7 SHA1 05530775b53cd5f60f619af8d95499822b42c779 SHA256 a83e03fa5b7b4286724339f44d4933427b7e80cea82887a89a0a7b9cd665a8df AUX 2.96-fix-tests.patch 944 RMD160 c04e257c4aec8147f24d5c8f1850718f3756f128 SHA1 bcba7823b35a8bb487d93ce875bae32131ae9e10 SHA256 2dced865a8a8951855b9ee8fc5586aa9be3f0c7513c8299c4632ca32a31d2074 AUX 2.96-pkgconfig.patch 1377 RMD160 20ff8e65763981f4f7075dc0a86764bd02017d75 SHA1 203172648b7b1e16e3b28a5815238adf4649a1fc SHA256 8b20899afd3e0e391664461ef359eef1ed6bfc49ba633c90e683178637359e15 +AUX gpsd-3.3-pkg-config.patch 1925 RMD160 eeae061c8e807ada8f736d89e3146847bc9a1d47 SHA1 a0dcf519bab808af1675b84171997eaf620b2073 SHA256 1b97692277e94969c547e3cb35185554655500ebbab2e84467456a0c03a1bc79 AUX gpsd-3.3-release-rev.patch 1206 RMD160 4db37f9d998cc56c32cb1deb0679dd9ba11c0f21 SHA1 e7e3e0a1fda9fd55ea5c0c86ecdcd33972840b79 SHA256 37688ad979c9915e25952f461fefa313682e3f62b8093a7b5205e1e9164df2e5 AUX gpsd-3.3-setup.py 448 RMD160 3b06265cde87612040ef2955f097fe2b87b433a7 SHA1 e8d1b510aed5b6c267b92c059ceaef255ce0756f SHA256 3a8f18f7f1e957c1b33ea25046dc4116422d087dd9f880f7bf2ad8fd0153f4c4 AUX gpsd-3.3-udev-install.patch 970 RMD160 1ed13da680ba245f7bb34b14754c27fcce99a479 SHA1 e274a7eda8690658a65305f133bc84f91055784d SHA256 d0e10f7655e010d33309251ddda6157957c3d05bfc22e24124920a8fbf51413a @@ -16,13 +17,13 @@ DIST gpsd-2.96bis.tar.gz 1554605 RMD160 ea09b73709627f95470dbd023e5ffc48209fde6a DIST gpsd-3.3.tar.gz 1401206 RMD160 73442e2bccac87a7ba4349ec63c443edbf05a131 SHA1 82a2ffe825c30c2152f2696221dbeeb82a4e9dd5 SHA256 1dbc1813f94f7f05fbf3341bf0154bae26903d1fb90c33b63d5458373ea931b9 EBUILD gpsd-2.95-r1.ebuild 2674 RMD160 3cfe82ffac9f57d771b6728420d106debd49c22e SHA1 86ba4ecde7158a24c535675036f638c9f6683ecc SHA256 d8e81c1b8b9531fc59ea1c9da7710c76c23802faec8e6d404732ed557058ed7b EBUILD gpsd-2.96-r1.ebuild 2840 RMD160 75cc21a587c3ef12bb891f8a2dc7ee30fa7cfb1f SHA1 bdf8663fb324ca8ddbe81b58348d12b6a03174ca SHA256 04bab92bbe716753ff6bcd719fa958e32440e7bcc219c6d409936edda0fed695 -EBUILD gpsd-3.3.ebuild 4006 RMD160 4b789b7576d1f231e11ff2192f98e78bfb16bc8d SHA1 afb232c4dfe43caefa03346fb7dd1f4e77a4a073 SHA256 2108b05fa369d546fc96a15aef3a49173b0acf2a2f49fce643c586e5fd1e294d -MISC ChangeLog 13900 RMD160 43eb545dc1e51ed785be81f9af816d6fa6e1d13b SHA1 9046b39a6a46fa7327e82a326a9487e6b196ebd2 SHA256 f9ccd9c9c7555a2f54b8fee8fcdfa8a470e53d38f044f7020e144e4b45425f18 +EBUILD gpsd-3.3.ebuild 4061 RMD160 e76099e250f81fa9d62955e3989be3c68c386003 SHA1 27bebea5a6e0ba9fa1ebc8851ec91d9350cd7b66 SHA256 0cef3d40eca5b3dfcad4304f9e9e46c106817757ebec8a2e20ba9e4985206e7d +MISC ChangeLog 14048 RMD160 5c6c58b6f34d3e6fcc7f5308bc3a0dd22f729a87 SHA1 1cfea0742e460e502a17aef4e029b1a3cf90ef51 SHA256 5215d03337b850b5ff85f416cf0759679c4bd372d2c0cbbee460e21eea20261f MISC metadata.xml 572 RMD160 405fe380fe1257019ea02155b4f3c5316cb38380 SHA1 3a4945cdf750d48c8468650c1218c22f77872ccd SHA256 602da5f9768c2f0866c924db204baff61765479af03c71cfe3ae99ed8df7d436 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk7IpToACgkQaC/OocHi7Ja2jQD+P8n6YpX0abI85O2FQpopAmJj -7DZ3BD6yQ1zRpSK8tNsA/RUhOEFbQ9Z/mGFM142Tz0pvzqk/kThosFtBTUYivxfR -=xOQr +iF4EAREIAAYFAk7KzDwACgkQaC/OocHi7JYOgwD/S8TUDs6kmUGuiOfOXKEVpVCT +eLrSq7uvMonAUycSxsEA/iBpkQUqHOop9U7BPZuCFdFti3x+90i/qfSBdDOIQle7 +=giej -----END PGP SIGNATURE----- diff --git a/sci-geosciences/gpsd/files/gpsd-3.3-pkg-config.patch b/sci-geosciences/gpsd/files/gpsd-3.3-pkg-config.patch new file mode 100644 index 000000000000..0bb4b3c8e0aa --- /dev/null +++ b/sci-geosciences/gpsd/files/gpsd-3.3-pkg-config.patch @@ -0,0 +1,49 @@ +From b6ef265b49d973acc2295f46f0518e0644ba7dbb Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Mon, 21 Nov 2011 16:05:27 -0500 +Subject: [PATCH] respect PKG_CONFIG in the build env + +Signed-off-by: Mike Frysinger +--- + SConstruct | 9 +++++---- + 1 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/SConstruct b/SConstruct +index cb578fe..5bb0fed 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -214,8 +214,9 @@ env['PYTHON'] = sys.executable + # explicitly quote them or (better yet) use the "=" form of GNU option + # settings. + env['STRIP'] = "strip" ++env['PKG_CONFIG'] = "pkg-config" + env['CHRPATH'] = 'chrpath' +-for i in ["AR", "ARFLAGS", "CCFLAGS", "CFLAGS", "CC", "CXX", "CXXFLAGS", "STRIP", "CHRPATH", "LD", "TAR"]: ++for i in ["AR", "ARFLAGS", "CCFLAGS", "CFLAGS", "CC", "CXX", "CXXFLAGS", "STRIP", "PKG_CONFIG", "CHRPATH", "LD", "TAR"]: + if os.environ.has_key(i): + j = i + if i == "LD": +@@ -407,9 +408,9 @@ cxx = config.CheckCXX() + # define a helper function for pkg-config - we need to pass + # --static for static linking, too. + if env["shared"]: +- pkg_config = lambda pkg: ['!pkg-config --cflags --libs %s' %(pkg, )] ++ pkg_config = lambda pkg: ['!%s --cflags --libs %s' %(env['PKG_CONFIG'], pkg, )] + else: +- pkg_config = lambda pkg: ['!pkg-config --cflags --libs --static %s' %(pkg, )] ++ pkg_config = lambda pkg: ['!%s --cflags --libs --static %s' %(env['PKG_CONFIG'], pkg, )] + + # GCC isn't always named gcc, alas. + if env['CC'] == 'gcc' or (sys.platform.startswith('freebsd') and env['CC'] == 'cc'): +@@ -339,7 +340,7 @@ if "help" in ARGLIST: + + def CheckPKG(context, name): + context.Message( 'Checking for %s... ' % name ) +- ret = context.TryAction('pkg-config --exists \'%s\'' % name)[0] ++ ret = context.TryAction('%s --exists \'%s\'' % (env['PKG_CONFIG'], name))[0] + context.Result( ret ) + return ret + +-- +1.7.6.1 + diff --git a/sci-geosciences/gpsd/gpsd-3.3.ebuild b/sci-geosciences/gpsd/gpsd-3.3.ebuild index 3d2ffa32c9c9..863c2316ca53 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.1 2011/11/20 06:59:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-3.3.ebuild,v 1.2 2011/11/21 22:09:57 vapier Exp $ EAPI="4" @@ -52,6 +52,7 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}"/${P}-release-rev.patch epatch "${FILESDIR}"/${P}-udev-install.patch + epatch "${FILESDIR}"/${P}-pkg-config.patch # Avoid useless -L paths to the install dir sed -i \ @@ -108,7 +109,7 @@ src_configure() { src_compile() { export CHRPATH=true - tc-export CC CXX + tc-export CC CXX PKG_CONFIG export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS} escons -- 2.26.2