From 7c5d5fae4825957494ddc5ce9e153ba9a057b728 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Sun, 25 Oct 2015 18:58:10 +0000 Subject: sys-devel/crossdev: Version bump Package-Manager: portage-2.2.20.1 --- metadata/md5-cache/sys-devel/crossdev-20140118 | 12 ------ metadata/md5-cache/sys-devel/crossdev-20150716 | 12 ++++++ sys-devel/crossdev/ChangeLog | 13 ++++++ sys-devel/crossdev/Manifest | 12 +++--- sys-devel/crossdev/crossdev-20140118.ebuild | 42 -------------------- sys-devel/crossdev/crossdev-20150716.ebuild | 43 ++++++++++++++++++++ ...cross-pkg-config-Do-not-unset-PKG_CONFIG_.patch | 26 ------------ ...rossdev-source-only-once-user-env-setting.patch | 43 -------------------- ...-pkg-config-Sanity-check-should-include-P.patch | 42 -------------------- ...cross-pkg-config-Do-not-unset-PKG_CONFIG_.patch | 29 ++++++++++++++ ...rossdev-source-only-once-user-env-setting.patch | 46 ++++++++++++++++++++++ ...-pkg-config-Sanity-check-should-include-P.patch | 45 +++++++++++++++++++++ 12 files changed, 194 insertions(+), 171 deletions(-) delete mode 100644 metadata/md5-cache/sys-devel/crossdev-20140118 create mode 100644 metadata/md5-cache/sys-devel/crossdev-20150716 delete mode 100644 sys-devel/crossdev/crossdev-20140118.ebuild create mode 100644 sys-devel/crossdev/crossdev-20150716.ebuild delete mode 100644 sys-devel/crossdev/files/20140118-BUG-MEDIUM-cross-pkg-config-Do-not-unset-PKG_CONFIG_.patch delete mode 100644 sys-devel/crossdev/files/20140118-BUG-MINOR-crossdev-source-only-once-user-env-setting.patch delete mode 100644 sys-devel/crossdev/files/20140118-MAJOR-cross-pkg-config-Sanity-check-should-include-P.patch create mode 100644 sys-devel/crossdev/files/20150716-BUG-MEDIUM-cross-pkg-config-Do-not-unset-PKG_CONFIG_.patch create mode 100644 sys-devel/crossdev/files/20150716-BUG-MINOR-crossdev-source-only-once-user-env-setting.patch create mode 100644 sys-devel/crossdev/files/20150716-MAJOR-cross-pkg-config-Sanity-check-should-include-P.patch diff --git a/metadata/md5-cache/sys-devel/crossdev-20140118 b/metadata/md5-cache/sys-devel/crossdev-20140118 deleted file mode 100644 index 22829d48..00000000 --- a/metadata/md5-cache/sys-devel/crossdev-20140118 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=install prepare -DEPEND=app-arch/xz-utils -DESCRIPTION=Gentoo Cross-toolchain generator -EAPI=4 -HOMEPAGE=http://www.gentoo.org/ -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd -LICENSE=GPL-2 -RDEPEND=>=sys-apps/portage-2.1 app-shells/bash !sys-devel/crossdev-wrappers -SLOT=0 -SRC_URI=mirror://gentoo/crossdev-20140118.tar.xz http://dev.gentoo.org/~vapier/dist/crossdev-20140118.tar.xz -_eclasses_=eutils 43da5163ba106e87d22d2e7d6d67537f multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 -_md5_=17604083632f604911cdf3b521f4e053 diff --git a/metadata/md5-cache/sys-devel/crossdev-20150716 b/metadata/md5-cache/sys-devel/crossdev-20150716 new file mode 100644 index 00000000..8c5565d1 --- /dev/null +++ b/metadata/md5-cache/sys-devel/crossdev-20150716 @@ -0,0 +1,12 @@ +DEFINED_PHASES=install prepare +DEPEND=app-arch/xz-utils +DESCRIPTION=Gentoo Cross-toolchain generator +EAPI=4 +HOMEPAGE=https://www.gentoo.org/ +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd +LICENSE=GPL-2 +RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash !sys-devel/crossdev-wrappers +SLOT=0 +SRC_URI=mirror://gentoo/crossdev-20150716.tar.xz https://dev.gentoo.org/~vapier/dist/crossdev-20150716.tar.xz +_eclasses_=eutils 43da5163ba106e87d22d2e7d6d67537f multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 +_md5_=76dc8b48421d487d3da03a4b0b2635a6 diff --git a/sys-devel/crossdev/ChangeLog b/sys-devel/crossdev/ChangeLog index 1610b775..63ddc97f 100644 --- a/sys-devel/crossdev/ChangeLog +++ b/sys-devel/crossdev/ChangeLog @@ -1,3 +1,16 @@ +*crossdev-20150716 (25 Oct 2015) + + 25 Oct 2015; Bertrand Jacquin + +crossdev-20150716.ebuild, + +files/20150716-BUG-MEDIUM-cross-pkg-config-Do-not-unset-PKG_CONFIG_.patch, + +files/20150716-BUG-MINOR-crossdev-source-only-once-user-env-setting.patch, + +files/20150716-MAJOR-cross-pkg-config-Sanity-check-should-include-P.patch, + -crossdev-20140118.ebuild, + -files/20140118-BUG-MEDIUM-cross-pkg-config-Do-not-unset-PKG_CONFIG_.patch, + -files/20140118-BUG-MINOR-crossdev-source-only-once-user-env-setting.patch, + -files/20140118-MAJOR-cross-pkg-config-Sanity-check-should-include-P.patch: + sys-devel/crossdev: Version bump + 15 Aug 2015; Bertrand Jacquin crossdev-20140118.ebuild: Remove malformed Id headers diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest index b5628100..4b429718 100644 --- a/sys-devel/crossdev/Manifest +++ b/sys-devel/crossdev/Manifest @@ -1,7 +1,7 @@ -AUX 20140118-BUG-MEDIUM-cross-pkg-config-Do-not-unset-PKG_CONFIG_.patch 932 SHA256 626b209ecd8a21a81ca8cdd786c222d873e50a44666855eeff8c717a53194df7 WHIRLPOOL 0aa25c8d72ff9f3b270fb8dff50de44fe5c201c9b683a6d24f94e323387a674089764360634e72df9cf8ea6c8aad4a704f424d1e635299147f3d890cfa2c7469 -AUX 20140118-BUG-MINOR-crossdev-source-only-once-user-env-setting.patch 1348 SHA256 88f76dfd10cdd060435bf4086095ecb6e6edaa3e426740db701f72f27d44371d WHIRLPOOL 0f54ba0788540a1f4def60682cf46316c90ae5f636b9595940be9812adbdd4716e9cfc5799c66a57ef93bf1a220ea89e1274ec71c0e43512ff584a8d38cb0396 -AUX 20140118-MAJOR-cross-pkg-config-Sanity-check-should-include-P.patch 1570 SHA256 fb1246d9ec9c170d40ce17b82e203be77721d028f5367f36485574e8af6253b4 WHIRLPOOL 8214fabfa8e250edd0e8342936cd648f1a6f31804687ba42dbbbf13ef77a3d0d3b52ef0012403c10ba2e1020ab90a464f51c28725228fee1dcfe932f2b79e52c -DIST crossdev-20140118.tar.xz 21384 SHA256 8ba9ddb74022d6e3d481db5b02db21ea545d046e33a47b44e92ae369b4c218ee WHIRLPOOL c2018dfb4ab21d4eadbc9f6e4dd0fb532a8b4ac4530821262f28b8b969e3a7d7c14cd83bbd05e2c93eb73928bb8a4dfd074134d3a93700fe937c0fd1c3ef0fbb -EBUILD crossdev-20140118.ebuild 1130 SHA256 1740643e4f938f73a72cb9742d1f265c654de43df0b9f4e62ce069324ad2e7c8 WHIRLPOOL f8a676d495551102b58124e267eee1bf15f27d5d0ec378191de4bc6d3754be9bdc3644b498de3d7782408dc0009abd2fd8c44af2f43cf48c16f6148277952888 -MISC ChangeLog 703 SHA256 fcffd986f1948ecd5dd1fc17661aa8d963943fa8bf7491904905c9a8d20cff3f WHIRLPOOL 3c245684529fd4341efe0205bbe4a84c35009191c14d928a04387ba703be089b55a7990576b9aba9d1619c6f0894fc761cf9a49aba60de71e9b55d5a0e2d2953 +AUX 20150716-BUG-MEDIUM-cross-pkg-config-Do-not-unset-PKG_CONFIG_.patch 944 SHA256 daaa17bcd3fafc7868a85100a56e93a0e0e43df549749caab6c140d31dbc2d67 WHIRLPOOL 0bae360cea6f7fd588d589164542811133ad2c88bcf4f2ae5ce3d4f2f5e8fb31c78590e53290c3fcb466b0c9fc25054b3dc4d8ff6cbd00fb2943a236ff6316aa +AUX 20150716-BUG-MINOR-crossdev-source-only-once-user-env-setting.patch 1360 SHA256 16e54a4ca57b5d63ad7d98007e83d80f33c819a49dadf20e253c34738e519200 WHIRLPOOL d5fbce3e239d2d951c3d99cee7eec816ce4b9f411d6fde79bf9a909f87321a22d6bbb866364712cc0a94bd211ba6049b837a1360aafc296dd8bf8d0531612fc7 +AUX 20150716-MAJOR-cross-pkg-config-Sanity-check-should-include-P.patch 1617 SHA256 875389fa10ddf9c8c335b196ed808262d5d1ba046178e514db991dfa0f0b6144 WHIRLPOOL 9e891d06dd7b1979d0c56d821ce5dd6ecda31587d6ad71c704bd8f65707f7f13c6c8f06c880c2d2f14cc9125fd2db1a4a9d897315976f3991dd0797162f62ed6 +DIST crossdev-20150716.tar.xz 22152 SHA256 3988039ebc5363cba752a04ba00df18b0d8c1ac10be342880feda5f848a20a22 WHIRLPOOL 39f3e941a2dcb5915f8e81725d8d8abaf3fd9dfa676d7c7096cb188b75c9af439c6e75b34207bd3404f9a1f15954999d8a42dfaf09646aa3c6a0925bf40fb963 +EBUILD crossdev-20150716.ebuild 1161 SHA256 85da898a691fdf2e2720393ba158231e800f4c236f92a39bcafe9bf3eaca671d WHIRLPOOL bcc33e354afc8573ad1a1938455a380b6dfbe47a6c26beb48f1f88f718b79d601351828b1e6512e763c85cc3496a4235b1787160ff86fcaa48e8fb1d18417218 +MISC ChangeLog 1354 SHA256 b173d58629f67f88f5afde87f660b5ff9addc22c6fd53b4320cd957ff7efe3fc WHIRLPOOL cb85b1dc0c28a148f021cab06e5c541561bad101c976ec5471de97fe5da99a56fb06cab8d134f7bd47ed45e4147ba69300e33e7294850a508dec7ebf54815884 MISC metadata.xml 244 SHA256 5431488a9792fce5a4d11743e355abefa2c5016c9b542c2e53d87072d553a37f WHIRLPOOL 831226e1c2bab3af85242e42a117d3e660aa146c1e3a5ceef39f9bfd855b1402e902f7ae1504fc8e23a8b3bbb4871f6033326367f86da701034c5b52dd5fd29b diff --git a/sys-devel/crossdev/crossdev-20140118.ebuild b/sys-devel/crossdev/crossdev-20140118.ebuild deleted file mode 100644 index 17f96977..00000000 --- a/sys-devel/crossdev/crossdev-20140118.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" -inherit eutils - -if [[ ${PV} == "99999999" ]] ; then - EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/crossdev.git" - inherit git-2 - SRC_URI="" - #KEYWORDS="" -else - SRC_URI="mirror://gentoo/${P}.tar.xz - http://dev.gentoo.org/~vapier/dist/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -fi - -DESCRIPTION="Gentoo Cross-toolchain generator" -HOMEPAGE="http://www.gentoo.org/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -RDEPEND=">=sys-apps/portage-2.1 - app-shells/bash - !sys-devel/crossdev-wrappers" -DEPEND="app-arch/xz-utils" - -src_prepare() { - epatch "${FILESDIR}/${PV}-BUG-MEDIUM-cross-pkg-config-Do-not-unset-PKG_CONFIG_.patch" - epatch "${FILESDIR}/${PV}-BUG-MINOR-crossdev-source-only-once-user-env-setting.patch" - epatch "${FILESDIR}/${PV}-MAJOR-cross-pkg-config-Sanity-check-should-include-P.patch" -} - -src_install() { - default - if [[ "${PV}" == "99999999" ]] ; then - sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die - fi -} diff --git a/sys-devel/crossdev/crossdev-20150716.ebuild b/sys-devel/crossdev/crossdev-20150716.ebuild new file mode 100644 index 00000000..d5fc25f9 --- /dev/null +++ b/sys-devel/crossdev/crossdev-20150716.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" +inherit eutils + +if [[ ${PV} == "99999999" ]] ; then + EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git" + inherit git-2 + SRC_URI="" + #KEYWORDS="" +else + SRC_URI="mirror://gentoo/${P}.tar.xz + https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +fi + +DESCRIPTION="Gentoo Cross-toolchain generator" +HOMEPAGE="https://www.gentoo.org/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +RDEPEND=">=sys-apps/portage-2.1 + >=app-portage/portage-utils-0.55 + app-shells/bash + !sys-devel/crossdev-wrappers" +DEPEND="app-arch/xz-utils" + +src_prepare() { + epatch "${FILESDIR}/${PV}-BUG-MEDIUM-cross-pkg-config-Do-not-unset-PKG_CONFIG_.patch" + epatch "${FILESDIR}/${PV}-BUG-MINOR-crossdev-source-only-once-user-env-setting.patch" + epatch "${FILESDIR}/${PV}-MAJOR-cross-pkg-config-Sanity-check-should-include-P.patch" +} + +src_install() { + default + if [[ "${PV}" == "99999999" ]] ; then + sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die + fi +} diff --git a/sys-devel/crossdev/files/20140118-BUG-MEDIUM-cross-pkg-config-Do-not-unset-PKG_CONFIG_.patch b/sys-devel/crossdev/files/20140118-BUG-MEDIUM-cross-pkg-config-Do-not-unset-PKG_CONFIG_.patch deleted file mode 100644 index ba5a98a1..00000000 --- a/sys-devel/crossdev/files/20140118-BUG-MEDIUM-cross-pkg-config-Do-not-unset-PKG_CONFIG_.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e50f8b3d077243fa954a25305836896440fb594c Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin -Date: Wed, 18 Jun 2014 19:23:38 +0200 -Subject: [PATCH 2/3] BUG/MEDIUM: cross-pkg-config: Do not unset - PKG_CONFIG_PATH as can be used to define local .pc location - - From: Stefan Schmidt - Subject: PKG_CONFIG_PATH on cross slaves - Date: Wed, 18 Jun 2014 13:06:20 +0100 - Message-id: <012001cf8aed$b7943760$26bca620$%schmidt@samsung.com> ---- - wrappers/cross-pkg-config | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/wrappers/cross-pkg-config b/wrappers/cross-pkg-config -index d124261..e85e1db 100755 ---- a/wrappers/cross-pkg-config -+++ b/wrappers/cross-pkg-config -@@ -70,7 +70,6 @@ fi - # Some distributions pollute the pkg-config environment. - # Time to pull a captain planet on them. - # --unset PKG_CONFIG_PATH - unset PKG_CONFIG_ALLOW_SYSTEM_CFLAGS - unset PKG_CONFIG_ALLOW_SYSTEM_LIBS - diff --git a/sys-devel/crossdev/files/20140118-BUG-MINOR-crossdev-source-only-once-user-env-setting.patch b/sys-devel/crossdev/files/20140118-BUG-MINOR-crossdev-source-only-once-user-env-setting.patch deleted file mode 100644 index a5e56ffc..00000000 --- a/sys-devel/crossdev/files/20140118-BUG-MINOR-crossdev-source-only-once-user-env-setting.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 7898b239b1872510108f45a1c7e2574902d234f9 Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin -Date: Fri, 21 Mar 2014 21:53:29 +0100 -Subject: [PATCH 1/3] BUG/MINOR: crossdev: source only once user env settings - -When /etc/portage/crossdev/${CTARGET} exist, output look like : - - * Restoring generic user env settings - * Restoring generic user env settings - * Restoring generic user env settings - * Restoring generic user env settings - * Restoring generic user env settings - * Restoring generic user env settings - * Restoring generic user env settings - * Restoring generic user env settings - * Restoring generic user env settings - * Restoring generic user env settings ---- - crossdev | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/crossdev b/crossdev -index 56ddcda..c8eec26 100755 ---- a/crossdev -+++ b/crossdev -@@ -645,12 +645,13 @@ for v in MULTILIB_ABIS USE BVER GVER KVER LVER STAGE CFLAGS LDFLAGS ASFLAGS ; do - export ${v}="$(<"${d}"/${v})" - einfo "Restoring user setting '${v}' to '${!v}'" - fi -- if [[ -e ${d}/env ]] ; then -- einfo "Restoring generic user env settings" -- source "${d}"/env -- fi - done - -+if [[ -e ${d}/env ]] ; then -+ einfo "Restoring generic user env settings" -+ source "${d}"/env -+fi -+ - # parse multilib settings until profiles are sane - multilib_env() { - local var=$1 diff --git a/sys-devel/crossdev/files/20140118-MAJOR-cross-pkg-config-Sanity-check-should-include-P.patch b/sys-devel/crossdev/files/20140118-MAJOR-cross-pkg-config-Sanity-check-should-include-P.patch deleted file mode 100644 index 582d7b8a..00000000 --- a/sys-devel/crossdev/files/20140118-MAJOR-cross-pkg-config-Sanity-check-should-include-P.patch +++ /dev/null @@ -1,42 +0,0 @@ -From d90be09fa079c356d5b7fa04a676cbb5cb153e09 Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin -Date: Wed, 18 Jun 2014 20:22:40 +0200 -Subject: [PATCH 3/3] MAJOR: cross-pkg-config: Sanity check should include - PKG_CONFIG_PATH as SYSROOT - -This is a dirty hack done for POSIX sh ---- - wrappers/cross-pkg-config | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/wrappers/cross-pkg-config b/wrappers/cross-pkg-config -index e85e1db..11b4ac7 100755 ---- a/wrappers/cross-pkg-config -+++ b/wrappers/cross-pkg-config -@@ -101,13 +101,25 @@ ret=$? - # - output=$(echo "${output}" | sed -e 's:\(-[IL][[:space:]]*\)\(/usr\):\1'"${SYSROOT}"'\2:g') - -+# Find all things outside the SYSROOT. -+grep_opt="-e ${SYSROOT}" -+ -+# Find all things outside the PKG_CONFIG_PATH (without leading -+# /lib/pkgconfig). -+if [ -n "${PKG_CONFIG_PATH}" ] ; then -+ grep_opt="${grep_opt} -+ $(echo "${PKG_CONFIG_PATH}" | -+ tr -s ':' '\n' | -+ sed -e 's:^:-e :' -e 's:/lib/pkgconfig$::')" -+fi -+ - # We turn the output into a newline separate string of options, then use grep - # to look for bad -Is and -Ls. Bad -Is and -Ls are ones that point to things - # outside the ${SYSROOT}. - bad_lines=$(echo "${output}" | # Get the pkg-config output. - tr -s ' ' '\n' | # Put each flags on its own line. - grep '^-[LI]' | # Find all -I and -L lines. -- grep -v -E "..${SYSROOT}" # Find all things outside the SYSROOT. -+ grep -v -E ${grep_opt} - ) - if [ -n "${bad_lines}" ] ; then - warn "### falling down so here is a dump state ######" diff --git a/sys-devel/crossdev/files/20150716-BUG-MEDIUM-cross-pkg-config-Do-not-unset-PKG_CONFIG_.patch b/sys-devel/crossdev/files/20150716-BUG-MEDIUM-cross-pkg-config-Do-not-unset-PKG_CONFIG_.patch new file mode 100644 index 00000000..206bef19 --- /dev/null +++ b/sys-devel/crossdev/files/20150716-BUG-MEDIUM-cross-pkg-config-Do-not-unset-PKG_CONFIG_.patch @@ -0,0 +1,29 @@ +From 27f49510fed5132b062152437b1f90d90cd5a843 Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +Date: Wed, 18 Jun 2014 19:23:38 +0200 +Subject: [PATCH 1/3] BUG/MEDIUM: cross-pkg-config: Do not unset + PKG_CONFIG_PATH as can be used to define local .pc location + + From: Stefan Schmidt + Subject: PKG_CONFIG_PATH on cross slaves + Date: Wed, 18 Jun 2014 13:06:20 +0100 + Message-id: <012001cf8aed$b7943760$26bca620$%schmidt@samsung.com> +--- + wrappers/cross-pkg-config | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/wrappers/cross-pkg-config b/wrappers/cross-pkg-config +index 6b68fa7..ff75ccc 100755 +--- a/wrappers/cross-pkg-config ++++ b/wrappers/cross-pkg-config +@@ -72,7 +72,6 @@ fi + # Some distributions pollute the pkg-config environment. + # Time to pull a captain planet on them. + # +-unset PKG_CONFIG_PATH + unset PKG_CONFIG_ALLOW_SYSTEM_CFLAGS + unset PKG_CONFIG_ALLOW_SYSTEM_LIBS + +-- +2.4.10 + diff --git a/sys-devel/crossdev/files/20150716-BUG-MINOR-crossdev-source-only-once-user-env-setting.patch b/sys-devel/crossdev/files/20150716-BUG-MINOR-crossdev-source-only-once-user-env-setting.patch new file mode 100644 index 00000000..dda8a67a --- /dev/null +++ b/sys-devel/crossdev/files/20150716-BUG-MINOR-crossdev-source-only-once-user-env-setting.patch @@ -0,0 +1,46 @@ +From e9931fcf953d8a508e9010e8695247ab8fce8a7c Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +Date: Fri, 21 Mar 2014 21:53:29 +0100 +Subject: [PATCH 2/3] BUG/MINOR: crossdev: source only once user env settings + +When /etc/portage/crossdev/${CTARGET} exist, output look like : + + * Restoring generic user env settings + * Restoring generic user env settings + * Restoring generic user env settings + * Restoring generic user env settings + * Restoring generic user env settings + * Restoring generic user env settings + * Restoring generic user env settings + * Restoring generic user env settings + * Restoring generic user env settings + * Restoring generic user env settings +--- + crossdev | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/crossdev b/crossdev +index 74fd390..16246e1 100755 +--- a/crossdev ++++ b/crossdev +@@ -725,12 +725,13 @@ for v in MULTILIB_ABIS USE BVER GVER KVER LVER STAGE CFLAGS LDFLAGS ASFLAGS ; do + export ${v}="$(<"${d}"/${v})" + einfo "Restoring user setting '${v}' to '${!v}'" + fi +- if [[ -e ${d}/env ]] ; then +- einfo "Restoring generic user env settings" +- source "${d}"/env +- fi + done + ++if [[ -e ${d}/env ]] ; then ++ einfo "Restoring generic user env settings" ++ source "${d}"/env ++fi ++ + # parse multilib settings until profiles are sane + multilib_env() { + local var=$1 +-- +2.4.10 + diff --git a/sys-devel/crossdev/files/20150716-MAJOR-cross-pkg-config-Sanity-check-should-include-P.patch b/sys-devel/crossdev/files/20150716-MAJOR-cross-pkg-config-Sanity-check-should-include-P.patch new file mode 100644 index 00000000..62040314 --- /dev/null +++ b/sys-devel/crossdev/files/20150716-MAJOR-cross-pkg-config-Sanity-check-should-include-P.patch @@ -0,0 +1,45 @@ +From 73c0fb1e177ab80126a471bcad2e2a8bbb4bed16 Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +Date: Wed, 18 Jun 2014 20:22:40 +0200 +Subject: [PATCH 3/3] MAJOR: cross-pkg-config: Sanity check should include + PKG_CONFIG_PATH as SYSROOT + +This is a dirty hack done for POSIX sh +--- + wrappers/cross-pkg-config | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/wrappers/cross-pkg-config b/wrappers/cross-pkg-config +index ff75ccc..ba6cb6d 100755 +--- a/wrappers/cross-pkg-config ++++ b/wrappers/cross-pkg-config +@@ -107,13 +107,25 @@ export PKG_CONFIG_SYSROOT_DIR="${SYSROOT}" + output=$(pkg-config "$@") + ret=$? + ++# Find all things outside the SYSROOT. ++grep_opt="-e ${SYSROOT}" ++ ++# Find all things outside the PKG_CONFIG_PATH (without leading ++# /lib/pkgconfig). ++if [ -n "${PKG_CONFIG_PATH}" ] ; then ++ grep_opt="${grep_opt} ++ $(echo "${PKG_CONFIG_PATH}" | ++ tr -s ':' '\n' | ++ sed -e 's:^:-e :' -e 's:/lib/pkgconfig$::')" ++fi ++ + # We turn the output into a newline separate string of options, then use grep + # to look for bad -Is and -Ls. Bad -Is and -Ls are ones that point to things + # outside the ${SYSROOT}. + bad_lines=$(echo "${output}" | # Get the pkg-config output. + tr -s ' ' '\n' | # Put each flags on its own line. + grep '^-[LI]' | # Find all -I and -L lines. +- grep -v -E "..${SYSROOT}" # Find all things outside the SYSROOT. ++ grep -v -E ${grep_opt} + ) + if [ -n "${bad_lines}" ] ; then + warn "### falling down so here is a dump state ######" +-- +2.4.10 + -- cgit v1.2.3