| 1 |
commit: af55f60843d42cc9481885063742d4c7543e6760 |
| 2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 26 15:58:06 2017 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 26 15:58:06 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af55f608 |
| 7 |
|
| 8 |
dev-lang/gnat-gpl: align gnat-gpl-2016 ebuild to gcc-4.9.4 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
| 11 |
|
| 12 |
dev-lang/gnat-gpl/Manifest | 2 +- |
| 13 |
.../gnat-gpl/files/gnat-gpl-2016-bootstrap.patch | 66 ++++++++++++++++++++++ |
| 14 |
dev-lang/gnat-gpl/gnat-gpl-2016.ebuild | 13 ++++- |
| 15 |
3 files changed, 77 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest |
| 18 |
index 3752c9a9382..f60bded56f3 100644 |
| 19 |
--- a/dev-lang/gnat-gpl/Manifest |
| 20 |
+++ b/dev-lang/gnat-gpl/Manifest |
| 21 |
@@ -1,7 +1,7 @@ |
| 22 |
DIST ecj-4.5.jar 1470676 BLAKE2B 793c10ba09fd8040c0e1181204141aea16780c9c9088e07126e00da2b510af2ad6f58d876357d7e98cbb02d783a3be434469d5de1df134ccb8cc508e45028d80 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e |
| 23 |
DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 BLAKE2B 96f5ba2028bc6e0ef71e009857c37118a54d13d30de24d697c85e5772f9f2b7853615648cf2e4ee81d8385f6518c64588c0b56675c00f95ef39fca2a808f075e SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517 |
| 24 |
DIST gcc-4.9-gpl-2016-src.tar.gz 76361760 BLAKE2B 681aac3dd2e04110f58637cc9fe1eb663ce55af16a929a446eb59ce338bec9357e65517890f7fa01d61eec9c5041336722b2b94a5fea27a55ade686fe1fe9fbc SHA512 da1e26b4dbbe0ec634eab4e64d1cdb2632300c24f0885bc72fb57edba6ce29ab92b04eaedd8f8077ea623f1ef1428f53616e8c8d6630328d9790d968b60c67cf |
| 25 |
-DIST gcc-4.9.4-patches-1.0.tar.bz2 22266 BLAKE2B 38536e8a86a8296754311633b73da0bd7dddb3a6ac65e4b5ba1dde352789e9114a1129aad11bcb988a1baadec6fdf893290c6af83bb9fad5613f35a37ebbb12e SHA512 cc2407221f858bad38b57d31f635314f91794293695e23d255685d8bec20b9db19c7dc76bbf5e8184c2ba0ccb530958b09bae4d8a402ca27cadf463f46bfb995 |
| 26 |
+DIST gcc-4.9.4-patches-1.2.tar.bz2 25447 BLAKE2B 3141897688409c84cab4ffea67deb220d2218107f279a0cc1758d08c858f3a3856150df48ae37d2f14c6f69bc82de1e87f22cc356f179dfdf47ae9eef28a4182 SHA512 61b1e86e8dbc2838e7b5c88c4a3bab9ed5b6485258b7971799850ffd97cb67ad2564552af4e9ebc860dcc2a4b786c91d2079469468fb95f8e28e2fc981b4c812 |
| 27 |
DIST gcc-4.9.4-piepatches-v0.6.4.tar.bz2 14414 BLAKE2B 2eccd4f2a164fbb32d13c7fe91627a2424c0a5570fe0cac97c2bb1c95294ba3d770832da7c445f75c91791466c5139a1e13753a3a40d87ff5e44e42749adee27 SHA512 243fa272ea0e49f700a76508bab3e03bbb353bcb930581b2f87f9a47df5cd3880e29f20b71612b21190adc463849e1e6ac2a38a49c0002b562d93d436f538285 |
| 28 |
DIST gcc-4.9.4-uclibc-patches-1.0.tar.bz2 2618 BLAKE2B bff85a4088fb94fdb7a8b0bd552be98ace3e6d145889b6f8b4a1f2db2dad14342d155890ab159b42d5b55d88dfb7c392eb7f92590084e1958f6284c561da30f1 SHA512 5a1f44caa9261f4947101379628143869b31dec67fa28605e8e1f3894d4b7120c3f68ba6deb59da7a74fa906e27ab32cd3767761837dc3dfebc37865d349d6db |
| 29 |
DIST gcc-4.9.4.tar.bz2 90097606 BLAKE2B 373ff939ea72d6c4a7f3ab899b852b4c919481af2cfe3291281d9354c58a270d2eba73a0f301d90840dfabf423c82b368e113df7a2cb6cc28b2a703b0b6eb585 SHA512 93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe |
| 30 |
|
| 31 |
diff --git a/dev-lang/gnat-gpl/files/gnat-gpl-2016-bootstrap.patch b/dev-lang/gnat-gpl/files/gnat-gpl-2016-bootstrap.patch |
| 32 |
new file mode 100644 |
| 33 |
index 00000000000..aed1ad0e90b |
| 34 |
--- /dev/null |
| 35 |
+++ b/dev-lang/gnat-gpl/files/gnat-gpl-2016-bootstrap.patch |
| 36 |
@@ -0,0 +1,66 @@ |
| 37 |
+From 41a4aa66eac45c8862a79351647ec06dd03bd1f5 Mon Sep 17 00:00:00 2001 |
| 38 |
+From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> |
| 39 |
+Date: Sat, 13 Dec 2014 11:24:37 +0000 |
| 40 |
+Subject: [PATCH] PR bootstrap/64023 * Makefile.tpl |
| 41 |
+ (EXTRA_TARGET_FLAGS): Set STAGE1_LDFLAGS to POSTSTAGE1_LDFLAGS and |
| 42 |
+ STAGE1_LIBS to POSTSTAGE1_LIBS. Add -B to libstdc++-v3/src/.libs and |
| 43 |
+ libstdc++-v3/libsupc++/.libs to CXX. * Makefile.in: Regenerated. |
| 44 |
+ |
| 45 |
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@218705 138bc75d-0d04-0410-961f-82ee72b054a4 |
| 46 |
+--- |
| 47 |
+ ChangeLog | 9 +++++++++ |
| 48 |
+ Makefile.in | 6 +++++- |
| 49 |
+ Makefile.tpl | 6 +++++- |
| 50 |
+ 3 files changed, 19 insertions(+), 2 deletions(-) |
| 51 |
+ |
| 52 |
+diff --git a/Makefile.in b/Makefile.in |
| 53 |
+index ba5ae4c2ecb..8ffc313f157 100644 |
| 54 |
+--- a/Makefile.in |
| 55 |
++++ b/Makefile.in |
| 56 |
+@@ -835,7 +835,9 @@ EXTRA_TARGET_FLAGS = \ |
| 57 |
+ 'AS=$(COMPILER_AS_FOR_TARGET)' \ |
| 58 |
+ 'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ |
| 59 |
+ 'CFLAGS=$$(CFLAGS_FOR_TARGET)' \ |
| 60 |
+- 'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ |
| 61 |
++ 'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \ |
| 62 |
++ -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \ |
| 63 |
++ $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ |
| 64 |
+ 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \ |
| 65 |
+ 'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \ |
| 66 |
+ 'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ |
| 67 |
+@@ -853,6 +855,8 @@ EXTRA_TARGET_FLAGS = \ |
| 68 |
+ 'WINDRES=$$(WINDRES_FOR_TARGET)' \ |
| 69 |
+ 'WINDMC=$$(WINDMC_FOR_TARGET)' \ |
| 70 |
+ 'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \ |
| 71 |
++ 'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \ |
| 72 |
++ 'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \ |
| 73 |
+ "TFLAGS=$$TFLAGS" |
| 74 |
+ |
| 75 |
+ TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) |
| 76 |
+diff --git a/Makefile.tpl b/Makefile.tpl |
| 77 |
+index dcbc6b1b143..bb8227eaafa 100644 |
| 78 |
+--- a/Makefile.tpl |
| 79 |
++++ b/Makefile.tpl |
| 80 |
+@@ -641,7 +641,9 @@ EXTRA_TARGET_FLAGS = \ |
| 81 |
+ 'AS=$(COMPILER_AS_FOR_TARGET)' \ |
| 82 |
+ 'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ |
| 83 |
+ 'CFLAGS=$$(CFLAGS_FOR_TARGET)' \ |
| 84 |
+- 'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ |
| 85 |
++ 'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \ |
| 86 |
++ -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \ |
| 87 |
++ $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ |
| 88 |
+ 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \ |
| 89 |
+ 'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \ |
| 90 |
+ 'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ |
| 91 |
+@@ -659,6 +661,8 @@ EXTRA_TARGET_FLAGS = \ |
| 92 |
+ 'WINDRES=$$(WINDRES_FOR_TARGET)' \ |
| 93 |
+ 'WINDMC=$$(WINDMC_FOR_TARGET)' \ |
| 94 |
+ 'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \ |
| 95 |
++ 'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \ |
| 96 |
++ 'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \ |
| 97 |
+ "TFLAGS=$$TFLAGS" |
| 98 |
+ |
| 99 |
+ TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) |
| 100 |
+-- |
| 101 |
+2.15.0 |
| 102 |
+ |
| 103 |
|
| 104 |
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild |
| 105 |
index 89ff9031378..8a347c7803b 100644 |
| 106 |
--- a/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild |
| 107 |
+++ b/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild |
| 108 |
@@ -1,9 +1,9 @@ |
| 109 |
# Copyright 1999-2017 Gentoo Foundation |
| 110 |
# Distributed under the terms of the GNU General Public License v2 |
| 111 |
|
| 112 |
-EAPI=5 |
| 113 |
+EAPI="5" |
| 114 |
|
| 115 |
-PATCH_VER="1.0" |
| 116 |
+PATCH_VER="1.2" |
| 117 |
UCLIBC_VER="1.0" |
| 118 |
|
| 119 |
# Hardened gcc 4 stuff |
| 120 |
@@ -48,11 +48,15 @@ DEPEND="${RDEPEND} |
| 121 |
elibc_glibc? ( >=sys-libs/glibc-2.8 ) |
| 122 |
>=sys-devel/binutils-2.20" |
| 123 |
|
| 124 |
+PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )" |
| 125 |
+ |
| 126 |
S="${WORKDIR}"/${MYP} |
| 127 |
|
| 128 |
FSFGCC=gcc-${TOOLCHAIN_GCC_PV} |
| 129 |
|
| 130 |
pkg_setup() { |
| 131 |
+ toolchain_pkg_setup |
| 132 |
+ |
| 133 |
if use bootstrap; then |
| 134 |
GCC="${WORKDIR}"/gnat-gpl-2014-x86_64-linux-bin/bin/gcc |
| 135 |
else |
| 136 |
@@ -120,10 +124,13 @@ src_prepare() { |
| 137 |
EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch" |
| 138 |
fi |
| 139 |
|
| 140 |
+ # Bug 638056 |
| 141 |
+ epatch "${FILESDIR}/${P}-bootstrap.patch" |
| 142 |
+ |
| 143 |
toolchain_src_prepare |
| 144 |
|
| 145 |
use vanilla && return 0 |
| 146 |
- #Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs. |
| 147 |
+ # Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs. |
| 148 |
[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch |
| 149 |
} |
Archives