commit cdb924ff4d9abfb9a0b36e824a47c784aa604a75 Author: Danny Rawlins <monster.romster@gmail.com> Date: Fri Nov 13 12:45:34 2015 +1100 gcc-fortran: 4.8.5 -> 5.2.0 diff --git a/gcc-fortran/.footprint b/gcc-fortran/.footprint index 2a99e3d..ea0c0ff 100644 --- a/gcc-fortran/.footprint +++ b/gcc-fortran/.footprint @@ -7,24 +7,47 @@ lrwxrwxrwx root/root usr/bin/g77 -> gfortran drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/gcc/ drwxr-xr-x root/root usr/lib/gcc/x86_64-unknown-linux-gnu/ -drwxr-xr-x root/root usr/lib/gcc/x86_64-unknown-linux-gnu/4.8.5/ --rwxr-xr-x root/root usr/lib/gcc/x86_64-unknown-linux-gnu/4.8.5/f951 -drwxr-xr-x root/root usr/lib/gcc/x86_64-unknown-linux-gnu/4.8.5/finclude/ --rw-r--r-- root/root usr/lib/gcc/x86_64-unknown-linux-gnu/4.8.5/finclude/omp_lib.f90 --rw-r--r-- root/root usr/lib/gcc/x86_64-unknown-linux-gnu/4.8.5/finclude/omp_lib.h --rw-r--r-- root/root usr/lib/gcc/x86_64-unknown-linux-gnu/4.8.5/finclude/omp_lib.mod --rw-r--r-- root/root usr/lib/gcc/x86_64-unknown-linux-gnu/4.8.5/finclude/omp_lib_kinds.mod --rw-r--r-- root/root usr/lib/gcc/x86_64-unknown-linux-gnu/4.8.5/libcaf_single.a --rwxr-xr-x root/root usr/lib/gcc/x86_64-unknown-linux-gnu/4.8.5/libcaf_single.la --rw-r--r-- root/root usr/lib/gcc/x86_64-unknown-linux-gnu/4.8.5/libgfortranbegin.a --rwxr-xr-x root/root usr/lib/gcc/x86_64-unknown-linux-gnu/4.8.5/libgfortranbegin.la +drwxr-xr-x root/root usr/lib/gcc/x86_64-unknown-linux-gnu/5.2.0/ +drwxr-xr-x root/root usr/lib/gcc/x86_64-unknown-linux-gnu/5.2.0/32/ +drwxr-xr-x root/root usr/lib/gcc/x86_64-unknown-linux-gnu/5.2.0/32/finclude/ +-rw-r--r-- root/root usr/lib/gcc/x86_64-unknown-linux-gnu/5.2.0/32/finclude/ieee_arithmetic.mod +-rw-r--r-- root/root usr/lib/gcc/x86_64-unknown-linux-gnu/5.2.0/32/finclude/ieee_exceptions.mod +-rw-r--r-- root/root usr/lib/gcc/x86_64-unknown-linux-gnu/5.2.0/32/finclude/ieee_features.mod +-rw-r--r-- root/root usr/lib/gcc/x86_64-unknown-linux-gnu/5.2.0/32/libcaf_single.a +-rwxr-xr-x root/root usr/lib/gcc/x86_64-unknown-linux-gnu/5.2.0/32/libcaf_single.la +-rw-r--r-- root/root usr/lib/gcc/x86_64-unknown-linux-gnu/5.2.0/32/libgfortranbegin.a +-rwxr-xr-x root/root usr/lib/gcc/x86_64-unknown-linux-gnu/5.2.0/32/libgfortranbegin.la +-rwxr-xr-x root/root usr/lib/gcc/x86_64-unknown-linux-gnu/5.2.0/f951 +drwxr-xr-x root/root usr/lib/gcc/x86_64-unknown-linux-gnu/5.2.0/finclude/ +-rw-r--r-- root/root usr/lib/gcc/x86_64-unknown-linux-gnu/5.2.0/finclude/ieee_arithmetic.mod +-rw-r--r-- root/root usr/lib/gcc/x86_64-unknown-linux-gnu/5.2.0/finclude/ieee_exceptions.mod +-rw-r--r-- root/root usr/lib/gcc/x86_64-unknown-linux-gnu/5.2.0/finclude/ieee_features.mod +-rw-r--r-- root/root usr/lib/gcc/x86_64-unknown-linux-gnu/5.2.0/finclude/omp_lib.f90 +-rw-r--r-- root/root usr/lib/gcc/x86_64-unknown-linux-gnu/5.2.0/finclude/omp_lib.h +-rw-r--r-- root/root usr/lib/gcc/x86_64-unknown-linux-gnu/5.2.0/finclude/omp_lib.mod +-rw-r--r-- root/root usr/lib/gcc/x86_64-unknown-linux-gnu/5.2.0/finclude/omp_lib_kinds.mod +-rw-r--r-- root/root usr/lib/gcc/x86_64-unknown-linux-gnu/5.2.0/finclude/openacc.f90 +-rw-r--r-- root/root usr/lib/gcc/x86_64-unknown-linux-gnu/5.2.0/finclude/openacc.mod +-rw-r--r-- root/root usr/lib/gcc/x86_64-unknown-linux-gnu/5.2.0/finclude/openacc_kinds.mod +-rw-r--r-- root/root usr/lib/gcc/x86_64-unknown-linux-gnu/5.2.0/finclude/openacc_lib.h +-rw-r--r-- root/root usr/lib/gcc/x86_64-unknown-linux-gnu/5.2.0/libcaf_single.a +-rwxr-xr-x root/root usr/lib/gcc/x86_64-unknown-linux-gnu/5.2.0/libcaf_single.la +-rw-r--r-- root/root usr/lib/gcc/x86_64-unknown-linux-gnu/5.2.0/libgfortranbegin.a +-rwxr-xr-x root/root usr/lib/gcc/x86_64-unknown-linux-gnu/5.2.0/libgfortranbegin.la -rw-r--r-- root/root usr/lib/libgfortran.a -rwxr-xr-x root/root usr/lib/libgfortran.la lrwxrwxrwx root/root usr/lib/libgfortran.so -> libgfortran.so.3.0.0 lrwxrwxrwx root/root usr/lib/libgfortran.so.3 -> libgfortran.so.3.0.0 -rwxr-xr-x root/root usr/lib/libgfortran.so.3.0.0 -rw-r--r-- root/root usr/lib/libgfortran.spec --rw-r--r-- root/root usr/lib/libiberty.a -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/gfortran.1.gz +drwxr-xr-x root/root usr/lib32/ +-rw-r--r-- root/root usr/lib32/libgfortran.a +-rwxr-xr-x root/root usr/lib32/libgfortran.la +lrwxrwxrwx root/root usr/lib32/libgfortran.so -> libgfortran.so.3.0.0 +lrwxrwxrwx root/root usr/lib32/libgfortran.so.3 -> libgfortran.so.3.0.0 +-rwxr-xr-x root/root usr/lib32/libgfortran.so.3.0.0 +-rw-r--r-- root/root usr/lib32/libgfortran.spec +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/gfortran.1.gz diff --git a/gcc-fortran/.md5sum b/gcc-fortran/.md5sum index 874859f..f57b78c 100644 --- a/gcc-fortran/.md5sum +++ b/gcc-fortran/.md5sum @@ -1,2 +1,3 @@ -80d2c2982a3392bb0b89673ff136e223 gcc-4.8.5.tar.bz2 +61a057afa31006764b957a483ba90b9d gcc-4.7.3-multilib-dirs.patch +a51bcfeb3da7dd4c623e27207ed43467 gcc-5.2.0.tar.bz2 7c9128522053af79791bcfdd55834c2a gcc-nocheck-fixincludes.patch diff --git a/gcc-fortran/Pkgfile b/gcc-fortran/Pkgfile index 58082f8..c0c9369 100644 --- a/gcc-fortran/Pkgfile +++ b/gcc-fortran/Pkgfile @@ -5,19 +5,19 @@ # Depends on: libmpfr name=gcc-fortran -version=4.8.5 +version=5.2.0 release=1 source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-$version/gcc-$version.tar.bz2 - gcc-nocheck-fixincludes.patch) + gcc-nocheck-fixincludes.patch gcc-4.7.3-multilib-dirs.patch) build() { patch -d gcc-$version -p 1 -i $SRC/gcc-nocheck-fixincludes.patch + patch -d gcc-$version -p1 -i $SRC/gcc-4.7.3-multilib-dirs.patch mkdir build cd build ../gcc-$version/configure \ --prefix=/usr \ - --mandir=/usr/man \ --libexecdir=/usr/lib \ --enable-languages=fortran \ --enable-threads=posix \ @@ -27,9 +27,9 @@ build() { --disable-nls \ --with-x=no \ --with-system-zlib \ - --disable-multilib \ + --enable-multilib \ --disable-sjlj-exceptions \ - --with-pkgversion="CRUX" + --with-pkgversion="CRUX-x86_64-multilib" if [ -n "$(pkginfo -i | grep '^ccache ')" ]; then make STAGE_CC_WRAPPER='/usr/bin/ccache' BOOT_CFLAGS="$CFLAGS" bootstrap @@ -43,10 +43,6 @@ build() { ln -fs gfortran $PKG/usr/bin/f95 ln -fs gfortran $PKG/usr/bin/g77 - # pure 64-bit has lib64 symlink to lib - mv $PKG/usr/lib64/* $PKG/usr/lib/ - rmdir $PKG/usr/lib64 - # remove un-needed files find $PKG -name 'README' -delete @@ -64,13 +60,13 @@ build() { done rm \ - $PKG/usr/lib/libstdc++.so.6.0.19-gdb.py \ + $PKG/usr/lib{,32}/libstdc++.so.6.0.21-gdb.py \ $PKG/usr/bin/*-linux-gnu-* rm -r \ - $PKG/usr/man/man7 \ + $PKG/usr/share/man/man7 \ $PKG/usr/share/info \ - $PKG/usr/share/gcc-4.8.?/python \ + $PKG/usr/share/gcc-5.2.?/python \ $PKG/usr/lib/gcc/*/$version/{install-tools,include-fixed} # Remove empty directories diff --git a/gcc-fortran/gcc-4.7.3-multilib-dirs.patch b/gcc-fortran/gcc-4.7.3-multilib-dirs.patch new file mode 100644 index 0000000..014919f --- /dev/null +++ b/gcc-fortran/gcc-4.7.3-multilib-dirs.patch @@ -0,0 +1,23 @@ +diff -Nru gcc-4.7.3.orig/gcc/config/i386/linux64.h gcc-4.7.3/gcc/config/i386/linux64.h +--- gcc-4.7.3.orig/gcc/config/i386/linux64.h 2013-04-13 18:33:41.015109554 +0200 ++++ gcc-4.7.3/gcc/config/i386/linux64.h 2013-04-13 18:34:01.147713013 +0200 +@@ -28,6 +28,6 @@ + #define GNU_USER_LINK_EMULATION64 "elf_x86_64" + #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64" + +-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" ++#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" + #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" +diff -Nru gcc-4.7.3.orig/gcc/config/i386/t-linux64 gcc-4.7.3/gcc/config/i386/t-linux64 +--- gcc-4.7.3.orig/gcc/config/i386/t-linux64 2013-04-13 18:33:41.015109554 +0200 ++++ gcc-4.7.3/gcc/config/i386/t-linux64 2013-04-13 18:39:13.269752565 +0200 +@@ -34,6 +34,6 @@ + comma=, + MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) + MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) +-MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu) ++MULTILIB_OSDIRNAMES = m64=../lib$(call if_multiarch,:x86_64-linux-gnu) + MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu) + MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)