commit:     5ca8689fbb0507a2c9284494ddf3e4fa3826c4c1
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 15 19:14:48 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Jun 15 19:15:11 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ca8689f

sys-devel/gcc: bump up to 2 patchset for 3.3.6

Two new patches:
93_all_gperf-inline.patch: fix gcj compilation on modern gcc.
94_all_flag_jni.patch: fix gcj compilation on modern gcc.
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 sys-devel/gcc/Manifest            |  1 +
 sys-devel/gcc/gcc-3.3.6-r4.ebuild | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 26ff377a861..1bb9ebc5806 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -3,6 +3,7 @@ DIST bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 815566 BLAKE2B 
b202610cbc3e5a902
 DIST ecj-4.3.jar 1377431 BLAKE2B 
1d6a8ae1cef0fc4ee325f935873e4a2e560c34cac929bc4190c7dd47e1ca4480ad608f0b7a5d00f2bde30ff2dc78f74ccb0effa48db1df9358a6e35ebce32100
 SHA512 
c4be72186d81747f1adce5a50de303c24bd6ed9f401bfa8871b1b864fe7591392218b1937b10d0e76014de8e0b6a1d5c4280475976218141cd1878c4a35217ff
 DIST ecj-4.5.jar 1470676 BLAKE2B 
793c10ba09fd8040c0e1181204141aea16780c9c9088e07126e00da2b510af2ad6f58d876357d7e98cbb02d783a3be434469d5de1df134ccb8cc508e45028d80
 SHA512 
d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e
 DIST gcc-3.3.6-patches-1.11.tar.bz2 53924 BLAKE2B 
9183d6fcd99c054df0c3bed279b4bc91e8bb68a2be9902a066f87815ee58a83ed2988b5be69af61c1ac4c9059a81b1fa43b8d27f55e46a3f20b7d18abc070895
 SHA512 
829c282f2e5421e40ac3d86a9536bc06c2ce80765c05a0cce8a012339ce5988024020643422aab758eca4ecf59e829825578e819a7afb3bce3d268b663333eae
+DIST gcc-3.3.6-patches-2.tar.bz2 54171 BLAKE2B 
405e9e75a65c4b31f96db51b071151a9a8753ad4ce8d243b3ae9f7d4d697559cf1731966c0ebd9672d17f85cd98ac1fba44f24bb4c9d43ed917af756e134c113
 SHA512 
97c40adf2d6090eba8eb480aec296533846e77796ea83731c2e1cd1c3b0f1a2596b4decd3d8cea5ab804a003a66c4cc60034585d9a86e4b18cb794334504cf2f
 DIST gcc-3.3.6-uclibc-patches-1.0.tar.bz2 28882 BLAKE2B 
e1e1a1e24368d238b999df061e086c1376b095bba703154fd35edd6337b5fbc265722ffa01ae496e55a524d52792d7802867b38cd426c56397056d96e62036c9
 SHA512 
d060c1552d4f21b8b1cd6a6e56b9af4f62f61ce8ef4362afb1982b2ad9defe6a9648705cf780103d4f2061737553b6737c276d79b803b6b75ae94035bc881f0e
 DIST gcc-3.3.6.tar.bz2 23972413 BLAKE2B 
e7b33edcdbbb13b0be41a41156bf6fb6dcfe4f5ad75c41de86cb37f854be6b7a6a8dda0e65d331461469848cd912e25920e8aa2dcb142cb661731ba571cb5de1
 SHA512 
576b88e2fa675314a79a85f180684fe5af370c596476a0bf02e33e8ae0e2be838417ea80675ce4194a8213792cf7ada50cae5131149e4b890ab61e0b8d50d0ed
 DIST gcc-3.4.5-uclibc-patches-1.1.tar.bz2 70923 BLAKE2B 
174eb5e437367a8e64a48f3764b4a3971afc7f5bffac583b7cf4e98a2ea2241ff896751137cc59d45a12b12333319efd52094925ba175073fe70dc143a5ea7fa
 SHA512 
c0534a374e2e0416d0792373f9d11526226f9ce1a98e771469efa68388b709c72672b8db8fe77901144a96a23e4fd9f9a99f1d278f1e8fffda8a6b01e3b770fa

diff --git a/sys-devel/gcc/gcc-3.3.6-r4.ebuild 
b/sys-devel/gcc/gcc-3.3.6-r4.ebuild
new file mode 100644
index 00000000000..df6053980e8
--- /dev/null
+++ b/sys-devel/gcc/gcc-3.3.6-r4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PATCH_VER="2"
+UCLIBC_VER="1.0"
+HTB_VER="1.00-r2"
+
+inherit eutils toolchain
+
+# ia64 - broken static handling; USE=static emerge busybox
+KEYWORDS="~amd64 ~x86"
+
+# NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
+# .eh_frame ld optimisation and symbol visibility support, but it hasnt been
+# well tested in gentoo on any arch other than amd64!!
+RDEPEND=">=sys-devel/binutils-2.14.90.0.6-r1"
+DEPEND="${RDEPEND}
+       amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )"
+
+src_prepare() {
+       toolchain_src_prepare
+
+       if [[ -n ${UCLIBC_VER} ]] && [[ ${CTARGET} == *-uclibc* ]] ; then
+               mv "${S}"/gcc-3.3.2/libstdc++-v3/config/os/uclibc 
"${S}"/libstdc++-v3/config/os/ || die
+               mv "${S}"/gcc-3.3.2/libstdc++-v3/config/locale/uclibc 
"${S}"/libstdc++-v3/config/locale/ || die
+       fi
+
+       # Anything useful and objc will require libffi. Seriously. Lets just 
force
+       # libffi to install with USE="objc", even though it normally only 
installs
+       # if you attempt to build gcj.
+       if use objc && ! use gcj ; then
+               epatch "${FILESDIR}"/3.3.4/libffi-without-libgcj.patch
+               #epatch "${FILESDIR}"/3.4.3/libffi-nogcj-lib-path-fix.patch
+       fi
+}

Reply via email to