summaryrefslogtreecommitdiff
path: root/sys-devel/gcc-apple
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-12-14 13:26:14 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-12-14 13:26:14 +0000
commit6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree25413d1cb3a0cbfe36029db32398c0f333609215 /sys-devel/gcc-apple
parent9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)
gentoo resync : 14.12.2020
Diffstat (limited to 'sys-devel/gcc-apple')
-rw-r--r--sys-devel/gcc-apple/Manifest5
-rw-r--r--sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5666-darwin8.patch13
-rw-r--r--sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5666-dsymutil.patch20
-rw-r--r--sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild30
4 files changed, 46 insertions, 22 deletions
diff --git a/sys-devel/gcc-apple/Manifest b/sys-devel/gcc-apple/Manifest
index b0577fe7e490..0cb92fa9eaf1 100644
--- a/sys-devel/gcc-apple/Manifest
+++ b/sys-devel/gcc-apple/Manifest
@@ -5,12 +5,13 @@ AUX gcc-apple-4.2.1-dsymutil.patch 853 BLAKE2B f5dab1cbe202d2eaa81543dee6566a58a
AUX gcc-apple-4.2.1-prefix-search-dirs-r1.patch 1587 BLAKE2B 63325134bc7d707fc754d963a65d0075a3a71ad7be0d480c6b30e596b8f07755ab7519329f779513ed0020d29c73bd82aee1ec531ebd26e61e952a59bd34115e SHA512 04ebd1b02ce022c4277988fabb7c198286bc9604ade70cf5d64a0296781a377b6c26ad8206da63d37ca1211537b4b8d31d7b06ae1fa3405f77f19ce01636156f
AUX gcc-apple-4.2.1-texinfo.patch 1110 BLAKE2B 6e20d296ed6e8c8ba10793476046f3737ff17c9a9cc3da9cec9184c6a94ad8e38a2f1491de44bc46346df540eebf68d6f3dd6f91715597dd0858fa61e25dcce3 SHA512 1b27fa076dffc80d4ea9cc2e209f4ef2cd31ba4f585b977c20a15432cb7a86f3bc76aa734cb328e5702309585e1c440ed33fd605b863e41c91d96268d1b6bf36
AUX gcc-apple-4.2.1_p5666-darwin14.patch 4870 BLAKE2B 6fd45e830d2d0a5f7b1d02738d3c28d8e13c577687cad35787edd87f843b73abfe68d9295fb6934925ba2d304a07b61d3735ee3dfbcf3cdd4468f33de02a75a2 SHA512 4569f6ae976760074629f5526a45793e10ca56508f13642c4da173c387f4ccf1ffc62b595e3fbc8694fd0d673f5a19eb5a9002b211ed149ad4492044d26bbba7
+AUX gcc-apple-4.2.1_p5666-darwin8.patch 650 BLAKE2B 70d2bfe36cc6b83a87b8fc427ebd84666f2ba2939993783d8b6b7185333db6a1de4ab59c8abb8fe72e98e82b5dd61c95a6064f793e7cb475f1a793a08b3c6319 SHA512 bb9f8d775b580bbf42fe6031509afc2297079f0a275a4ba890c2fa643ab2611900cbb48148deef193e462f1155f9647d55dc13c4ba12cc89f3233e989104ed2d
+AUX gcc-apple-4.2.1_p5666-dsymutil.patch 948 BLAKE2B ab08c77d7b4fb4befc2d341595ce695e69ba7db7044046d7002a35111d8503ed59fb353056d1080feabb2f7dd43c6fea5fa5aa6513d91655afee5b57019e2dcc SHA512 765f467a6297dd0db21f1d4cbfd0908dbdcfb71f9805a5cab6dab4e80a281d262e6743f18a54313bab8909fc3e6ea3dd4c6cb7596f388e92e2b480d7bc900735
AUX gcc-apple-4.2.1_p5666-perl-5.18.patch 286 BLAKE2B 3c7b4f78046d24b3f44e4dc8f36e9735973ca04303944822594c9cdb716d98fc5995d7b03bdd096a3f6bbc871af5ba5933e231eb03b910b33ca8683072ddf42e SHA512 bdbb2e1d6146ff461c762d3efff59f272762121b033eb24bb1a016ab946268ec77dc22d01997870c406ac09d55e668eead61865a696a490482e69befb84cfdba
AUX libstdc++-16.patch 253 BLAKE2B 5036f619f88e388acacde0b3a4b3e67aa77dbfad01ffeda646247c640b2013dd0773ba69e1db00ace81a79a8b2f67a3b3a4579a9a73fb1ab2b345878e1b1687e SHA512 aefc96161aba55ee77620e440cab3674f069331a6947e26acf56562e286e64f0888b247b9e67b02f68b16f4522e7e6ab4b145190508ed9222ad2dc98cc625716
DIST gcc-5666.3.tar.gz 19367320 BLAKE2B 4b64aa80daa357d1ccf4d2c6f0d06ccd9298dc388a33833c89a9e4c009353d609590a2cd476bf4b79dea8876367b32a0ce534983cfb9c18a87e73f7c59bfbec6 SHA512 31cf52a00f31bcd7c47382888152cfe9851688c8fb7b1f236197b06b8acdd96b1943d327f8fab0fd305531c99a8fbf4865b2214dc2d1a236bb8ad39f710ce931
DIST gcc-apple-4.2.1_p5646-gfortran.patch 38284 BLAKE2B 83934d5e52a27a0db750f725c1df1e7127dca91611ae9987bf92b7e1a52af82d19f5521ed1112265c1e7f82c833dcc65aeea1ba6ff90f28107b256d40e7eb196 SHA512 94b1c7d343b780e52bbbbc213987feda7d8f7e083d7c338ab244e89e69ba5c2fc74a9695c5f38f273e4e50683ef67b4de85abd4aa0c5c2fe3a28f7bf275dbf3a
DIST gcc-fortran-4.2.4.tar.bz2 905688 BLAKE2B 6a7e030e3261b147f5add7c8b936ecb7a7a20b99db96e957fa94591560a2e303f2cdf931ca8d73b7c29464d288d1db52c2619bbf1cce30d7326a668aab303dad SHA512 1a36587a3691b8d7ecd23938efcdfca42642b6b260a1c830f6d791bb1b8ac32953998c45d77eee2d557861d631431569503c796b61aeaea9ac5fffbce1982faa
-DIST libstdcxx-16.tar.gz 64695692 BLAKE2B 3660778be1f28761fdf93d6db77eba54836f3ed45af756786f94abc3556f2013a84af8a2585ffee16925cd84634c96196c4392a80ed7e34db6dcb8f96f979d60 SHA512 2f0e8d694aaaf94fc2a0463ebd4a5775865421dedb431a6f6f701a8d33078e768bef232f72e2cf1f8e2d278eb60ff54030f5ad22b43eb0643d49bc4717e96b05
DIST libstdcxx-39.tar.gz 117081330 BLAKE2B 03df012edd588e27bb1e17439e1b213bbf08a9656579f4a938c3026b993158962a44660d0dd2027ad6f12aa2b0cfaa7880a0ecfbd27b2e976bba3260e56bb377 SHA512 c640292c0f371069fbb635ed0385627c8abab869db93513922e19b25886864d093eef3684c49bf1ba82325f2d1d3cd1eb382ef6ea9dee039208fe99fe8653db6
-EBUILD gcc-apple-4.2.1_p5666-r2.ebuild 13216 BLAKE2B 19a8da3b97a5660aaac52e25d8ef5404fe7066b7e1f8942aec03403685bf39e9db82709e2c75c27725c2d93006109bade655ef3c3f0ff56e24d54639dc8864ed SHA512 96a88b714bc2e86f631dead3bf6f97e64a98dac79e3bb83c3731b4b7cab8b5629ab511ad5a686c1482a358a54466af9ed6f1cba5371942ada61abed99d1ca589
+EBUILD gcc-apple-4.2.1_p5666-r2.ebuild 12910 BLAKE2B 8e6f6cb3398f9ecabdd9d0c03e82c2de3c6d6c9a12648f4e3a7f8f3ad880c8268114cdfe55a67c4bff6e970a94d929aa1b20893b788d73b17b9edf78f2d6718d SHA512 fa8b1edf2ce5cd113ca1a5d3c94dd8562cda8831e16b8400e4da46bdff27f3d4541d1f235b1ced0a27fc09adf3b45a9cc1e1fee3756dcf9c93e4a3d3bbd9eb46
MISC metadata.xml 538 BLAKE2B 4bde5ad30e15d0d273ed689cc6b703097c168c6494a1afa076450b1fd62a5fc80652092fe36758d6f4866c93ea5f4b6dd778bc8c8924cd082eadf298f909398d SHA512 7713b42bb9824ba9c99382cc403635e1e7ba65cd6ca3a6933ad360a19d27512a1e80cafd3fbd980a7b3bce1dcd7f018b32580b0f471155803792fb1e4f2edb69
diff --git a/sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5666-darwin8.patch b/sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5666-darwin8.patch
new file mode 100644
index 000000000000..c89acf2c7e00
--- /dev/null
+++ b/sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5666-darwin8.patch
@@ -0,0 +1,13 @@
+--- gcc-5666.3/gcc/libgcov.c.orig 2015-01-21 23:33:54.000000000 +0100
++++ gcc-5666.3/gcc/libgcov.c 2015-01-21 23:36:12.000000000 +0100
+@@ -36,7 +36,10 @@
+
+ /* APPLE LOCAL begin instant off 6414141 */
+ #if defined(__APPLE__) && !defined(__STATIC__) && !defined(__ppc__) && !defined(__ppc64__) && !defined(__arm__)
++/* no vproc.h on 10.4 and below */
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+ #include <vproc.h>
++#endif
+ #if defined(VPROC_HAS_TRANSACTIONS)
+ vproc_transaction_t vproc_transaction_begin(vproc_t virtual_proc) __attribute__((weak));
+ void vproc_transaction_end(vproc_t virtual_proc, vproc_transaction_t handle) __attribute__((weak));
diff --git a/sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5666-dsymutil.patch b/sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5666-dsymutil.patch
new file mode 100644
index 000000000000..71b9241d4cb7
--- /dev/null
+++ b/sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5666-dsymutil.patch
@@ -0,0 +1,20 @@
+Revert of dsymutil part of
+http://gcc.gnu.org/ml/gcc-patches/2006-09/msg00057.html
+See http://article.gmane.org/gmane.linux.gentoo.alt/4327
+
+--- gcc/config/darwin.hdsymutil 2015-01-21 22:22:52.000000000 +0100
++++ gcc/config/darwin.h 2015-01-21 22:42:24.000000000 +0100
+@@ -337,12 +337,7 @@
+ %{fnested-functions: -allow_stack_execute} \
+ "/* APPLE LOCAL prefer -lSystem 6645902 */"\
+ %{!nostdlib:%{!nodefaultlibs:%(link_ssp) %(link_gcc_c_sequence)}} \
+-"/* APPLE LOCAL begin mainline 4.3 2006-10-31 4370146 */"\
+- %{!A:%{!nostdlib:%{!nostartfiles:%E}}} %{T*} %{F*} }}}}}}}}\n\
+-%{!fdump=*:%{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:\
+-"/* APPLE LOCAL end mainline 4.3 2006-10-31 4370146 */"\
+- %{.c|.cc|.C|.cpp|.cp|.c++|.cxx|.CPP|.m|.mm: \
+- %{g*:%{!gstabs*:%{!g0: dsymutil %{o*:%*}%{!o:a.out}}}}}}}}}}}}"
++ %{!A:%{!nostdlib:%{!nostartfiles:%E}}} %{T*} %{F*} }}}}}}}}"
+ /* APPLE LOCAL end mainline */
+
+ #ifdef TARGET_SYSTEM_ROOT
diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild
index 9c28e39bae45..cfc119b08b11 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild
@@ -10,7 +10,6 @@ APPLE_VERS="${PV/*_p/}.3"
DESCRIPTION="Apple branch of the GNU Compiler Collection, Developer Tools 4.0"
HOMEPAGE="https://gcc.gnu.org"
SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-${APPLE_VERS}.tar.gz
- http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-16.tar.gz
http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz
fortran? (
mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2
@@ -64,24 +63,14 @@ src_prepare() {
epatch "${DISTDIR}"/${PN}-4.2.1_p5646-gfortran.patch
fi
- # move in libstdc++
- case ${CHOST} in
- *-darwin1*|i?86-*-darwin9|powerpc-*-darwin9)
- LIBSTDCXX_APPLE_VERSION=39
- ;;
- *)
- # pre Leopard has no dtrace, which is required by 37.11 and above
- # Leopard only has 32-bits version of dtrace
- LIBSTDCXX_APPLE_VERSION=16
- ;;
- esac
- mv "${WORKDIR}"/libstdcxx-${LIBSTDCXX_APPLE_VERSION}/libstdcxx/libstdc++-v3 .
- if [[ ${LIBSTDCXX_APPLE_VERSION} == 16 ]] ; then
- epatch "${FILESDIR}"/libstdc++-${LIBSTDCXX_APPLE_VERSION}.patch # does it apply on 37?
- sed -i -e 's/__block\([^_]\)/__blk\1/g' \
- libstdc++-v3/include/ext/mt_allocator.h \
- libstdc++-v3/src/mt_allocator.cc || die "conflict fix failed"
- fi
+ mv "${WORKDIR}"/libstdcxx-39/libstdcxx/libstdc++-v3 .
+
+ # pre Leopard has no dtrace, which is required by 37.11 and above
+ # Leopard only has 32-bits version of dtrace
+ # So back out dtrace support on those platforms using patch
+ # thoughtfully provided by Apple.
+ [[ ${CHOST} == x86_64-apple-darwin9 || ${CHOST##*-darwin} -le 8 ]] && \
+ patch -R -p0 < "${WORKDIR}"/libstdcxx-39/patches-4.2.1/dtrace.patch
# we use our libtool
sed -i -e "s:/usr/bin/libtool:${EPREFIX}/usr/bin/${CTARGET}-libtool:" \
@@ -104,7 +93,7 @@ src_prepare() {
# dsymutil stuff breaks on 10.4/x86, revert it
[[ ${CHOST} == *86*-apple-darwin8 ]] && \
- epatch "${FILESDIR}"/${PN}-${GCC_VERS}-dsymutil.patch
+ epatch "${FILESDIR}"/${P}-dsymutil.patch
# support OS X 10.10
epatch "${FILESDIR}"/${P}-darwin14.patch
@@ -130,6 +119,7 @@ src_prepare() {
fi
epatch "${FILESDIR}"/${P}-perl-5.18.patch
+ epatch "${FILESDIR}"/${P}-darwin8.patch
epatch "${FILESDIR}"/${PN}-4.2.1-prefix-search-dirs-r1.patch
eprefixify "${S}"/gcc/gcc.c
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 18:28:44 +0000