[gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc-apple/

2024-01-22 Thread Sam James
commit: 5fc632c772ebd016e08e3632a08349a9d2fbe336
Author: Sam James  gentoo  org>
AuthorDate: Tue Jan 23 06:02:22 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 23 06:02:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fc632c7

sys-devel/gcc-apple: compress slotted man pages & info pages

As noted in the bug, we install to a different location to accommodate slotting
and hence do not benefit from the automagic compression for /usr/share/doc.

Explicitly opt-in for the man pages & info pages we install.

Bug: https://bugs.gentoo.org/922729
Signed-off-by: Sam James  gentoo.org>

 sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r3.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r3.ebuild 
b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r3.ebuild
index 197a3247c925..0a8cb2421474 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r3.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r3.ebuild
@@ -312,6 +312,8 @@ src_install() {
echo "STDCXX_INCDIR=\"g++-v${GCC_VERS/\.*/}\"" >> ${gcc_envd_file}
is_crosscompile && echo "CTARGET=${CTARGET}" >> ${gcc_envd_file}
 
+   docompress /usr/share/gcc-data/${CTARGET}/${GCC_VERS}/{man,info}
+
# Move  to compiler-specific directories
[[ -f ${D}${STDCXX_INCDIR}/cxxabi.h ]] && \
mv -f "${D}"${STDCXX_INCDIR}/cxxabi.h "${D}"${LIBPATH}/include/



[gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc-apple/

2024-01-22 Thread Fabian Groffen
commit: afadde3313e0434368c508b1314aa1dfa90dccc0
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Jan 22 12:16:14 2024 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Jan 22 12:18:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afadde33

sys-devel/gcc-apple: depend on existing app-alternatives/yacc version

Signed-off-by: Fabian Groffen  gentoo.org>

 sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r3.ebuild 
b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r3.ebuild
index e81d1597f873..197a3247c925 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r3.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r3.ebuild
@@ -32,7 +32,7 @@ RDEPEND=">=sys-libs/zlib-1.1.4
)"
 DEPEND="${RDEPEND}
>=sys-apps/texinfo-4.2-r4
-   >=app-alternatives/yacc-1.875
+   app-alternatives/yacc
${CATEGORY}/binutils-apple
>=dev-libs/mpfr-2.2.0_p10"
 PDEPEND="sys-libs/csu"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc-apple/

2024-01-08 Thread Sam James
commit: eefdcb3d4f238ad32a918626120835bce6930f75
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan  8 12:09:29 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan  8 12:25:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eefdcb3d

sys-devel/gcc-apple: sys-devel/bison -> app-alternatives/yacc

All of these will be using app-alternatives/yacc anyway as they're not unsetting

YACC or LEX, so make the dep reflect reality.

(Included both YACC and LEX out of conservatism.)

Signed-off-by: Sam James  gentoo.org>

 sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r3.ebuild 
b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r3.ebuild
index c4d1c48409c4..e81d1597f873 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r3.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -32,7 +32,7 @@ RDEPEND=">=sys-libs/zlib-1.1.4
)"
 DEPEND="${RDEPEND}
>=sys-apps/texinfo-4.2-r4
-   >=sys-devel/bison-1.875
+   >=app-alternatives/yacc-1.875
${CATEGORY}/binutils-apple
>=dev-libs/mpfr-2.2.0_p10"
 PDEPEND="sys-libs/csu"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc-apple/files/

2023-06-13 Thread Sam James
commit: 2cdd1b2590ea163d7c8270b0459522c9f8d3c659
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Jun 11 13:01:47 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 13 18:05:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cdd1b25

sys-devel/gcc-apple: remove unused patches

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31386
Signed-off-by: Sam James  gentoo.org>

 .../gcc-apple/files/gcc-apple-4.2.1-dsymutil.patch   | 20 
 sys-devel/gcc-apple/files/libstdc++-16.patch | 11 ---
 2 files changed, 31 deletions(-)

diff --git a/sys-devel/gcc-apple/files/gcc-apple-4.2.1-dsymutil.patch 
b/sys-devel/gcc-apple/files/gcc-apple-4.2.1-dsymutil.patch
deleted file mode 100644
index 8da025d8c5d0..
--- a/sys-devel/gcc-apple/files/gcc-apple-4.2.1-dsymutil.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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.h
-+++ gcc/config/darwin.h
-@@ -326,12 +326,7 @@
- "/* APPLE LOCAL nested functions 4357979  */"\
- %{fnested-functions: -allow_stack_execute} \
- %{!nostdlib:%{!nodefaultlibs:%(link_ssp) %G %L}} \
--"/* 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/files/libstdc++-16.patch 
b/sys-devel/gcc-apple/files/libstdc++-16.patch
deleted file mode 100644
index 81d075bface7..
--- a/sys-devel/gcc-apple/files/libstdc++-16.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 libstdc++-v3/include/bits/c++config
-+++ libstdc++-v3/include/bits/c++config
-@@ -76,7 +76,7 @@
- }
- namespace std
- {
--  using namespace __gnu_debug_def __attribute__ ((strong));
-+  using namespace __gnu_debug_def;
- }
- #else
- # define _GLIBCXX_STD std



[gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc-apple/

2023-06-09 Thread Sam James
commit: 80826974be6b0d1382070efc4c9cca04bf21819e
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun  7 08:42:46 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun  9 06:00:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80826974

sys-devel/gcc-apple: drop toolchain.eclass

We use only a tiny function from it and this prevents modernising the eclass.

Closes: https://github.com/gentoo/gentoo/pull/31337
Signed-off-by: Sam James  gentoo.org>

 sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r3.ebuild | 15 +--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r3.ebuild 
b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r3.ebuild
index c144abe8aca5..c4d1c48409c4 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r3.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-inherit toolchain flag-o-matic autotools prefix toolchain-funcs
+inherit flag-o-matic autotools prefix toolchain-funcs
 
 GCC_VERS=${PV/_p*/}
 APPLE_VERS="${PV/*_p/}.3"
@@ -42,6 +42,17 @@ S=${WORKDIR}/gcc-${APPLE_VERS}
 # TPREFIX is the prefix of the CTARGET installation
 export TPREFIX=${TPREFIX:-${EPREFIX}}
 
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} = ${CHOST} ]] ; then
+   if [[ ${CATEGORY} == cross-* ]] ; then
+   export CTARGET=${CATEGORY#cross-}
+   fi
+fi
+
+is_crosscompile() {
+   [[ ${CHOST} != ${CTARGET} ]]
+}
+
 do_bootstrap() {
is_crosscompile && return 1
[[ ${CHOST} != ${CBUILD} ]] && return 1



[gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc-apple/

2021-11-29 Thread Fabian Groffen
commit: 51ccff56f32185f96e3d371987806c597692569d
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Nov 29 18:30:56 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Nov 29 18:30:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51ccff56

sys-devel/gcc-apple: cleanup (EAPI=5), bug #827155

Closes: https://bugs.gentoo.org/827155
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Fabian Groffen  gentoo.org>

 .../gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild  | 367 -
 1 file changed, 367 deletions(-)

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
deleted file mode 100644
index feaeada61891..
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild
+++ /dev/null
@@ -1,367 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain flag-o-matic autotools prefix toolchain-funcs
-
-GCC_VERS=${PV/_p*/}
-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-39.tar.gz
-   fortran? (
-   mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2
-   
https://dev.gentoo.org/~grobian/distfiles/${PN}-4.2.1_p5646-gfortran.patch
-   )"
-LICENSE="GPL-2 GPL-3"
-
-SLOT="42"
-KEYWORDS="~ppc-macos ~x64-macos"
-IUSE="bootstrap fortran nls +openmp objc objc++ +cxx"
-
-RDEPEND=">=sys-libs/zlib-1.1.4
-   >=sys-libs/ncurses-5.2-r2
-   nls? ( sys-devel/gettext )
-   >=sys-devel/gcc-config-1.8-r1
-   !=dev-libs/gmp-4.2.1
-   >=dev-libs/mpfr-2.2.0_p10
-   )"
-DEPEND="${RDEPEND}
-   >=sys-apps/texinfo-4.2-r4
-   >=sys-devel/bison-1.875
-   ${CATEGORY}/binutils-apple
-   >=dev-libs/mpfr-2.2.0_p10"
-PDEPEND="sys-libs/csu"
-
-S=${WORKDIR}/gcc-${APPLE_VERS}
-
-# TPREFIX is the prefix of the CTARGET installation
-export TPREFIX=${TPREFIX:-${EPREFIX}}
-
-do_bootstrap() {
-   is_crosscompile && return 1
-   [[ ${CHOST} != ${CBUILD} ]] && return 1
-   [[ ${EPREFIX} != ${TPREFIX} ]] && return 1
-   return 0
-}
-
-src_unpack() {
-   # override toolchain.eclass func
-   unpack ${A}
-}
-
-src_prepare() {
-   # Support for fortran
-   if use fortran ; then
-   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
-   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:" \
-   gcc/config/darwin.h || die "sed gcc/config/darwin.h failed"
-   # add prefixed Frameworks to default search paths (may want to change 
this
-   # in a cross-compile)
-   sed -i -e "/\"\/System\/Library\/Frameworks\"\,/i\ \   
\"${EPREFIX}/Frameworks\"\, " \
-   gcc/config/darwin-c.c || die "sed  gcc/config/darwin-c.c failed"
-
-   # Workaround deprecated "+Nc" syntax for GNU tail(1)
-   sed -i -e "s:tail +16c:tail -c +16:g" \
-   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
-
-   # 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
-
-   # dsymutil stuff breaks on 10.4/x86, revert it
-   [[ ${CHOST} == *86*-apple-darwin8 ]] && \
-   epatch "${FILESDIR}"/${P}-dsymutil.patch
-
-   # support OS X 10.10
-   epatch "${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 \
-   -mdynamic-no-pic -x c - >/dev/null 2>&1;
-   then
-   einfo "-mdynamic-no-pic doesn't work - disabling..."
-   echo "BOOT_CFLAGS=-g -O2" > config/mh-x86-darwin
-   

[gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc-apple/

2021-11-25 Thread Fabian Groffen
commit: 2f5e024709d3890cc93fa59b65985fd938730195
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu Nov 25 10:16:49 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu Nov 25 10:17:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f5e0247

sys-devel/gcc-apple-4.2.1_p5666-r3: revbump for EAPI=7

Bug: https://bugs.gentoo.org/827155
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Fabian Groffen  gentoo.org>

 .../gcc-apple/gcc-apple-4.2.1_p5666-r3.ebuild  | 371 +
 1 file changed, 371 insertions(+)

diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r3.ebuild 
b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r3.ebuild
new file mode 100644
index ..c144abe8aca5
--- /dev/null
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r3.ebuild
@@ -0,0 +1,371 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain flag-o-matic autotools prefix toolchain-funcs
+
+GCC_VERS=${PV/_p*/}
+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-39.tar.gz
+   fortran? (
+   mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2
+   
https://dev.gentoo.org/~grobian/distfiles/${PN}-4.2.1_p5646-gfortran.patch
+   )"
+LICENSE="GPL-2 GPL-3"
+
+SLOT="42"
+KEYWORDS="~ppc-macos ~x64-macos"
+IUSE="bootstrap fortran nls +openmp objc objc++ +cxx"
+
+RDEPEND=">=sys-libs/zlib-1.1.4
+   >=sys-libs/ncurses-5.2-r2
+   nls? ( sys-devel/gettext )
+   >=sys-devel/gcc-config-1.8-r1
+   !=dev-libs/gmp-4.2.1
+   >=dev-libs/mpfr-2.2.0_p10
+   )"
+DEPEND="${RDEPEND}
+   >=sys-apps/texinfo-4.2-r4
+   >=sys-devel/bison-1.875
+   ${CATEGORY}/binutils-apple
+   >=dev-libs/mpfr-2.2.0_p10"
+PDEPEND="sys-libs/csu"
+
+S=${WORKDIR}/gcc-${APPLE_VERS}
+
+# TPREFIX is the prefix of the CTARGET installation
+export TPREFIX=${TPREFIX:-${EPREFIX}}
+
+do_bootstrap() {
+   is_crosscompile && return 1
+   [[ ${CHOST} != ${CBUILD} ]] && return 1
+   [[ ${EPREFIX} != ${TPREFIX} ]] && return 1
+   return 0
+}
+
+src_unpack() {
+   # override toolchain.eclass func
+   unpack ${A}
+}
+
+src_prepare() {
+   # Support for fortran
+   if use fortran ; then
+   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/
+   eapply "${DISTDIR}"/${PN}-4.2.1_p5646-gfortran.patch
+   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 ]] && \
+   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:" \
+   gcc/config/darwin.h || die "sed gcc/config/darwin.h failed"
+   # add prefixed Frameworks to default search paths (may want to change 
this
+   # in a cross-compile)
+   sed -i -e "/\"\/System\/Library\/Frameworks\"\,/i\ \   
\"${EPREFIX}/Frameworks\"\, " \
+   gcc/config/darwin-c.c || die "sed  gcc/config/darwin-c.c failed"
+
+   # Workaround deprecated "+Nc" syntax for GNU tail(1)
+   sed -i -e "s:tail +16c:tail -c +16:g" \
+   gcc/Makefile.in || die "sed gcc/Makefile.in failed."
+
+   # default to AltiVec on PPC, like for older releases
+   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
+   eapply "${FILESDIR}"/${PN}-4.2.1-arch-option.patch
+
+   # dsymutil stuff breaks on 10.4/x86, revert it
+   [[ ${CHOST} == *86*-apple-darwin8 ]] && \
+   eapply -p0 "${FILESDIR}"/${P}-dsymutil.patch
+
+   # support OS X 10.10
+   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 \
+   -mdynamic-no-pic -x c - >/dev/null 2>&1;
+   then
+   einfo "-mdynamic-no-pic doesn't work - disabling..."
+   echo "BOOT_CFLAGS=-g -O2" > config/mh-x86-darwin
+   

[gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc-apple/

2021-01-06 Thread Fabian Groffen
commit: ec8416741c84324ee46e0eca5c374d2ecbbf8e2a
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Jan  6 15:29:44 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Jan  6 15:29:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec841674

sys-devel/gcc-apple: drop x86-macos

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 cfc119b08b1..feaeada6189 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -18,7 +18,7 @@ 
SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-${APPLE
 LICENSE="GPL-2 GPL-3"
 
 SLOT="42"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~ppc-macos ~x64-macos"
 IUSE="bootstrap fortran nls +openmp objc objc++ +cxx"
 
 RDEPEND=">=sys-libs/zlib-1.1.4



[gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc-apple/, sys-devel/gcc-apple/files/

2020-12-13 Thread Fabian Groffen
commit: f94e98717f0e11808f27b2731c7542a5c3b371eb
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Dec 13 17:25:44 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Dec 13 17:25:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f94e9871

sys-devel/gcc-apple-4.2.1_p5666-r2: drop depend on libstdc++-16

Closes: https://bugs.gentoo.org/537348
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-devel/gcc-apple/Manifest   |  1 -
 .../files/gcc-apple-4.2.1_p5666-darwin8.patch  | 13 ++
 .../files/gcc-apple-4.2.1_p5666-dsymutil.patch | 20 +++
 .../gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild  | 30 --
 4 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/sys-devel/gcc-apple/Manifest b/sys-devel/gcc-apple/Manifest
index 209811a8489..4448c2cba27 100644
--- a/sys-devel/gcc-apple/Manifest
+++ b/sys-devel/gcc-apple/Manifest
@@ -1,5 +1,4 @@
 DIST gcc-5666.3.tar.gz 19367320 BLAKE2B 
4b64aa80daa357d1ccf4d2c6f0d06ccd9298dc388a33833c89a9e4c009353d609590a2cd476bf4b79dea8876367b32a0ce534983cfb9c18a87e73f7c59bfbec6
 SHA512 
31cf52a00f31bcd7c47382888152cfe9851688c8fb7b1f236197b06b8acdd96b1943d327f8fab0fd305531c99a8fbf4865b2214dc2d1a236bb8ad39f710ce931
 DIST gcc-apple-4.2.1_p5646-gfortran.patch 38284 BLAKE2B 
83934d5e52a27a0db750f725c1df1e7127dca91611ae9987bf92b7e1a52af82d19f5521ed1112265c1e7f82c833dcc65aeea1ba6ff90f28107b256d40e7eb196
 SHA512 
94b1c7d343b780e52c213987feda7d8f7e083d7c338ab244e89e69ba5c2fc74a9695c5f38f273e4e50683ef67b4de85abd4aa0c5c2fe3a28f7bf275dbf3a
 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

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 000..c89acf2c7e0
--- /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.0 +0100
 gcc-5666.3/gcc/libgcov.c   2015-01-21 23:36:12.0 +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 
++#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 000..71b9241d4cb
--- /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.hdsymutil2015-01-21 22:22:52.0 +0100
 gcc/config/darwin.h2015-01-21 22:42:24.0 +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 9c28e39bae4..cfc119b08b1 100644
--- 

[gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc-apple/

2020-02-13 Thread David Seifert
commit: eb381094fe478679e6d749bcf98025031f693256
Author: David Seifert  gentoo  org>
AuthorDate: Thu Feb 13 21:39:20 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Feb 13 21:39:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb381094

sys-devel/gcc-apple: [QA] inherit toolchain-funcs.eclass directly

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: David Seifert  gentoo.org>

 sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 df8487554d7..9c28e39bae4 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
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit eutils toolchain flag-o-matic autotools prefix
+inherit eutils toolchain flag-o-matic autotools prefix toolchain-funcs
 
 GCC_VERS=${PV/_p*/}
 APPLE_VERS="${PV/*_p/}.3"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc-apple/

2019-09-15 Thread Fabian Groffen
commit: 58b8e45537975c94297ebf05c4a6b8b0eef607de
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Sep 15 15:35:31 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Sep 15 15:35:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58b8e455

sys-devel/gcc-apple: make USE=bootstrap local

Bug: https://bugs.gentoo.org/694502
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-devel/gcc-apple/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-devel/gcc-apple/metadata.xml b/sys-devel/gcc-apple/metadata.xml
index eb4d397c67f..e6297d1298f 100644
--- a/sys-devel/gcc-apple/metadata.xml
+++ b/sys-devel/gcc-apple/metadata.xml
@@ -6,6 +6,7 @@
 Gentoo Prefix
   
   
+!DO NOT SET THIS FLAG YOURSELF! avoids need for 
autoconf during bootstrap stage2
 Build support for the Objective C code language
 Build support for the Objective C++ language
 Run the testsuite and install the results 
(requires FEATURES=test)



[gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc-apple/

2018-06-21 Thread Fabian Groffen
commit: 57e868d784107a05d2ea12e008316adc027fe59f
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu Jun 21 07:02:43 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu Jun 21 07:02:59 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57e868d7

sys-devel/gcc-apple: add -no-cpp-precomp workaround

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

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 1b20668b569..22cbde635fe 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
@@ -110,7 +110,7 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-darwin14.patch
 
# bootstrapping might fail with host provided gcc on 10.4/x86
-   if ! is_crosscompile && ! echo "int main(){return 0;}" | gcc -o 
"${T}"/foo \
+   if ! is_crosscompile && ! echo "int main(){return 0;}" | $(tc-getCC) -o 
"${T}"/foo \
-mdynamic-no-pic -x c - >/dev/null 2>&1;
then
einfo "-mdynamic-no-pic doesn't work - disabling..."
@@ -121,6 +121,14 @@ src_prepare() {
|| die "Failed to rewrite $XD"
fi
 
+   if [[ ${CHOST} == powerpc*-darwin* ]] && \
+   ! echo "int main(){return 0;}" | \
+   $(tc-getCC) -o "${T}"/foo -no-cpp-precomp -x c - 
>/dev/null 2>&1;
+   then
+   einfo "-no-cpp-precomp not supported by compiler - disabling 
..."
+   sed -i -e 's/-no-cpp-precomp//' configure.in configure || die
+   fi
+
epatch "${FILESDIR}"/${P}-perl-5.18.patch
 
epatch "${FILESDIR}"/${PN}-4.2.1-prefix-search-dirs-r1.patch



[gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc-apple/

2018-06-12 Thread Fabian Groffen
commit: fdffef785dfdf66abe64c3d6c5986fc41e6869db
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Jun 12 16:23:46 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue Jun 12 16:23:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdffef78

sys-devel/gcc-apple: don't switch to this compiler, it's old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 fca27fefaa4..1b20668b569 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
@@ -352,8 +352,8 @@ src_install() {
 }
 
 pkg_postinst() {
-   # beware this also switches when it's on another branch version of GCC
-   gcc-config ${CTARGET}-${GCC_VERS}
+   # only activate this compiler if nothing else is activated
+   gcc-config -c >& /dev/null || gcc-config ${CTARGET}-${GCC_VERS}
 }
 
 pkg_postrm() {



[gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc-apple/

2018-06-12 Thread Fabian Groffen
commit: a96d035bbf71c97a16f7186c7c7dd35bb7416e06
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Jun 12 10:39:25 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue Jun 12 10:44:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a96d035b

sys-devel/gcc-apple: move csu to PDEPEND (circ.dep)

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 c46edae451a..fca27fefaa4 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
@@ -26,7 +26,6 @@ RDEPEND=">=sys-libs/zlib-1.1.4
>=sys-libs/ncurses-5.2-r2
nls? ( sys-devel/gettext )
>=sys-devel/gcc-config-1.8-r1
-   sys-libs/csu
!=dev-libs/gmp-4.2.1
@@ -37,6 +36,7 @@ DEPEND="${RDEPEND}
>=sys-devel/bison-1.875
${CATEGORY}/binutils-apple
>=dev-libs/mpfr-2.2.0_p10"
+PDEPEND="sys-libs/csu"
 
 S=${WORKDIR}/gcc-${APPLE_VERS}
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc-apple/

2018-01-16 Thread Fabian Groffen
commit: cfdb1fa4210d5c0addf74e66a851b7c271bf4996
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Jan 16 08:42:29 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue Jan 16 08:42:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfdb1fa4

sys-devel/gcc-apple: drop prepstrip usage, bug #587314

Prepstrip only deals with ELF, and the main consumer is using MACH-O
here, so it was never really run anyway.

Closes: https://bugs.gentoo.org/587314
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild | 7 ---
 1 file changed, 7 deletions(-)

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 12f3d99760d..c46edae451a 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
@@ -338,13 +338,6 @@ src_install() {
rm -r "${D}"${LIBPATH}/include/libffi || die
fi
 
-   # Now do the fun stripping stuff
-   env RESTRICT="" CHOST=${CHOST} prepstrip "${D}${BINPATH}"
-   env RESTRICT="" CHOST=${CTARGET} prepstrip "${D}${LIBPATH}"
-   # gcc used to install helper binaries in lib/ but then moved to libexec/
-   [[ -d ${ED}/usr/libexec/gcc ]] && \
-   env RESTRICT="" CHOST=${CHOST} prepstrip 
"${ED}/usr/libexec/gcc/${CTARGET}/${GCC_VERS}"
-
# prune empty dirs left behind
find "${ED}" -type d | xargs rmdir >& /dev/null
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc-apple/

2018-01-04 Thread Fabian Groffen
commit: 85352f772d456ba2c7234e5f3d0af49425857844
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Jan  5 07:51:08 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Jan  5 07:51:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85352f77

sys-devel/gcc-apple: use relative symlinks with dosym

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

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 bd1d1120995..12f3d99760d 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -138,6 +138,7 @@ src_prepare() {
 
local BRANDING_GCC_PKGVERSION="$(sed -n -e '/^#define 
VERSUFFIX/s/^[^"]*"\([^"]\+\)".*$/\1/p' "${S}"/gcc/version.c)"
BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/(/(Gentoo ${PVR}, }
+   # ) ) } # <- to help Vim highlight this correctly
einfo "patching gcc version: ${GCC_VERS}${BRANDING_GCC_PKGVERSION}"
 
sed -i -e "s~VERSUFFIX \"[^\"]*~VERSUFFIX 
\"${BRANDING_GCC_PKGVERSION}~" \
@@ -314,9 +315,9 @@ src_install() {
ln -sf ${CTARGET}-${x} ${x}
 
# Create version-ed symlinks
-   dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
+   dosym ../${BINPATH#${EPREFIX}/usr/}/${CTARGET}-${x} \
/usr/bin/${CTARGET}-${x}-${GCC_VERS}
-   dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
+   dosym ../${BINPATH#${EPREFIX}/usr/}/${CTARGET}-${x} \
/usr/bin/${x}-${GCC_VERS}
fi
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc-apple/files/

2017-12-03 Thread Fabian Groffen
commit: 8701145ace04ae4441aba81f04a284ce4a004876
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Dec  3 08:46:59 2017 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Dec  3 10:11:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8701145a

sys-devel/gcc-apple: remove unused patch

Signed-off-by: Fabian Groffen  gentoo.org>

 .../files/gcc-apple-4.2.1-prefix-search-dirs.patch | 27 --
 1 file changed, 27 deletions(-)

diff --git a/sys-devel/gcc-apple/files/gcc-apple-4.2.1-prefix-search-dirs.patch 
b/sys-devel/gcc-apple/files/gcc-apple-4.2.1-prefix-search-dirs.patch
deleted file mode 100644
index 2cd947b4e82..000
--- a/sys-devel/gcc-apple/files/gcc-apple-4.2.1-prefix-search-dirs.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-In Prefix we are really self-providing, so don't look back!
-Patch by Heiko Przybyl
-
 gcc/gcc.c
-+++ gcc/gcc.c
-@@ -1525,8 +1525,8 @@ static const char *gcc_libexec_prefix;
- #endif
- 
- static const char *const standard_exec_prefix = STANDARD_EXEC_PREFIX;
--static const char *const standard_exec_prefix_1 = "/usr/libexec/gcc/";
--static const char *const standard_exec_prefix_2 = "/usr/lib/gcc/";
-+static const char *const standard_exec_prefix_1 = 
"@GENTOO_PORTAGE_EPREFIX@/usr/libexec/gcc/";
-+static const char *const standard_exec_prefix_2 = 
"@GENTOO_PORTAGE_EPREFIX@/usr/lib/gcc/";
- static const char *md_exec_prefix = MD_EXEC_PREFIX;
- 
- static const char *md_startfile_prefix = MD_STARTFILE_PREFIX;
 gcc/config/darwin.h
-+++ gcc/config/darwin.h
-@@ -1286,7 +1286,7 @@ void add_framework_path (char *);
-   }   \
-   } while (0)
- 
--#define SYSROOT_PRIORITY PREFIX_PRIORITY_FIRST
-+#define SYSROOT_PRIORITY PREFIX_PRIORITY_LAST
- /* APPLE LOCAL end isysroot 5083137 */
- 
- /* Every program on darwin links against libSystem which contains the pthread



[gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc-apple/, sys-devel/gcc-apple/files/

2017-06-04 Thread Fabian Groffen
commit: 8fbff9056ba87e92789ddcc1416e119f0d6b5bfb
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Jun  4 06:19:27 2017 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Jun  4 08:04:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fbff905

sys-devel/gcc-apple: move large fortran patch to dist, bug #620640

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 sys-devel/gcc-apple/Manifest   |   1 +
 .../files/gcc-apple-4.2.1_p5646-gfortran.patch | 797 -
 .../gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild  |   7 +-
 3 files changed, 6 insertions(+), 799 deletions(-)

diff --git a/sys-devel/gcc-apple/Manifest b/sys-devel/gcc-apple/Manifest
index 77bc3be9c8f..631367d36d4 100644
--- a/sys-devel/gcc-apple/Manifest
+++ b/sys-devel/gcc-apple/Manifest
@@ -1,4 +1,5 @@
 DIST gcc-5666.3.tar.gz 19367320 SHA256 
6c46f4376d11ada5be0cfc3894b9296edf574af3c616ab71803ea78edfd7015b SHA512 
31cf52a00f31bcd7c47382888152cfe9851688c8fb7b1f236197b06b8acdd96b1943d327f8fab0fd305531c99a8fbf4865b2214dc2d1a236bb8ad39f710ce931
 WHIRLPOOL 
03711b56d38b2cb3b5af735802a82ef435cf42c3aa4fa74fa754b016edea447d011e626115fe59449def14ac34422788340165faab567b6fb992d1fe1684f93d
+DIST gcc-apple-4.2.1_p5646-gfortran.patch 38284 SHA256 
c909a792b4e3ea76cbba6d8aefd712ef98506bd4e3dd275a144e5ed272c2ae22 SHA512 
94b1c7d343b780e52c213987feda7d8f7e083d7c338ab244e89e69ba5c2fc74a9695c5f38f273e4e50683ef67b4de85abd4aa0c5c2fe3a28f7bf275dbf3a
 WHIRLPOOL 
12da437da136b1d581b075b86d7a1ae8687e56fd811e0fc4b650faf2831746466358d63d34309bee9ab4254dff4f861685ecb0f5a20697ad7e77afc7cd0d7ef4
 DIST gcc-fortran-4.2.4.tar.bz2 905688 SHA256 
6fc2056cd62921b2859381749710af765a46877bd46f9fe5ef6fab0671c47e04 SHA512 
1a36587a3691b8d7ecd23938efcdfca42642b6b260a1c830f6d791bb1b8ac32953998c45d77eee2d557861d631431569503c796b61aeaea9ac5fffbce1982faa
 WHIRLPOOL 
5db1f448b3c08985ee2d0b1a9101e72733f4859184892da67268650c1010c26487b5ff15670151e67fdde5e4bd9053ed2e98b1582d1f4f99375b1bcdaf94351a
 DIST libstdcxx-16.tar.gz 64695692 SHA256 
a7d8041e50e110f5a503e188a05cb217f0c99c51f248a0a1387cc07a0b6f167f SHA512 
2f0e8d694aaaf94fc2a0463ebd4a5775865421dedb431a6f6f701a8d33078e768bef232f72e2cf1f8e2d278eb60ff54030f5ad22b43eb0643d49bc4717e96b05
 WHIRLPOOL 
fb90a1df90e60717906d227fb1dc2b8639fd063dbf6eec39d3a840dc8025c5384bd2c8b0a86158f8c072a1008ac2561e8e9f512ef4a4f84c081903154bb9d378
 DIST libstdcxx-39.tar.gz 117081330 SHA256 
aad6c0b7aa80b8117af1868d502f7aa4d042e5f33cada853a8ba75980391c6bb SHA512 
c640292c0f371069fbb635ed0385627c8abab869db93513922e19b25886864d093eef3684c49bf1ba82325f2d1d3cd1eb382ef6ea9dee039208fe99fe8653db6
 WHIRLPOOL 
ae0eba85e393ea8f14369557712e26c6662e147dec6d8ec0da0919a8290a834c7a1c0150bcc48972f111a14fcfe1501362b2b0dc9dc57aeb8456a35b74d8457e

diff --git a/sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5646-gfortran.patch 
b/sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5646-gfortran.patch
deleted file mode 100644
index 61176c0f68b..000
--- a/sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5646-gfortran.patch
+++ /dev/null
@@ -1,797 +0,0 @@
-extracted diff from sources at:
-   http://r.research.att.com/src/gcc/
-compared to GNU GCC fortran 4.2.4
-and Apple GCC 5646
-
-with modification in disable_typechecking_for_spec_flag to allow linking
-to succeed (ld: duplicate symbol _disable_typechecking_for_spec_flag in
-libbackend.a(rs6000.o) and c-common.o)
-
 gcc-5646/gcc/fortran/Make-lang.in
-+++ gcc-5646/gcc/fortran/Make-lang.in
-@@ -73,7 +73,7 @@
- fortran/trans.o fortran/trans-array.o fortran/trans-common.o \
- fortran/trans-const.o fortran/trans-decl.o fortran/trans-expr.o \
- fortran/trans-intrinsic.o fortran/trans-io.o fortran/trans-openmp.o \
--fortran/trans-stmt.o fortran/trans-types.o
-+fortran/trans-stmt.o fortran/trans-types.o fortran/fake.o
- 
- # GFORTRAN uses GMP for its internal arithmetics.
- F95_LIBS = $(GMPLIBS) $(LIBS)
-@@ -106,7 +106,7 @@
- f951$(exeext): $(F95_OBJS) \
-   $(BACKEND) $(LIBDEPS)
-   $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \
--  $(F95_OBJS) $(BACKEND) $(F95_LIBS)
-+  $(F95_OBJS) $(BACKEND) $(F95_LIBS) stub-objc.o
- 
- gt-fortran-trans.h: s-gtype; @true
- #
 gcc-5646/gcc/fortran/fake.c
-+++ gcc-5646/gcc/fortran/fake.c
-@@ -0,0 +1,29 @@
-+#include 
-+#include 
-+
-+#define MK_FAKE(X) void X (void); void X (void) { fprintf(stderr, "** FATAL: 
call to an unsupported function!\n"); exit(1); }
-+
-+int c_language = 0; /* 0 is C which is the default */
-+int disable_typechecking_for_spec_flag = 0;
-+
-+MK_FAKE(build_function_call)
-+MK_FAKE(build_modify_expr)
-+MK_FAKE(build_stmt)
-+MK_FAKE(decl_attributes)
-+MK_FAKE(decl_constant_value)
-+MK_FAKE(flag_iasm_blocks)
-+MK_FAKE(iasm_addr)
-+MK_FAKE(iasm_build_bracket)
-+MK_FAKE(iasm_force_constraint)
-+MK_FAKE(iasm_get_register_var)
-+MK_FAKE(iasm_in_operands)
-+MK_FAKE(iasm_is_pseudo)
-+MK_FAKE(iasm_print_operand)
-+MK_FAKE(iasm_state)

[gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc-apple/

2017-02-06 Thread Fabian Groffen
commit: 9f23086e359dff075c17452007379dfd53a1f030
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Feb  6 19:30:56 2017 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Feb  6 19:32:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f23086e

sys-devel/gcc-apple: drop old versions, fix missing bootstrap from IUSE, bug 
#608348

Package-Manager: portage-2.3.3

 sys-devel/gcc-apple/Manifest   |   2 -
 sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild   | 255 
 sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild   | 325 
 .../gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild  | 337 -
 .../gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild  |   4 +-
 5 files changed, 2 insertions(+), 921 deletions(-)

diff --git a/sys-devel/gcc-apple/Manifest b/sys-devel/gcc-apple/Manifest
index cffe6c8..77bc3be 100644
--- a/sys-devel/gcc-apple/Manifest
+++ b/sys-devel/gcc-apple/Manifest
@@ -1,5 +1,3 @@
-DIST gcc-5493.tar.gz 40601890 SHA256 
acdb2cc0abf049bfda433806fc82e235c6b6c5f86a0e8fd54f62ed3a8606452f SHA512 
a874134e9fb11131d958c475a8d9ffeb659b30509e11b47d80b2d1bf6d1f9ec0dbbd338ff5754dc8dece7af8b486d554860469d240eb37dd480ede9fd6afc8fc
 WHIRLPOOL 
327c554ebdd8b23392264fc4d5b00ad5eec4b4888c952051ef84d11f18bee463ff4b87711ddd8ce14708aa0fcb57209043d6d27973dda4f8dcb7ba14590b70a3
-DIST gcc-5664.tar.gz 24688506 SHA256 
9e1533b6a894e8cf90b0d56c353fc1175d0f14ec19e03c307726af4de883c987 SHA512 
7676de5f8eece8b9ae3a119379df0ad9e5b53ea37ce6fc60fa12fcaaa903188b116b35d997e0baff2b7cac4bd3a8462bc52d6955d05de0ab399c6c11c87ff6d5
 WHIRLPOOL 
e663055409299ba8d0cf57694dc7b8e665ffef7c79f37bd27d6f855c6264e5815f09654f75f8a9495e5a582fb360215939ee7a84abfd4bc6e8aa777edd892790
 DIST gcc-5666.3.tar.gz 19367320 SHA256 
6c46f4376d11ada5be0cfc3894b9296edf574af3c616ab71803ea78edfd7015b SHA512 
31cf52a00f31bcd7c47382888152cfe9851688c8fb7b1f236197b06b8acdd96b1943d327f8fab0fd305531c99a8fbf4865b2214dc2d1a236bb8ad39f710ce931
 WHIRLPOOL 
03711b56d38b2cb3b5af735802a82ef435cf42c3aa4fa74fa754b016edea447d011e626115fe59449def14ac34422788340165faab567b6fb992d1fe1684f93d
 DIST gcc-fortran-4.2.4.tar.bz2 905688 SHA256 
6fc2056cd62921b2859381749710af765a46877bd46f9fe5ef6fab0671c47e04 SHA512 
1a36587a3691b8d7ecd23938efcdfca42642b6b260a1c830f6d791bb1b8ac32953998c45d77eee2d557861d631431569503c796b61aeaea9ac5fffbce1982faa
 WHIRLPOOL 
5db1f448b3c08985ee2d0b1a9101e72733f4859184892da67268650c1010c26487b5ff15670151e67fdde5e4bd9053ed2e98b1582d1f4f99375b1bcdaf94351a
 DIST libstdcxx-16.tar.gz 64695692 SHA256 
a7d8041e50e110f5a503e188a05cb217f0c99c51f248a0a1387cc07a0b6f167f SHA512 
2f0e8d694aaaf94fc2a0463ebd4a5775865421dedb431a6f6f701a8d33078e768bef232f72e2cf1f8e2d278eb60ff54030f5ad22b43eb0643d49bc4717e96b05
 WHIRLPOOL 
fb90a1df90e60717906d227fb1dc2b8639fd063dbf6eec39d3a840dc8025c5384bd2c8b0a86158f8c072a1008ac2561e8e9f512ef4a4f84c081903154bb9d378

diff --git a/sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild 
b/sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild
deleted file mode 100644
index fb49629..
--- a/sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils toolchain prefix
-
-GCC_VERS=${PV/_p*/}
-APPLE_VERS=${PV/*_p/}
-DESCRIPTION="Apple branch of the GNU Compiler Collection, Developer Tools 
3.1.3"
-HOMEPAGE="https://gcc.gnu.org;
-SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-${APPLE_VERS}.tar.gz;
-LICENSE="APSL-2 GPL-2"
-
-SLOT="40"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE="nls objc objc++ +cxx"
-
-RDEPEND=">=sys-libs/zlib-1.1.4
-   >=sys-libs/ncurses-5.2-r2
-   nls? ( sys-devel/gettext )"
-DEPEND="${RDEPEND}
-   >=sys-apps/texinfo-4.2-r4
-   >=sys-devel/bison-1.875
-   ${CATEGORY}/binutils-apple"
-
-S=${WORKDIR}/gcc-${APPLE_VERS}
-
-# TPREFIX is the prefix of the CTARGET installation
-export TPREFIX=${TPREFIX:-${EPREFIX}}
-
-src_unpack() {
-   # override toolchain.eclass func
-   unpack ${A}
-}
-
-src_prepare() {
-   # we use our libtool
-   sed -i -e "s:/usr/bin/libtool:${EPREFIX}/usr/bin/${CTARGET}-libtool:" \
-   gcc/config/darwin.h || die "sed gcc/config/darwin.h failed"
-   # add prefixed Frameworks to default search paths (may want to change 
this
-   # in a cross-compile)
-   sed -i -e "/\"\/System\/Library\/Frameworks\"\,/i\ \   
\"${EPREFIX}/Frameworks\"\, " \
-   gcc/config/darwin-c.c || die "sed  gcc/config/darwin-c.c failed"
-
-   # Workaround deprecated "+Nc" syntax for GNU tail(1)
-   sed -i -e "s:tail +16c:tail -c +16:g" \
-   gcc/Makefile.in || die "sed gcc/Makefile.in failed."
-
-   epatch "${FILESDIR}"/${PN}-4.0.1_p5465-default-altivec.patch
-
-   epatch "${FILESDIR}"/${PN}-4.2.1-prefix-search-dirs.patch
-   eprefixify 

[gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc-apple/

2016-09-10 Thread Fabian Groffen
commit: 0a332ebfc381b406c308baa37cde8e4b9e7573c7
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Sep 10 14:27:25 2016 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Sep 10 14:40:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a332ebf

sys-devel/gcc-apple: bump to EAPI=5 and remove all conditional code from global 
scope, bug #593392

Package-Manager: portage-2.2.28

 sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild   | 18 +-
 sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild   | 39 +++---
 .../gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild  | 39 +++---
 .../gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild  | 39 +++---
 4 files changed, 66 insertions(+), 69 deletions(-)

diff --git a/sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild 
b/sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild
index 2820073..fb49629 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="3"
+EAPI="5"
 
 inherit eutils toolchain prefix
 
@@ -30,14 +30,6 @@ S=${WORKDIR}/gcc-${APPLE_VERS}
 # TPREFIX is the prefix of the CTARGET installation
 export TPREFIX=${TPREFIX:-${EPREFIX}}
 
-LIBPATH=${EPREFIX}/usr/lib/gcc/${CTARGET}/${GCC_VERS}
-if is_crosscompile ; then
-   BINPATH=${EPREFIX}/usr/${CHOST}/${CTARGET}/gcc-bin/${GCC_VERS}
-else
-   BINPATH=${EPREFIX}/usr/${CTARGET}/gcc-bin/${GCC_VERS}
-fi
-STDCXX_INCDIR=${LIBPATH}/include/g++-v${GCC_VERS/\.*/}
-
 src_unpack() {
# override toolchain.eclass func
unpack ${A}
@@ -68,6 +60,14 @@ src_configure() {
use objc && langs="${langs},objc"
use objc++ && langs="${langs/,objc/},objc,obj-c++" # need objc with 
objc++
 
+   LIBPATH=${EPREFIX}/usr/lib/gcc/${CTARGET}/${GCC_VERS}
+   if is_crosscompile ; then
+   BINPATH=${EPREFIX}/usr/${CHOST}/${CTARGET}/gcc-bin/${GCC_VERS}
+   else
+   BINPATH=${EPREFIX}/usr/${CTARGET}/gcc-bin/${GCC_VERS}
+   fi
+   STDCXX_INCDIR=${LIBPATH}/include/g++-v${GCC_VERS/\.*/}
+
local myconf="${myconf} \
--prefix=${EPREFIX}/usr \
--bindir=${BINPATH} \

diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild 
b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild
index 818bc37..aaf9307 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="3"
+EAPI="5"
 
 inherit eutils toolchain flag-o-matic autotools prefix
 
@@ -16,17 +16,6 @@ 
SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-${APPLE
fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 
)"
 LICENSE="GPL-2 GPL-3"
 
-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
-
 SLOT="42"
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
 IUSE="fortran nls +openmp objc objc++ +cxx"
@@ -50,14 +39,6 @@ S=${WORKDIR}/gcc-${APPLE_VERS}
 # TPREFIX is the prefix of the CTARGET installation
 export TPREFIX=${TPREFIX:-${EPREFIX}}
 
-LIBPATH=${EPREFIX}/usr/lib/gcc/${CTARGET}/${GCC_VERS}
-if is_crosscompile ; then
-   BINPATH=${EPREFIX}/usr/${CHOST}/${CTARGET}/gcc-bin/${GCC_VERS}
-else
-   BINPATH=${EPREFIX}/usr/${CTARGET}/gcc-bin/${GCC_VERS}
-fi
-STDCXX_INCDIR=${LIBPATH}/include/g++-v${GCC_VERS/\.*/}
-
 src_unpack() {
# override toolchain.eclass func
unpack ${A}
@@ -73,6 +54,16 @@ src_prepare() {
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?
@@ -140,6 +131,14 @@ src_configure() {
use objc++ && langs="${langs/,objc/},objc,obj-c++" # need objc with 
objc++
use fortran && langs="${langs},fortran"
 
+   LIBPATH=${EPREFIX}/usr/lib/gcc/${CTARGET}/${GCC_VERS}
+   if is_crosscompile ; then
+   BINPATH=${EPREFIX}/usr/${CHOST}/${CTARGET}/gcc-bin/${GCC_VERS}
+   

[gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc-apple/

2016-09-10 Thread Fabian Groffen
commit: b3b0bbd4951104df59743d3b3622f6be39d71a42
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Sep 10 14:04:45 2016 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Sep 10 14:08:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3b0bbd4

sys-devel/gcc-apple: remove cross-compile SLOT magic once copied from 
gcc/toolchain.eclass, bug #593392

Package-Manager: portage-2.2.28

 sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild| 10 ++
 sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild| 10 ++
 sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild | 10 ++
 sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild | 10 ++
 4 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild 
b/sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild
index ffbf68a..2820073 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.0.1_p5493.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,14 +13,8 @@ HOMEPAGE="https://gcc.gnu.org;
 
SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-${APPLE_VERS}.tar.gz;
 LICENSE="APSL-2 GPL-2"
 
-if is_crosscompile; then
-   SLOT="${CTARGET}-40"
-else
-   SLOT="40"
-fi
-
+SLOT="40"
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-
 IUSE="nls objc objc++ +cxx"
 
 RDEPEND=">=sys-libs/zlib-1.1.4

diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild 
b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild
index bb02942..818bc37 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -27,14 +27,8 @@ case ${CHOST} in
;;
 esac
 
-if is_crosscompile; then
-   SLOT="${CTARGET}-42"
-else
-   SLOT="42"
-fi
-
+SLOT="42"
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-
 IUSE="fortran nls +openmp objc objc++ +cxx"
 
 RDEPEND=">=sys-libs/zlib-1.1.4

diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild 
b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild
index 0939af4..aca327a 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -27,14 +27,8 @@ case ${CHOST} in
;;
 esac
 
-if is_crosscompile; then
-   SLOT="${CTARGET}-42"
-else
-   SLOT="42"
-fi
-
+SLOT="42"
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-
 IUSE="fortran nls +openmp objc objc++ +cxx"
 
 RDEPEND=">=sys-libs/zlib-1.1.4

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 9d1eef4..1f088b9 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -27,14 +27,8 @@ case ${CHOST} in
;;
 esac
 
-if is_crosscompile; then
-   SLOT="${CTARGET}-42"
-else
-   SLOT="42"
-fi
-
+SLOT="42"
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-
 IUSE="fortran nls +openmp objc objc++ +cxx"
 
 RDEPEND=">=sys-libs/zlib-1.1.4



[gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc-apple/

2016-03-01 Thread Fabian Groffen
commit: 6923304616286ab68c1c57240dd3ad123100a8a1
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Mar  2 07:47:34 2016 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Mar  2 07:48:39 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69233046

sys-devel/gcc-apple: ensure building succeeds with more modern compilers, bug 
#574736

Package-Manager: portage-2.2.27-prefix

 sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild | 5 +
 1 file changed, 5 insertions(+)

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 5f5306f..9d1eef4 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
@@ -246,6 +246,11 @@ src_configure() {
[[ ${CTARGET} == powerpc64-* || ${CTARGET} == x86_64-* ]] && \
export CC="${CC:-$(tc-getCC)} -m64"
 
+   # Clang on OSX defaults to c99 mode, while GCC defaults to gnu89
+   # (C90 + extensions).  This makes Clang barf on GCC's sources, so
+   # work around that.  Bugs #491098, #574736
+   export CC="${CC:-$(tc-getCC)} -std=gnu89"
+
mkdir -p "${WORKDIR}"/build
cd "${WORKDIR}"/build
einfo "Configuring GCC with: ${myconf//--/\n\t--}"