diff options
Diffstat (limited to 'sys-devel/gcc-apple')
| -rw-r--r-- | sys-devel/gcc-apple/Manifest | 2 | ||||
| -rw-r--r-- | sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r3.ebuild (renamed from sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild) | 34 |
2 files changed, 20 insertions, 16 deletions
diff --git a/sys-devel/gcc-apple/Manifest b/sys-devel/gcc-apple/Manifest index 823d2192c176..1ea18830b509 100644 --- a/sys-devel/gcc-apple/Manifest +++ b/sys-devel/gcc-apple/Manifest @@ -13,5 +13,5 @@ DIST gcc-5666.3.tar.gz 19367320 BLAKE2B 4b64aa80daa357d1ccf4d2c6f0d06ccd9298dc38 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-39.tar.gz 117081330 BLAKE2B 03df012edd588e27bb1e17439e1b213bbf08a9656579f4a938c3026b993158962a44660d0dd2027ad6f12aa2b0cfaa7880a0ecfbd27b2e976bba3260e56bb377 SHA512 c640292c0f371069fbb635ed0385627c8abab869db93513922e19b25886864d093eef3684c49bf1ba82325f2d1d3cd1eb382ef6ea9dee039208fe99fe8653db6 -EBUILD gcc-apple-4.2.1_p5666-r2.ebuild 12899 BLAKE2B c81f2eb183c754c15695ea6ac1c0bfa0615107a5045fd289f47f0258253554ddf140b5106297675444f89d4a1d12403f4a839009084fa837cf8a5a3b1827e7ba SHA512 4d84536a5d0e02b5235614ae6fc7bce2ea66bcfb886288cfa34b4fb49f142dc5ccbe193837a87b02046d9da4faf412859c387f947779dc97a28bfec9cb06e664 +EBUILD gcc-apple-4.2.1_p5666-r3.ebuild 12991 BLAKE2B d670b79677cf1b1d58671af2003a4802beb6927eb3c74f71a13589af3266cd8870a53325c96afa66dd92f4d58b26dcdf6423e6c5b33eba923181c9f3f01454e8 SHA512 26628286b914357bcafb9849546db754cea0a967076898371ee6fdde44082faf1101a14141e0dd66cb8b22836b04b7b1b94eb64040bdb4a20789cce78800bae9 MISC metadata.xml 539 BLAKE2B baa67353bdaa8a03d8433d80f6dc4a515fd563093464f5ef644e86c3e6365e42949b1af2366f477a487f235c336c0708c207cd66afa4f26dfd1f41ca9150d2dc SHA512 2acda405476b67be5d9dd2240bd70f98fe886be84da34527fe603933fcceeebff6af7e4205597c3ca1be0dd1b024ad9ceae1e46a1f55a2e4b7533b64a7161b69 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-r3.ebuild index feaeada61891..c144abe8aca5 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-r3.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI="7" -inherit eutils toolchain flag-o-matic autotools prefix toolchain-funcs +inherit toolchain flag-o-matic autotools prefix toolchain-funcs GCC_VERS=${PV/_p*/} APPLE_VERS="${PV/*_p/}.3" @@ -60,7 +60,7 @@ src_prepare() { mv "${WORKDIR}"/gcc-4.2.4/gcc/fortran gcc/ || die mv "${WORKDIR}"/gcc-4.2.4/libgfortran . || die # from: substracted from http://r.research.att.com/tools/ - epatch "${DISTDIR}"/${PN}-4.2.1_p5646-gfortran.patch + eapply "${DISTDIR}"/${PN}-4.2.1_p5646-gfortran.patch fi mv "${WORKDIR}"/libstdcxx-39/libstdcxx/libstdc++-v3 . @@ -70,7 +70,7 @@ src_prepare() { # 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 + eapply -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:" \ @@ -85,18 +85,18 @@ src_prepare() { gcc/Makefile.in || die "sed gcc/Makefile.in failed." # default to AltiVec on PPC, like for older releases - epatch "${FILESDIR}"/${PN}-4.0.1_p5465-default-altivec.patch + eapply -p0 "${FILESDIR}"/${PN}-4.0.1_p5465-default-altivec.patch # support -arch XXX if XXX is actually what the toolchain targets because # some upstreams insist on setting it - epatch "${FILESDIR}"/${PN}-4.2.1-arch-option.patch + eapply "${FILESDIR}"/${PN}-4.2.1-arch-option.patch # dsymutil stuff breaks on 10.4/x86, revert it [[ ${CHOST} == *86*-apple-darwin8 ]] && \ - epatch "${FILESDIR}"/${P}-dsymutil.patch + eapply -p0 "${FILESDIR}"/${P}-dsymutil.patch # support OS X 10.10 - epatch "${FILESDIR}"/${P}-darwin14.patch + eapply -p0 "${FILESDIR}"/${P}-darwin14.patch # bootstrapping might fail with host provided gcc on 10.4/x86 if ! is_crosscompile && ! echo "int main(){return 0;}" | $(tc-getCC) -o "${T}"/foo \ @@ -118,24 +118,28 @@ src_prepare() { sed -i -e 's/-no-cpp-precomp//' configure.in configure || die fi - epatch "${FILESDIR}"/${P}-perl-5.18.patch - epatch "${FILESDIR}"/${P}-darwin8.patch + eapply "${FILESDIR}"/${P}-perl-5.18.patch + eapply "${FILESDIR}"/${P}-darwin8.patch - epatch "${FILESDIR}"/${PN}-4.2.1-prefix-search-dirs-r1.patch + eapply -p0 "${FILESDIR}"/${PN}-4.2.1-prefix-search-dirs-r1.patch eprefixify "${S}"/gcc/gcc.c - sed -i -e "s|@GENTOO_PORTAGE_TPREFIX@|${TPREFIX}|g" "${S}"/gcc/config/darwin.h + sed -i -e "s|@GENTOO_PORTAGE_TPREFIX@|${TPREFIX}|g" \ + "${S}"/gcc/config/darwin.h if use !bootstrap ; then # this only occurs with up-to-date tools from the Prefix, and actually # breaks the bootstrap since the autoconf needs a very recent automake - epatch "${FILESDIR}"/${PN}-${GCC_VERS}-texinfo.patch - epatch "${FILESDIR}"/${PN}-${GCC_VERS}-autoconf-m4-precious.patch + eapply -p0 "${FILESDIR}"/${PN}-${GCC_VERS}-texinfo.patch + eapply -p0 "${FILESDIR}"/${PN}-${GCC_VERS}-autoconf-m4-precious.patch cd "${S}"/gcc && eautoconf cd "${S}"/libgomp && eautoconf fi + local extvers= + eapply_user && extvers=" with user patches" + local BRANDING_GCC_PKGVERSION="$(sed -n -e '/^#define VERSUFFIX/s/^[^"]*"\([^"]\+\)".*$/\1/p' "${S}"/gcc/version.c)" - BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/(/(Gentoo ${PVR}, } + BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/(/(Gentoo ${PVR}${extvers}, } # ) ) } # <- to help Vim highlight this correctly einfo "patching gcc version: ${GCC_VERS}${BRANDING_GCC_PKGVERSION}" |