[gentoo-commits] dev/mgorny:master commit in: sys-devel/gcc/files/, sys-devel/gcc/
commit: e3442972f033a50c39ce9c406489449c010b87a2 Author: Michał Górny mgorny AT gentoo DOT org AuthorDate: Sun Apr 12 14:00:05 2015 + Commit: Michał Górny mgorny AT gentoo DOT org CommitDate: Sun Apr 12 14:00:05 2015 + URL:https://gitweb.gentoo.org/dev/mgorny.git/commit/?id=e3442972 Drop the gcc fork sys-devel/gcc/Manifest | 5 - .../gcc-4.6.4-fix-libgcc-s-path-with-vsrl.patch| 21 - sys-devel/gcc/files/gcc-configure-texinfo.patch| 16 - sys-devel/gcc/files/gcc-spec-env-r1.patch | 87 --- sys-devel/gcc/gcc-4.9.2-r100.ebuild| 643 - sys-devel/gcc/metadata.xml | 26 - 6 files changed, 798 deletions(-) diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest deleted file mode 100644 index 9761876..000 --- a/sys-devel/gcc/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 SHA256 f6c7cb99beead66dd4d06f7004c5731a9360330cbe878ce79792c618e008eed2 SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517 WHIRLPOOL 8a1e45aad9d306cb19de93c63b5854a97e629d90852feb6861dcfca042b6257705304fc13ad65655a4cb227d36b83fc6063648c94f270821574ee0e85307094e -DIST gcc-4.9.2-patches-1.0.tar.bz2 18213 SHA256 e4e9a665381beb4018779a14d5124528a9d5df0e0772f3b7639390d6bda51515 SHA512 27deba0db6a500b160829fdcf5fc9a70be4b4fbd45c89d18dd2d0808d42803657693d0ed0f2b664e020a0d2ac39cdfe550e397eb4c2a6f64220cae1e7a16ff20 WHIRLPOOL 7e04ed92038f19a9b00fe0022c2c7ce3df8621fccca95cb2da37333a5edcc0857efe96aed68f5c4b51db19ecd23ec1194412f1bc24730cea30db7b342c12dfdf -DIST gcc-4.9.2-piepatches-v0.6.1.tar.bz2 14185 SHA256 590d11ea5723812fff3239c5eaed4b040b26a92586de0e42a84438f742eaac0b SHA512 89560e96bc205e848936acc4d3423ff5e1ea5ee478848edfe2b992585cea0df21eb102b1f1bee55c10568d4ca54bb3f4e8ae72aa695e34a908abfda3585fb992 WHIRLPOOL e6db4a2e5fdf762bd4f0fa70d630499bf6789a0c3b7ca193b455bb22f95f5f2983358ba9f28bd85b571a3a44a691ca797762302a1f2ea63ce170752f7e44128b -DIST gcc-4.9.2-uclibc-patches-1.0.tar.bz2 2540 SHA256 3ca63cba5edb01367352fcd558890a838630deb4c30f82f4c7e8074ad75e57fc SHA512 69f6f80e23efee0b937fca0f2056e17b4fe643817d2394bbfd16cbb453d74c76a0bb8727815f689a795897d9cd5e06ecc74d3d9ad45175fe837ad008eee09706 WHIRLPOOL 3946513e83960fe891267e103e434cae0616cd45b5e7eaff5f4f671741c1445941cf80b7497231cf50f137941c01859dbbac0a95745fb7ae663a3ee512bd7162 -DIST gcc-4.9.2.tar.bz2 89939747 SHA256 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd SHA512 e96cba06d572dbe7f382a2b00fd9297dcf9f9219d46a9ad0bd904dc36d5e7db3335e422640b79a27fed6fde91b0731732b94a0e2fbcd47344d6779f8ba1f4f9c WHIRLPOOL c4afdd0ec98e6f903044f1d3061fd96cf1e9bcbe2f90c388f5bc9ff8b2493b94367e84fdff7c2075ba37e2f950ecf2dba7c11786c653c2c7e86a5e8ff7d98e85 diff --git a/sys-devel/gcc/files/gcc-4.6.4-fix-libgcc-s-path-with-vsrl.patch b/sys-devel/gcc/files/gcc-4.6.4-fix-libgcc-s-path-with-vsrl.patch deleted file mode 100644 index 11c3731..000 --- a/sys-devel/gcc/files/gcc-4.6.4-fix-libgcc-s-path-with-vsrl.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -urN gcc-4.6.4/libgcc/Makefile.in gcc-4.6.4-fixed/libgcc/Makefile.in gcc-4.6.4/libgcc/Makefile.in 2013-04-24 00:12:29.213242770 + -+++ gcc-4.6.4-fixed/libgcc/Makefile.in 2013-04-24 01:19:14.909313041 + -@@ -945,7 +945,7 @@ - - $(subst @multilib_dir@,$(MULTIDIR),$(subst \ - @shlib_base_name@,libunwind,$(subst \ -- @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIBUNWIND_INSTALL -+ @shlib_slibdir_qual@,$(MULTISUBDIR),$(SHLIBUNWIND_INSTALL - - install-shared: - $(mkinstalldirs) $(DESTDIR)$(inst_libdir) -@@ -956,7 +956,7 @@ - - $(subst @multilib_dir@,$(MULTIDIR),$(subst \ - @shlib_base_name@,libgcc_s,$(subst \ -- @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL -+ @shlib_slibdir_qual@,$(MULTISUBDIR),$(SHLIB_INSTALL - - install-leaf: $(install-shared) $(install-libunwind) - $(mkinstalldirs) $(DESTDIR)$(inst_libdir) diff --git a/sys-devel/gcc/files/gcc-configure-texinfo.patch b/sys-devel/gcc/files/gcc-configure-texinfo.patch deleted file mode 100644 index ddc098d..000 --- a/sys-devel/gcc/files/gcc-configure-texinfo.patch +++ /dev/null @@ -1,16 +0,0 @@ -Chances are quite good that the installed makeinfo is sufficient. -So ignore false positives where the makeinfo installed is so new -that it violates the cheesy version grep. - -http://bugs.gentoo.org/198182 - configure -+++ configure -@@ -3573,6 +3573,6 @@ - : - else -- MAKEINFO=$MISSING makeinfo -+ : - fi - ;; - diff --git a/sys-devel/gcc/files/gcc-spec-env-r1.patch b/sys-devel/gcc/files/gcc-spec-env-r1.patch deleted file mode 100644 index a589268..000 --- a/sys-devel/gcc/files/gcc-spec-env-r1.patch +++ /dev/null @@ -1,87 +0,0 @@ -2013-08-22 Magnus
[gentoo-commits] dev/mgorny:master commit in: sys-devel/gcc/files/, sys-devel/gcc/
commit: 923e50e4a537bbcf714d29c091ee85b64ba54bba
Author: Michał Górny mgorny AT gentoo DOT org
AuthorDate: Tue Dec 2 10:25:45 2014 +
Commit: Michał Górny mgorny AT gentoo DOT org
CommitDate: Tue Dec 2 10:25:45 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=923e50e4
sys-devel/gcc: initial fork
---
sys-devel/gcc/Manifest | 5 +
sys-devel/gcc/files/gcc-configure-texinfo.patch | 16 +
sys-devel/gcc/files/gcc-spec-env-r1.patch | 87 +
sys-devel/gcc/gcc-4.9.2-r100.ebuild | 453
4 files changed, 561 insertions(+)
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
new file mode 100644
index 000..9761876
--- /dev/null
+++ b/sys-devel/gcc/Manifest
@@ -0,0 +1,5 @@
+DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 SHA256
f6c7cb99beead66dd4d06f7004c5731a9360330cbe878ce79792c618e008eed2 SHA512
779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517
WHIRLPOOL
8a1e45aad9d306cb19de93c63b5854a97e629d90852feb6861dcfca042b6257705304fc13ad65655a4cb227d36b83fc6063648c94f270821574ee0e85307094e
+DIST gcc-4.9.2-patches-1.0.tar.bz2 18213 SHA256
e4e9a665381beb4018779a14d5124528a9d5df0e0772f3b7639390d6bda51515 SHA512
27deba0db6a500b160829fdcf5fc9a70be4b4fbd45c89d18dd2d0808d42803657693d0ed0f2b664e020a0d2ac39cdfe550e397eb4c2a6f64220cae1e7a16ff20
WHIRLPOOL
7e04ed92038f19a9b00fe0022c2c7ce3df8621fccca95cb2da37333a5edcc0857efe96aed68f5c4b51db19ecd23ec1194412f1bc24730cea30db7b342c12dfdf
+DIST gcc-4.9.2-piepatches-v0.6.1.tar.bz2 14185 SHA256
590d11ea5723812fff3239c5eaed4b040b26a92586de0e42a84438f742eaac0b SHA512
89560e96bc205e848936acc4d3423ff5e1ea5ee478848edfe2b992585cea0df21eb102b1f1bee55c10568d4ca54bb3f4e8ae72aa695e34a908abfda3585fb992
WHIRLPOOL
e6db4a2e5fdf762bd4f0fa70d630499bf6789a0c3b7ca193b455bb22f95f5f2983358ba9f28bd85b571a3a44a691ca797762302a1f2ea63ce170752f7e44128b
+DIST gcc-4.9.2-uclibc-patches-1.0.tar.bz2 2540 SHA256
3ca63cba5edb01367352fcd558890a838630deb4c30f82f4c7e8074ad75e57fc SHA512
69f6f80e23efee0b937fca0f2056e17b4fe643817d2394bbfd16cbb453d74c76a0bb8727815f689a795897d9cd5e06ecc74d3d9ad45175fe837ad008eee09706
WHIRLPOOL
3946513e83960fe891267e103e434cae0616cd45b5e7eaff5f4f671741c1445941cf80b7497231cf50f137941c01859dbbac0a95745fb7ae663a3ee512bd7162
+DIST gcc-4.9.2.tar.bz2 89939747 SHA256
2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd SHA512
e96cba06d572dbe7f382a2b00fd9297dcf9f9219d46a9ad0bd904dc36d5e7db3335e422640b79a27fed6fde91b0731732b94a0e2fbcd47344d6779f8ba1f4f9c
WHIRLPOOL
c4afdd0ec98e6f903044f1d3061fd96cf1e9bcbe2f90c388f5bc9ff8b2493b94367e84fdff7c2075ba37e2f950ecf2dba7c11786c653c2c7e86a5e8ff7d98e85
diff --git a/sys-devel/gcc/files/gcc-configure-texinfo.patch
b/sys-devel/gcc/files/gcc-configure-texinfo.patch
new file mode 100644
index 000..ddc098d
--- /dev/null
+++ b/sys-devel/gcc/files/gcc-configure-texinfo.patch
@@ -0,0 +1,16 @@
+Chances are quite good that the installed makeinfo is sufficient.
+So ignore false positives where the makeinfo installed is so new
+that it violates the cheesy version grep.
+
+http://bugs.gentoo.org/198182
+
+--- configure
configure
+@@ -3573,6 +3573,6 @@
+ :
+ else
+- MAKEINFO=$MISSING makeinfo
++ :
+ fi
+ ;;
+
diff --git a/sys-devel/gcc/files/gcc-spec-env-r1.patch
b/sys-devel/gcc/files/gcc-spec-env-r1.patch
new file mode 100644
index 000..a589268
--- /dev/null
+++ b/sys-devel/gcc/files/gcc-spec-env-r1.patch
@@ -0,0 +1,87 @@
+2013-08-22 Magnus Granberg zo...@gentoo.org
+
+ * gcc/gcc.c (main): Add support for external spec file via the
GCC_SPECS env var
+ and move the process of the user specifed specs.
+
+This allows us to easily control pie/ssp defaults with gcc-config profiles.
+Original patch by Rob Holland
+Extended to support multiple entries separated by ':' by Kevin F. Quinn
+Modified to use getenv instead of poisoned GET_ENVIRONMENT by Ryan Hill
+Modified to process the GCC_SPECS env var befor DRIVER_SELF_SPECS by
Magnus Granberg
+
+--- gcc-4.8-20130210/gcc/gcc.c 2013-02-05 16:55:31.0 +0100
gcc-4.8-20130210-work/gcc/gcc.c2013-07-26 02:32:14.625089864 +0200
+@@ -6427,6 +6428,48 @@ main (int argc, char **argv)
+ do_option_spec (option_default_specs[i].name,
+ option_default_specs[i].spec);
+
++#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS) || defined
(WIN32))
++ /* Add specs listed in GCC_SPECS. Note; in the process of separating
++ * each spec listed, the string is overwritten at token boundaries
++ * (':') with '\0', an effect of strtok_r().
++ */
++ specs_file = getenv (GCC_SPECS);
++ if (specs_file (strlen(specs_file) 0))
++{
++ char *spec, *saveptr;
++ for (spec=strtok_r(specs_file,:,saveptr);
++ spec!=NULL;
++ spec=strtok_r(NULL,:,saveptr))
++{
++
[gentoo-commits] dev/mgorny:master commit in: sys-devel/gcc/files/, sys-devel/gcc/
commit: 312bd3143a3842f072d096dbda4af9ee9a127ca7
Author: Michał Górny mgorny AT gentoo DOT org
AuthorDate: Tue Dec 2 22:38:53 2014 +
Commit: Michał Górny mgorny AT gentoo DOT org
CommitDate: Tue Dec 2 22:38:53 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=312bd314
sys-devel/gcc: Complete install (hopefully).
Package-Manager: portage-2.2.14
---
.../gcc-4.6.4-fix-libgcc-s-path-with-vsrl.patch| 21 ++
sys-devel/gcc/gcc-4.9.2-r100.ebuild| 250 +
2 files changed, 233 insertions(+), 38 deletions(-)
diff --git a/sys-devel/gcc/files/gcc-4.6.4-fix-libgcc-s-path-with-vsrl.patch
b/sys-devel/gcc/files/gcc-4.6.4-fix-libgcc-s-path-with-vsrl.patch
new file mode 100644
index 000..11c3731
--- /dev/null
+++ b/sys-devel/gcc/files/gcc-4.6.4-fix-libgcc-s-path-with-vsrl.patch
@@ -0,0 +1,21 @@
+diff -urN gcc-4.6.4/libgcc/Makefile.in gcc-4.6.4-fixed/libgcc/Makefile.in
+--- gcc-4.6.4/libgcc/Makefile.in 2013-04-24 00:12:29.213242770 +
gcc-4.6.4-fixed/libgcc/Makefile.in 2013-04-24 01:19:14.909313041 +
+@@ -945,7 +945,7 @@
+
+ $(subst @multilib_dir@,$(MULTIDIR),$(subst \
+ @shlib_base_name@,libunwind,$(subst \
+- @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIBUNWIND_INSTALL
++ @shlib_slibdir_qual@,$(MULTISUBDIR),$(SHLIBUNWIND_INSTALL
+
+ install-shared:
+ $(mkinstalldirs) $(DESTDIR)$(inst_libdir)
+@@ -956,7 +956,7 @@
+
+ $(subst @multilib_dir@,$(MULTIDIR),$(subst \
+ @shlib_base_name@,libgcc_s,$(subst \
+- @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL
++ @shlib_slibdir_qual@,$(MULTISUBDIR),$(SHLIB_INSTALL
+
+ install-leaf: $(install-shared) $(install-libunwind)
+ $(mkinstalldirs) $(DESTDIR)$(inst_libdir)
diff --git a/sys-devel/gcc/gcc-4.9.2-r100.ebuild
b/sys-devel/gcc/gcc-4.9.2-r100.ebuild
index bbde906..6f6d359 100644
--- a/sys-devel/gcc/gcc-4.9.2-r100.ebuild
+++ b/sys-devel/gcc/gcc-4.9.2-r100.ebuild
@@ -63,6 +63,9 @@ REQUIRED_USE=
pie? ( !vanilla )
ssp? ( !vanilla )
+# Custom magic.
+RESTRICT=strip
+
pkg_setup() {
export CTARGET=${CTARGET:-${CHOST}}
@@ -102,13 +105,16 @@ setup_multilib_osdirnames() {
src_prepare() {
export BRANDING_GCC_PKGVERSION=Gentoo ${PVR}::mgorny
- if has_version 'sys-libs/glibc-2.12' ; then
- ewarn Your host glibc is too old; disabling automatic fortify.
- ewarn Please rebuild gcc after upgrading to =glibc-2.12
#362315
- rm ${WORKDIR}/patch/10_all_default-fortify-source.patch || die
- fi
+ # fix libgcc_s install path
+ epatch ${FILESDIR}/gcc-4.6.4-fix-libgcc-s-path-with-vsrl.patch || die
if ! use vanilla; then
+ if has_version 'sys-libs/glibc-2.12' ; then
+ ewarn Your host glibc is too old; disabling automatic
fortify.
+ ewarn Please rebuild gcc after upgrading to
=glibc-2.12 #362315
+ rm
${WORKDIR}/patch/10_all_default-fortify-source.patch || die
+ fi
+
BRANDING_GCC_PKGVERSION+= p${PATCH_VER}
einfo Applying Gentoo patches ...
@@ -184,12 +190,12 @@ src_configure() {
einfo CXXFLAGS: ${CXXFLAGS}
einfo LDFLAGS: ${LDFLAGS}
- local prefix=/usr
- local binpath=${prefix}/${CTARGET}/gcc-bin/${PV}
- local libpath=${prefix}/lib/gcc/${CTARGET}/${PV}
- local incpath=${libpath}/include
- local datapath=${prefix}/share/gcc-data/${CTARGET}/${PV}
- local stdcxx_incdir=${libpath}/include/g++-v${GCC_BRANCH_VER%%.*}
+ PREFIX=/usr
+ BINPATH=${PREFIX}/${CTARGET}/gcc-bin/${PV}
+ LIBPATH=${PREFIX}/lib/gcc/${CTARGET}/${PV}
+ INCPATH=${LIBPATH}/include
+ DATAPATH=${PREFIX}/share/gcc-data/${CTARGET}/${PV}
+ STDCXX_INCDIR=${LIBPATH}/include/g++-v${GCC_BRANCH_VER%%.*}
local langs=( c )
use cxx langs+=( c++ )
@@ -203,18 +209,19 @@ src_configure() {
--host=${CHOST}
--build=${CBUILD:-${CHOST}}
- --prefix=${prefix}
- --bindir=${binpath}
- --includedir=${incpath}
- --datadir=${datapath}
- --mandir=${datapath}/man
- --infodir=${datapath}/info
- --with-gxx-include-dir=${stdcxx_incdir}
- --with-python-dir=${datapath#${prefix}/}/python
+ --prefix=${PREFIX}
+ --bindir=${BINPATH}
+ --includedir=${INCPATH}
+ --datadir=${DATAPATH}
+ --mandir=${DATAPATH}/man
+ --infodir=${DATAPATH}/info
+ --with-gxx-include-dir=${STDCXX_INCDIR}
+ --with-python-dir=${DATAPATH#${PREFIX}/}/python
--enable-languages=${langs// /,}
--disable-libgcj
+
