From f6237bd0b3b6e3b0df8a10f8c24022872a0550d0 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 16 Feb 2015 11:28:49 +0000 Subject: [PATCH] Fix by Paul McClave to respect $PKG_CONFIG. Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0xD2E96200 --- net-libs/iojs/ChangeLog | 6 +- net-libs/iojs/Manifest | 31 +++++----- .../iojs/files/iojs-1.2.0-pkgconfig.patch | 56 +++++++++++++++++++ net-libs/iojs/iojs-1.2.0.ebuild | 6 +- 4 files changed, 81 insertions(+), 18 deletions(-) create mode 100644 net-libs/iojs/files/iojs-1.2.0-pkgconfig.patch diff --git a/net-libs/iojs/ChangeLog b/net-libs/iojs/ChangeLog index c156693dda75..ed2333b7666c 100644 --- a/net-libs/iojs/ChangeLog +++ b/net-libs/iojs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-libs/iojs # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/iojs/ChangeLog,v 1.6 2015/02/16 11:26:23 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/iojs/ChangeLog,v 1.7 2015/02/16 11:28:47 vapier Exp $ + + 16 Feb 2015; Mike Frysinger + +files/iojs-1.2.0-pkgconfig.patch, iojs-1.2.0.ebuild: + Fix by Paul McClave to respect $PKG_CONFIG. 16 Feb 2015; Mike Frysinger iojs-1.2.0.ebuild: Fix by Paul McClave to drop the v8 -D flag for x86 targets as configure does diff --git a/net-libs/iojs/Manifest b/net-libs/iojs/Manifest index 358be4262276..699f9f088f12 100644 --- a/net-libs/iojs/Manifest +++ b/net-libs/iojs/Manifest @@ -1,29 +1,30 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX iojs-1.2.0-pkgconfig.patch 1715 SHA256 da19714dc8dd0732a91433762351e4c23a0a65ad7a979486d4fbc68bfa1a832e SHA512 3e96be5ca5ad9447238eef506263584f47139e2d8b46c794c6b6f77491fb42187a182beccbad70f97f0fcd14750f501196a529066d0f1416947539a416c98153 WHIRLPOOL 3f9a942da04455fa95a2f2c52a6648874ea81d63de6b5161e5d0e20240e6512c438a445ec29622d355af7069f52f5c84ed9b5cb65d9846ff304295ec5e3d1451 DIST iojs-v1.0.4.tar.xz 12284732 SHA256 c902f5abbd59c56346680f0b4a71056c51610847b9576acf83a9c210bf664e98 SHA512 0e3d4f66fc7f64e09f999b1fdb7bbbfe80a5cfd0396ec718bf166ae44bcb27eebf5b59c3cd4a74f050b59ee529678b1bdef1c3b9d71534c8ac0ab8caf8472021 WHIRLPOOL cfd766a513877f6ccfddc4e1eb4e0be4fa987dbac7c7c8159f70556b72a01b26fdd7d92be3fcb7efc37691b6808c8d570199741f01f95df77dd9aa95312bac9e DIST iojs-v1.1.0.tar.xz 12309452 SHA256 2baa9b076c84c13b0572de4618ac94058fc98a87266925bcd18fb70fb7d521a7 SHA512 2a01632a5afa828ab3fcfc2bf44557a4aba5b150e3b4a7d66bc4c415f96c5cbe802bbfe6085d483a6fea75eae48b963892faf1e2f50f5ae291ee0fdbb87da912 WHIRLPOOL f6d9c3f93a11d29f4d0b2ec24141d80d195749e5625a0bcaddfed7fca271b311121bb29f83c7b591869aae327a5f36ef86f5f98844a8b924b0b30e8eece58a08 DIST iojs-v1.2.0.tar.xz 12327228 SHA256 d33b448d173a0df675c471d24a33db57208c30b3e30b8c49f3b1d0666178e9cb SHA512 2f42141d234f4ac468f6bc794a051338322b5d0709d2a54e8efd2b5180a5e6e5877cf727ecd2f0f20e8a504522ba938af5c0ed2b3d822a001bfb1e05d04eaed8 WHIRLPOOL a188242252ebd87a5e17a129e09751e49c36009f5bb818a0ad31828bfb7d1c3d397a61ca4fe1b91f10603fafcd1944afdd0c6fda9fef7610b8bee2afac518355 EBUILD iojs-1.0.4-r1.ebuild 3206 SHA256 884a98f1736ded1fdc73b076307054763eead3cbb69fb6198b7238832cfc6f46 SHA512 99519f8f678ada8dc6c25645866e382a5994cdb4d65792bfad43a3e2018599d02d2762d51b6b2961622b3eaf5da1c005bc78d762e506c92ed4045da8c6800a7d WHIRLPOOL 65edebb0c07bc39bdf00eb368f37a08e2c3e9e46bce29c4cb43942fc1e9cacc6e1e5ff39e89f3749a43b58c31636dbd9e1b7fccd703bdda7a852f078194ef3dc EBUILD iojs-1.0.4.ebuild 2944 SHA256 4a78febd3440bc5fa021312c3994e462e5da8ed0e916003369bd0398bdd46e56 SHA512 15888b7647b29f50e9488a6497672aa2a686c1646b1403914cacfc51ce5b87a73417bbc0e384e4551fcdd2f631a33e4ffd5b089a692f4ac674c11ecde51824f7 WHIRLPOOL 22becab91f294b04ff7207fdd594e5639d51d9168d8bc6344f3332f88dede4e0dbfac03e0e46ef3bfe211f7f5caa08211d306563fbec1a236801747b6317fec0 EBUILD iojs-1.1.0.ebuild 3203 SHA256 d861b5e857e2ec150b7469e2928f13642944323027dd249406e7782fa7e8739e SHA512 fc9630b1e2b9db03f5a9e9aa7239321cd197b661bbcb9564b04755d25ef12bd92160abec20067a46a3ebd0160650713e00707c4e8ce87219a6fd799824c6133b WHIRLPOOL 84b40270e7f440c9caef7cff80ef2c30c18ce9830f66eb4c0316cba14c84e1e6fb9ab8cc9b59ae7f978c5433836470e7efae8d7d69467e7b4527c4a6b426fdd0 -EBUILD iojs-1.2.0.ebuild 3179 SHA256 1b3aa079cd35b631396517dd8ebc27d086e6f113a09412d95d8ccfca1e246a14 SHA512 d834c683db5b9d47e65ea76a4166c2418b2a92ea15774e67e878932692dccc4fd75885d88f43c1ddf8df917fa1f5aca4090f39e44118ba39331290dc8f9e9d74 WHIRLPOOL aef9dcc0bcb6bafe24cdfc824d1961bd266490c84d24a5d718f1296f2b83abb5b791d169462de3482834156146d1ee3c08ebf88c1de33d318c79fad2e29c3ab5 -MISC ChangeLog 1001 SHA256 7e1a5102a4b60721800994a07d753c5ac2f270494e5f114d8e9c7a001b3edd39 SHA512 92805a173768136b192db7014fa06aec187ef11d067b9f0b13e8cf3af2f30073648f11e6cc1bdc4346771488565692aab99282bb9d91b9f878afd94786b39dc2 WHIRLPOOL f79392693a4f07d9fd22f84722d06f392c165de8bf38d1b4417813a99014111bd2610c5f4e2a5dfad7b63a63840141f1560385fa59d521c5366607b5e6ec2b6c +EBUILD iojs-1.2.0.ebuild 3241 SHA256 6f15bde32fa1b6decdb02cc10ddbcb9c6c794f9cc7f5c360936813da1b4b34e8 SHA512 f3715e5bd6dbb9b2d0aa4d56d903e2a12ad92e0dbe61cd4fa1c05d70efa1def2eebd01ee7dc69f913c4ad6d9ef4cf0c9798756979ea06fdec5c6621490b06c88 WHIRLPOOL 38f9cc68b8e664b4f950ac9e586d3496368c3b053ea5d742d999937f34f6d1570edadaa6a532f04b47f2c87ab089decbb8ac9897c8d17a82e263c6c7c29c4519 +MISC ChangeLog 1154 SHA256 07da5a62895fcf8ffc5b0d1486a29fdcab8d45d0c17f59c8e8b26dadde220a55 SHA512 b92f4dee5c47f5dd216caaf3eea128b65ecc143b036106b030b8a37d53db7778b8e23460885cf1140d98c44ff938ecbf999cb71e3462aa0adabd99f479f2d83c WHIRLPOOL dc5186d9c11f11a75d10e15500fc5b0314c7cd62f87e824749ee9849d19e154468ca30beeb682c5f5cd1502d7b35cd20b023f978afe3fe70de021b157b80a9c4 MISC metadata.xml 545 SHA256 ea98b41b3fe8288a7b38649098871f33c897916aaa34c718f8b849bc35d15c12 SHA512 f32b1eced5dada7827c10bb7b59986400d8dce58dc8c2c0b03d3acd0886b539d2c0afa7956c8a0d1b1ae1894eae31c520368c524bd4c7fb5930180fc8bc4b035 WHIRLPOOL f3fe5d3c70386787eae1cc856f7a57d775738096777074b50678f45ed7e5c9c2575c21a452e75d9a5d06245c85c17434593a7b3d0b5f0c4ec932fd3c7a8b84aa -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJU4dPhAAoJEPGu1DbS6WIABMgP/3XoaEKpxTXWV/dTxo+CJPOj -IiD7duFrkPSDElzcTtCMQeoCstfYHcQM8BFx5EojKOgGzdPvQZjOZxtLCLkykWpe -cUZMGYwrsh+RWLRmjINONDS5ztcvTv92yS8z1LKa0W2Pl0JiZeK9lcIdCtE4MZj6 -UQTxmXncnRcliAp0rh3p+sONsp2bkUplYB/nyF5PX0q4Od7goRlPvWqz32gpSDUP -rZHGepbX8lizwLkgHPPxWVk6AYplDx39qxgFajkh1oFqrRe8R7Ea6ZuoIfvDRC4O -Mz4Ms/8Yv2rCB06jyBMDds4bAQ8dkAzSUtL33/t34K1VTrdCo7YVq1sEpilh4am+ -7dU9rGCT1K89j7gmf3jbcM0SkXEeuIIEXotUu8zeLPiGYMWv8ykrvApOjoAjMqcb -X2DRcqmPpWXjpXpI189YQrPXctTtcFuw2OlI0xz8GfjpRH1cOaK3thLMUY5JCgYH -aNrnL57ZfNFssJ7ckap2dcMGgh8RbAodBEhqHgbWnQvD+uDYPr51/ihCMQoitUnQ -XG2pUDkg+IeKhVPSNVx0nGtTBT+3qC8XGSrNexot0IoqBazSd7Mn7ffI8oc0UtiL -uP3zyfljuEzab2BuBPnClx8VdRn7T9XsVZaP7b7g3JkSc6oqkhI17KC9DHS7IIFR -VtT0zp6003de7vk31/gb -=Cvtp +iQIcBAEBCAAGBQJU4dRwAAoJEPGu1DbS6WIAOFEQAJn9x9IYrZwyWeaKOVrexk75 +BNdYICeZC5i/gARArmTxZ0aevrryJ8pBAXSNJ9pYX69oateFEV3q/GaIvfQ0FNHq +ehDsitb7V/zR8Pq9IEFKOhZsUSn+Mk+pRx06AB5vde33P2SrSSoC/UE/SuPquWaW +7nmdWfvRgMJptT9wkUnDpJj1h+iKzLJgy0JhdvqGdFUMFPGBH9JvWsp7MpVTie3L +qzjapM9PbMkfdYH2fdNwrnpT7M5flFhtFpXGqvOem4Z0e3OuHCnC94P3My3ZxcuT +jCHvGktrCIYfjgLAXlQ/W1ZAYv5Ic27LWbELy3YE3G1/At1kr8aKTgd0FTIByX2q +shEpj54hU8BWNVQhnHvBZsciZVvpeMOR+hpSyu02Q8G9ZiT+neitEGZBpN+akAe2 +BrZSMxuAhnROxBi6JyQM3z/SgT/11bkeUxgbLA/YV6Qvx9C+bONqQNCJjcYQRoKx +fqUQX6EJLFffSoYMdgo242aeW+DUZfWN+qWtEsrlumFsuY9TL0SsYgMKuQ90xkIK +AWfiRDc9UyzdAGTkYMsQWWClQZNv/jsvBciHlTkswf9xlHpd43JmfbcZRRcmAoVU +EL9J0Laez98MyDhe4equ+KSZPFR5dhLw675074dsGUI/FqQr4Zy68dqZxiTIV0kW +lBw0HF6cx8L4Cgx//Y2q +=UYem -----END PGP SIGNATURE----- diff --git a/net-libs/iojs/files/iojs-1.2.0-pkgconfig.patch b/net-libs/iojs/files/iojs-1.2.0-pkgconfig.patch new file mode 100644 index 000000000000..8eaa0236278b --- /dev/null +++ b/net-libs/iojs/files/iojs-1.2.0-pkgconfig.patch @@ -0,0 +1,56 @@ +configure: fix pkg_config usage + +Cross compilation did pick up wrong libraries as it was using the system +pkg-config. + +patch by Paul McClave + +--- a/configure ++++ b/configure +@@ -299,12 +299,13 @@ + + + def pkg_config(pkg): +- cmd = os.popen('pkg-config --libs %s' % pkg, 'r') ++ pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config') ++ cmd = os.popen(pkg_config + ' --libs %s' % pkg, 'r') + libs = cmd.readline().strip() + ret = cmd.close() + if (ret): return None + +- cmd = os.popen('pkg-config --cflags %s' % pkg, 'r') ++ cmd = os.popen(pkg_config + ' --cflags %s' % pkg, 'r') + cflags = cmd.readline().strip() + ret = cmd.close() + if (ret): return None +@@ -553,15 +554,21 @@ + def configure_libz(o): + o['variables']['node_shared_zlib'] = b(options.shared_zlib) + +- # assume shared_zlib if one of these is set? +- if options.shared_zlib_libpath: +- o['libraries'] += ['-L%s' % options.shared_zlib_libpath] +- if options.shared_zlib_libname: +- o['libraries'] += ['-l%s' % options.shared_zlib_libname] +- elif options.shared_zlib: +- o['libraries'] += ['-lz'] +- if options.shared_zlib_includes: +- o['include_dirs'] += [options.shared_zlib_includes] ++ if options.shared_zlib: ++ (libs, cflags) = pkg_config('zlib') or ('-lz', '') ++ ++ if options.shared_zlib_libpath: ++ o['libraries'] += ['-L%s' % options.shared_zlib_libpath] ++ ++ if options.shared_zlib_libname: ++ o['libraries'] += ['-l%s' % options.shared_zlib_libname] ++ else: ++ o['libraries'] += libs.split() ++ ++ if options.shared_zlib_includes: ++ o['include_dirs'] += [options.shared_zlib_includes] ++ else: ++ o['cflags'] += cflags.split() + + + def configure_http_parser(o): diff --git a/net-libs/iojs/iojs-1.2.0.ebuild b/net-libs/iojs/iojs-1.2.0.ebuild index 0237bf2bf465..da4b514401e7 100644 --- a/net-libs/iojs/iojs-1.2.0.ebuild +++ b/net-libs/iojs/iojs-1.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/iojs/iojs-1.2.0.ebuild,v 1.3 2015/02/16 11:26:23 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/iojs/iojs-1.2.0.ebuild,v 1.4 2015/02/16 11:28:47 vapier Exp $ EAPI=5 @@ -54,6 +54,8 @@ src_prepare() { sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die + epatch "${FILESDIR}"/${PN}-1.2.0-pkgconfig.patch + # Avoid a test that I've only been able to reproduce from emerge. It doesnt # seem sandbox related either (invoking it from a sandbox works fine). # The issue is that no stdin handle is openened when asked for one. @@ -61,7 +63,7 @@ src_prepare() { # with more gentoo-knowledge than me (jbergstroem) figures it out. rm test/parallel/test-stdout-close-unref.js - tc-export CC CXX + tc-export CC CXX PKG_CONFIG export V=1 } -- 2.26.2