From 1240a7ac13cd8bdfe1e3c9f197fdaec5df03f3d1 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 5 Oct 2017 13:56:01 +0200 Subject: [PATCH 1/6] gcc: Convert to versionless bee file --- gcc-5.3.0-0.bee => gcc.be0 | 2 ++ 1 file changed, 2 insertions(+) rename gcc-5.3.0-0.bee => gcc.be0 (97%) diff --git a/gcc-5.3.0-0.bee b/gcc.be0 similarity index 97% rename from gcc-5.3.0-0.bee rename to gcc.be0 index 50970cf83..83e978469 100755 --- a/gcc-5.3.0-0.bee +++ b/gcc.be0 @@ -1,5 +1,7 @@ #!/bin/env beesh +# BEE_VERSION gcc-5.3.0-0 + SRCURL[0]="http://ftp.gnu.org/gnu/gcc/gcc-${PKGVERSION}/gcc-${PKGVERSION}.tar.bz2" LIBEXECDIR=/usr/lib From a06b1a135fd87351d0c1e470b53f7a77a700e31e Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 5 Oct 2017 13:57:35 +0200 Subject: [PATCH 2/6] gcc: Remove some whitespace --- gcc.be0 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gcc.be0 b/gcc.be0 index 83e978469..8ebe05579 100755 --- a/gcc.be0 +++ b/gcc.be0 @@ -11,12 +11,11 @@ mee_patch_post() { # ignore libiberty.. used from binutils.. sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in - + # don't fix includes.. sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in } - mee_configure() { bee_configure \ --enable-shared \ @@ -45,10 +44,10 @@ mee_install_post() { mv -v ${D}${LIBDIR}64/* ${D}${LIBDIR} rmdir -v ${D}${LIBDIR}64 - + mkdir -p ${D}${DATADIR}/gdb/auto-load/${LIBDIR} mv -v ${D}${LIBDIR}/*-gdb.py ${D}${DATADIR}/gdb/auto-load/${LIBDIR} - + echo "${S}/contrib/test_summary | grep -A7 Sum" echo "grep FAIL ${B}/check.log" } From bfd15b9370d3489a54b8dbc3f8adf6053c46fdad Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 5 Oct 2017 13:59:37 +0200 Subject: [PATCH 3/6] gcc: Use https in download url --- gcc.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc.be0 b/gcc.be0 index 8ebe05579..741953554 100755 --- a/gcc.be0 +++ b/gcc.be0 @@ -2,7 +2,7 @@ # BEE_VERSION gcc-5.3.0-0 -SRCURL[0]="http://ftp.gnu.org/gnu/gcc/gcc-${PKGVERSION}/gcc-${PKGVERSION}.tar.bz2" +SRCURL[0]="https://ftp.gnu.org/gnu/gcc/gcc-${PKGVERSION}/gcc-${PKGVERSION}.tar.bz2" LIBEXECDIR=/usr/lib LIBDIR=/usr/lib From 954d2f555a1d2fd782b6abcacf4be11cf27c3f11 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 5 Oct 2017 14:00:12 +0200 Subject: [PATCH 4/6] gcc: Update version from 5.3 to 5.4 (latest) List of problems fixed in this release: We had some problems compiling the 5.4.0 release [1] with glibc 2.23, so use latest revision on the 5.4 branch, where all these problemes were already fixed. [1] https://github.molgen.mpg.de/mariux64/bee-files/pull/502 --- gcc.be0 | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gcc.be0 b/gcc.be0 index 741953554..483c623e7 100755 --- a/gcc.be0 +++ b/gcc.be0 @@ -1,8 +1,13 @@ #!/bin/env beesh -# BEE_VERSION gcc-5.3.0-0 - -SRCURL[0]="https://ftp.gnu.org/gnu/gcc/gcc-${PKGVERSION}/gcc-${PKGVERSION}.tar.bz2" +# BEE_VERSION gcc-5.4.0-0 + +# we had some problems with the 5.4 release against glibc 2.26 +# which are already fixed on the gcc-5 branch +# +# bee download -c gcc-5-branch https://gcc.gnu.org/git/gcc.git +# +SRCURL[0]="/src/mariux/download/gcc-5.4.0_release_p1052_5de58e00a7b.tar.bz2" LIBEXECDIR=/usr/lib LIBDIR=/usr/lib From ce320d07b57019988bfc9b51683ec45c1e503e88 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Fri, 6 Oct 2017 23:33:51 +0200 Subject: [PATCH 5/6] gcc: Update version from 5.4 to 7.2 gcc-7 changes: gcc-6 changes: --- gcc.be0 | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/gcc.be0 b/gcc.be0 index 483c623e7..a79a29aba 100755 --- a/gcc.be0 +++ b/gcc.be0 @@ -1,13 +1,8 @@ #!/bin/env beesh -# BEE_VERSION gcc-5.4.0-0 - -# we had some problems with the 5.4 release against glibc 2.26 -# which are already fixed on the gcc-5 branch -# -# bee download -c gcc-5-branch https://gcc.gnu.org/git/gcc.git -# -SRCURL[0]="/src/mariux/download/gcc-5.4.0_release_p1052_5de58e00a7b.tar.bz2" +# BEE_VERSION gcc-7.2.0-0 + +SRCURL[0]="https://ftp.gnu.org/gnu/gcc/gcc-${PKGVERSION}/gcc-${PKGVERSION}.tar.xz" LIBEXECDIR=/usr/lib LIBDIR=/usr/lib From 74dfec18a0d63e7568183c9536cd103ecf728a03 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Mon, 9 Oct 2017 15:35:46 +0200 Subject: [PATCH 6/6] gcc_5.3.0_compat: Add version 1 Several packages depend on libgfortran.so.3 provided by gcc-5.3. Examples of packages: - julia-0.6.0-0.x86_64 - arpack-3.1.5-0.x86_64 - lapack-3.5.0-1.x86_64 - openblas-0.2.19-0.x86_64 - numpy_python2.6-1.7.0b2-0.x86_64 - numpy-1.10.4-0.x86_64 - scipy_python3.3-0.11.0-0.x86_64 Provide libgfortran.so.3 from gcc-5.3.0-0. --- gcc_5.3.0_compat.be0 | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100755 gcc_5.3.0_compat.be0 diff --git a/gcc_5.3.0_compat.be0 b/gcc_5.3.0_compat.be0 new file mode 100755 index 000000000..2838902eb --- /dev/null +++ b/gcc_5.3.0_compat.be0 @@ -0,0 +1,19 @@ +#! /usr/bin/env beesh + +# BEE_VERSION gcc_5.3.0_compat-1.0-0 + +# provide libgfortran.so.3.0.0 from gcc-5.3.0-0.x86_64 + +SRCURL=() + +mee_install() { + cd ${D} + tar xpf /src/mariux/beeroot/packages/gcc-5.3.0-0.x86_64.bee.tar.bz2 \ + /usr/lib/libgfortran.so.3 \ + /usr/lib/libgfortran.so.3.0.0 +} + + + + +