From 8bddce03ae98e679d0ff0bc72d681a4127b8af35 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 16 Mar 2015 21:53:21 +0000 Subject: [PATCH] Respect CFLAGS/CPPFLAGS when testing the compiler #471118#1 by Alphat-PC. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xD2E96200 --- sys-apps/busybox/ChangeLog | 6 ++- sys-apps/busybox/Manifest | 23 ++++++++++- .../files/busybox-1.23.1-trylink-flags.patch | 39 +++++++++++++++++++ 3 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 sys-apps/busybox/files/busybox-1.23.1-trylink-flags.patch diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog index 11abb25918b9..4c21c1cd847b 100644 --- a/sys-apps/busybox/ChangeLog +++ b/sys-apps/busybox/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/busybox # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.393 2015/02/28 19:48:25 tgall Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.394 2015/03/16 21:53:19 vapier Exp $ + + 16 Mar 2015; Mike Frysinger + +files/busybox-1.23.1-trylink-flags.patch: + Respect CFLAGS/CPPFLAGS when testing the compiler #471118#1 by Alphat-PC. 28 Feb 2015; busybox-1.23.1-r1.ebuild: arm64, stable diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index c215bb4b67a4..38407a8262f0 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX busybox-1.19.0-bb.patch 908 SHA256 98f92c2edbcf61d1bacef783ea8b08cce07051b0a4489ed3f4579296846f89f1 SHA512 d4024e531ce7113cf554646608b1ef356e51691e3e21d165621b3690c82b56a319867b90d9daba548b635d9dbd41be5efea63181b7123d4505e529d863a8214c WHIRLPOOL b0d6d9b08ad0930e5243c7addc8a6db61505e95ed8e72c64fbfd734cb6ff9e303b3eb8ea6ec4790b2be567783664230cf278eb3e673fa0844c3881cf993f7cb8 AUX busybox-1.20.0-udhcpc6-ipv6.patch 998 SHA256 58ac58c6d4e5d9d1d838d2e30f631b4b63a6187fd685d454294bee3646721d54 SHA512 4e506b1b8151aa5511a68c45fe95b7d8617738aed148ee60905fa4239c57d95b1b58cfa1d079be35411e5580936c5397eda34dba3a03290c788891b8cfdc6872 WHIRLPOOL 4cbd680815120425df0e2d955f8f79cf2d9ec516f7d360309feb7044a634408d79db4d967858a56669e9794e87cc8b7eea86597b89ed7507fbff1f21d79aaa61 AUX busybox-1.20.2-glibc-sys-resource.patch 3054 SHA256 03d64c3b864fc5caa9ec56e3d2bf3bcd43801ee82e27332dbfe412138c9502d7 SHA512 c895d7ad0bf379b3ff1c4114af7f8fe0d53b1e60371ac1faaaf3434c293e125be4d79a6ee17d1aa2a923629b09416b833dd3408b9b4dabf56dd74d630c24e9ff WHIRLPOOL ff3e347035a4eb500762d59e35ff8cd2a91130de1c73b0666331f62fc19c586646fd713814e6712d53449d484fc2479ec0e5c29dfe3a19feb2163350a9171fac @@ -17,6 +20,7 @@ AUX busybox-1.22.1-lzop.patch 2103 SHA256 cc70144cd273464502e04050abb1bd1d2a36d9 AUX busybox-1.22.1-nc.patch 615 SHA256 0d2f9ba2e9e5db813fe9feb6fc84052ac85403ce2debefb8b1281a05aadec052 SHA512 9988abf5936f8b8d952627999630c40cbfb4f6f1b91030a2692bbaa7b7e8516758a1ce0959bb5122c6911cd547ee04fce29a0c60c91ccf25e82f59ca52ac1e8f WHIRLPOOL e879b0593db22e53e7fa7153bb7dccd9cda4a6bc570f6d5916e05fe2337f42bcaceb8281c871b24bbd29d33eb1a15c932f3aef8e3cbd638cad4caaa99f4a668c AUX busybox-1.22.1-zcat-no-ext.patch 2071 SHA256 d9843cc5a62d25d328344d31e1d1dc81a245add647bb377d6a871d5f7c1b2cbe SHA512 2b5769b901dd271aef83d681801608be67d527fee411fcdce115515c7b10fda17a3750303baae1516ce9a919df4bcb095787e8c860ba5ff36a69d0bd44ee2410 WHIRLPOOL 95f3d6684b23c2c751e60a4df41d471f61d964f6f65e0a93071cc1dd4b928f50debbe1b368afc9f8ca79e3d7ad6e9b85137e0e333e4ffa639c95c3f7af5a1029 AUX busybox-1.23.1-modprobe-small.patch 5223 SHA256 7fe007089da7f74d7995444af2618143a2340ffd4a3e4f4014786b885d72bdbe SHA512 4f0f697860dabee28a599a0372dcb685915ed89ada4aeaca2ebe9b61a296018268ef2f0866d3425950cdee310239eb441c6b3b6bc1fc6d5953aa14664fd70ffa WHIRLPOOL 2f635c013b5ae9cd918babbeae84f6cd0a7c19e69b776314312c1fdb6871de09a994d32169a8ae99b2f1e75482201b345b1933d17383e9feb3e006cccbdccd91 +AUX busybox-1.23.1-trylink-flags.patch 1334 SHA256 9791303d0ec22b8c97223758987c0c4fa562ace05a56be4c17837c9f1e1ce490 SHA512 5ca429047719943cde0493790c9212f1386ac1ebeb65a15b0497ac49821cac36c60f78aa9f35551af28ab21465ef4118782260636968393f19ecd27c44a6a046 WHIRLPOOL 0fb2d02660c100ab1defc03da3292a9ec055697553aeb62094f1ae933edd99fe105ba2687910197dd253b7b970673973003707479f7a4865168d39f679b12f61 AUX ginit.c 3097 SHA256 fd6a4715d3dd10f6db479020433da3997d397658301335c847fb779129238b8c SHA512 8bf70f13db0fbeecedf9a9f862c5391c0d8b7aa3ddd2ec85cda9b360c3117a01e32b01017b8c30197f587e521ba360ff70d1caf8d0f69d5c3a27f37ecc252e7c WHIRLPOOL a1ec3ccc296033d88a9504b693c7d249d0bd11b1d75e3f59a62137c5e4b4c914fe2b8971c86dbca2cc8ccc0d86f3f8c2c45bb44cec85a3628c44f091476baa92 AUX klogd.confd 218 SHA256 737b78745964e110da2fd3357c6d5fb80ccacf979039b8d40c03cf1cb969e5f3 SHA512 3348d5376b368b28d1431692a93868cd4550be12ad729340c5f78da35a5bd295e7613d70ce8ccde5029ad6d87a41c2f24155180f3570de8a9174dd63dece143f WHIRLPOOL ea28c1d926e36fba0ab69de8ddfd2503889b7cfa3a4ada347a9d22d9894fe30be068c0ed55f899b952e62b8de3cb69e1a4209f7864787988ded28ede10c7445a AUX klogd.initd 359 SHA256 ef607b72d270797e4be1fba425c23ba26078633c47c698063bd4b17e7b4ff8c3 SHA512 e9d6215e4b0dcc4fbb507ce2bb84c818ad18951282c47c98b0c98b3fa58e6b28218f608689a7786cb0447673ae1f5c3ba5767f9b29cffd73325d93bf2a928ac9 WHIRLPOOL d7e82a0d2a6a60b2444a3b212022250297ca163001045bf508442972fc6330c4eea55cb965920778e090c92a69441e864e6721f02ecc6d10279b6196b14f7e71 @@ -51,5 +55,22 @@ EBUILD busybox-1.23.0-r1.ebuild 8684 SHA256 636cf388337828edc8a63adbc6b1e06b51c0 EBUILD busybox-1.23.1-r1.ebuild 8722 SHA256 bab55a7432128224baa1c9ae5213e5d9dcda2e0fb7ccec11ad3f2197a2438762 SHA512 d5bf3b49259a992aac7cf7928efbde1000597fac631c95c21deb95a2baac8b0e74972230f606f587e43172ede745333300ae9ed1b2b06390f0ab92b21f1e7e13 WHIRLPOOL be93fd737e1bf32afc985b4d289377b427fd2a38ae14243277382a2977dc5fa07d9a52df587104202717125aa76050be45b6a52dc5c9c61fe703c60206abb14f EBUILD busybox-1.23.1.ebuild 8676 SHA256 8a94eab3890f5acb9b452b82457a289d91b57c43c742818f32882cd2a584b657 SHA512 070666d3883890bdb6b45e906af9a04f3040a4b9365e295400f5c599475327a35fc46daae9f0865bd52902ddf61c0c2146e5188902f8ab22409f95f9f8a4f05d WHIRLPOOL 90d9a869db5f819cff7f19e737d1fc5136f6cd1496f7779e48af9bc6d1460c95b5c6343acbb6b3995160f4b8b62d467685a815ee2725dfb760c340d82488c4e1 EBUILD busybox-9999.ebuild 8729 SHA256 1c4108e842e1e823ec8f67a22001eff90e658e2467f500cc0242f37f6e458cca SHA512 7ce1609092199dab49861f3a9a070b963c736fb878c0cd3eba54464656ef1828f44821b9a9aed39c7756453a3edea9ee3a5849bece896e5c59fa3bd813e26e95 WHIRLPOOL d8d21db40547e7b4ae42853b03039f8491c0927b29fad4cd48543e65d53c32a2cae0f97da2426e4ea7dcdcc1c17b684e2e20d62dd6ff97fe53c8262f45d4026d -MISC ChangeLog 59724 SHA256 abe0b142ff525b56ac865e1acba54f41563ee7785c8c3fb35d638ae3381006f3 SHA512 a71f9af865623560243267aa8ee257c0ea588186fb8db53c1b4f400641c54edc25ae384029429e685eb49ad64ab617abb22f231e8c2612577d2a60f664841bbc WHIRLPOOL 563f0e1d65bb1c780d0e5c830e69af88cf1f5cdfa4ef87defaf3f11d05ddc206ee9358e349e0a86a5445c603cecdabd7b996e802e23b6ade4e82639eb2e87705 +MISC ChangeLog 59897 SHA256 fff3b84127c2f80cc9bf563b73fde4500b78c06d37f276ee85083220239fe7c0 SHA512 1db29ed7cf9df8d61e987edde1fef639edd00e7474fb68d9829628e5842d3f791b103a24063d0a9106b99d6b810d575702be4a739717dddb47687247a0f7ed52 WHIRLPOOL f1751be0fe5a06382039826d787b11eda3ea3b3787e0418e0b4c2aad1ecf1c652c17e12ca004f804e5917707b2c1140054915dc6ae805026d21d38675a5f1833 MISC metadata.xml 708 SHA256 e17f2240f57d74f8847e7bbf4e3cf44fdcd3ab3f610e0a66eb186d2a598178be SHA512 0d26c0593b156cc5764ad03c64e9b2a724b3877e348787d57818aec6b32f995951a9c0976a92d6ba824a2a5983d0c88116b9d335e51ba0e3c7b8f89e579482ba WHIRLPOOL 2ab4758748cf6d83d1a3a1d2f5f9472825a01affe5c7fdf8cd78fb9c75a1abaf18d8895fce12c7c502453caf68dd40799f47cce502804c9ec60705af2bb4f388 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQIcBAEBCAAGBQJVB1DRAAoJEPGu1DbS6WIAJPAP/0TXkJB6grZFdiJ0Ro5M9udR +6qZr3h2yY19L0Ijw5K6VFgwCZFS8kuXR6WFIxKtfhKTm9cpbXrzcBLoL5T+QyU/S +jnz1LXlYSyuWqDnhMCBaRbNCInuwfLMek+U59Z+zwHMWr/NMMBMxKth3vEaiLnlK +jpgl3Vw1bQPfqAQYYAcCnNMJAzTgSvhytsX5/i7vjNW18VJidUQa7ajpA4DWNsBD +rE4wX0m32N8ZsrulJQ6QRBHUtW4F+J4/CtNNLO3i/Uc7Esx5CcSBxgDN/0rzT8H6 +zXwNkm7ea5D7R8Sfw8pTDKEkqtw91CoRYBhc+q4kxRAofMIt07m0y7EQO1DggpQA +SDIUEEjI0mosun6/SX//XUVclbunFMUfEdeeJk9wC+M7x/x897H7BY0wIGERqzKP +1sEPX7he6MaRapcZ4MjbpvfTKaWZbtqLZKzLrQ7mRxSyEvRoJAgBQktyjKFM3pWP +MX6XtQpS7qyU50LWhcLVeGbGEbHJkrEsZRfwI36VY60DjODZZc6wXh/Js+b5FnV+ +JuRRGu+m6DD0O/29NkezU5vurDqQ1/hDCXxHknx/SfGon3kLnS85TKcfFZQrch30 +g8V6LWrIKNyByrEqPmVQTq3RA4rc9+TPfBGFkiYh97N1rGI2I/kpwUJelMRjx0r1 +0OVkRLIT9H/oLsPyTS5G +=/A/H +-----END PGP SIGNATURE----- diff --git a/sys-apps/busybox/files/busybox-1.23.1-trylink-flags.patch b/sys-apps/busybox/files/busybox-1.23.1-trylink-flags.patch new file mode 100644 index 000000000000..13725cb832e7 --- /dev/null +++ b/sys-apps/busybox/files/busybox-1.23.1-trylink-flags.patch @@ -0,0 +1,39 @@ +From 6798564b9e2f1a81b8c2d0cb4add97cb736d982b Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Mon, 16 Mar 2015 17:47:01 -0400 +Subject: [PATCH] trylink: respect compiler settings when probing features + +The CPPFLAGS/CFLAGS settings might have features that matter, so make +sure we utilize them when testing the compiler. + +URL: https://bugs.gentoo.org/471118 +Signed-off-by: Mike Frysinger +--- + scripts/trylink | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/scripts/trylink b/scripts/trylink +index 5a67fcf..48c487b 100755 +--- a/scripts/trylink ++++ b/scripts/trylink +@@ -49,7 +49,7 @@ check_cc() { + local tempname="$(mktemp)" + # Can use "-o /dev/null", but older gcc tend to *unlink it* on failure! :( + # "-xc": C language. "/dev/null" is an empty source file. +- if $CC $1 -shared -xc /dev/null -o "$tempname".o >/dev/null 2>&1; then ++ if $CC $CPPFLAGS $CFLAGS $1 -shared -xc /dev/null -o "$tempname".o >/dev/null 2>&1; then + echo "$1"; + else + echo "$2"; +@@ -66,7 +66,7 @@ check_libc_is_glibc() { + syntax error here + #endif + " >"$tempname".c +- if $CC "$tempname".c -c -o "$tempname".o >/dev/null 2>&1; then ++ if $CC $CPPFLAGS $CFLAGS "$tempname".c -c -o "$tempname".o >/dev/null 2>&1; then + echo "$2"; + else + echo "$1"; +-- +2.3.2 + -- 2.26.2