diff options
Diffstat (limited to 'core/gcc')
| -rw-r--r-- | core/gcc/PKGBUILD | 87 | ||||
| -rw-r--r-- | core/gcc/gcc-libs.install | 4 | ||||
| -rw-r--r-- | core/gcc/gcc_mips64el_lib.patch | 24 |
3 files changed, 83 insertions, 32 deletions
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index 73d6ef280..c0e52bb76 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -4,22 +4,26 @@ # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc # NOTE: libtool requires rebuilt with each new gcc version -pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') +if [ "${CARCH}" != "mips64el" ]; then + pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') +else + pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc') +fi pkgver=4.8.1 pkgrel=1 #_snapshot=4.8-20130502 pkgdesc="The GNU Compiler Collection" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL' 'custom') url="http://gcc.gnu.org" -makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'gcc-ada' 'doxygen') +makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'doxygen') +[[ "$CARCH" != "mips64el" ]] && makedepends+=('gcc-ada') checkdepends=('dejagnu' 'inetutils') options=('!libtool' '!emptydirs') source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2) #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 md5sums=('3b2386c114cd74185aa3754b58a79304') - if [ -n "${_snapshot}" ]; then _basedir=gcc-${_snapshot} else @@ -34,6 +38,7 @@ prepare() { # Arch Linux installs x86_64 libraries /lib [[ $CARCH == "x86_64" ]] && sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64 + [[ $CARCH == "mips64el" ]] && sed -i 's/lib32/lib/' gcc/config/mips/t-linux64 echo ${pkgver} > gcc/BASE-VER @@ -51,11 +56,30 @@ build() { CFLAGS=${CFLAGS/-pipe/} CXXFLAGS=${CXXFLAGS/-pipe/} + # Use our CFLAGS, CXXFLAGS and LDFLAGS for the binaries built. + export BOOT_CFLAGS="$CFLAGS" + export CFLAGS_FOR_BUILD="$CFLAGS" + export CFLAGS_FOR_TARGET="$CFLAGS" + export CXXFLAGS_FOR_BUILD="$CXXFLAGS" + export CXXFLAGS_FOR_TARGET="$CXXFLAGS" + export BOOT_LDFLAGS="$LDFLAGS" + export LDFLAGS_FOR_BUILD="$LDFLAGS" + export LDFLAGS_FOR_TARGET="$LDFLAGS" + + if [[ "${CARCH}" != "mips64el" ]]; then + languages=c,c++,ada,fortran,go,lto,objc,obj-c++ + # The ancient MIPS ABI has possible requirements incompatible + # with GNU hash. + extra="--with-linker-hash-style=gnu" + else + languages=c,c++,fortran,lto,objc,obj-c++ + fi + ${srcdir}/${_basedir}/configure --prefix=/usr \ --libdir=/usr/lib --libexecdir=/usr/lib \ --mandir=/usr/share/man --infodir=/usr/share/info \ - --with-bugurl=https://bugs.archlinux.org/ \ - --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \ + --with-bugurl=https://labs.parabola.nu/ \ + --enable-languages=$languages \ --enable-shared --enable-threads=posix \ --with-system-zlib --enable-__cxa_atexit \ --disable-libunwind-exceptions --enable-clocale=gnu \ @@ -64,7 +88,7 @@ build() { --enable-cloog-backend=isl --disable-cloog-version-check \ --enable-lto --enable-gold --enable-ld=default \ --enable-plugin --with-plugin-ld=ld.gold \ - --with-linker-hash-style=gnu --disable-install-libiberty \ + $extra --disable-install-libiberty \ --disable-multilib --disable-libssp --disable-werror \ --enable-checking=release make @@ -75,6 +99,8 @@ build() { } check() { + # Takes days and no one here uses it. + if [ "$CARCH" != "mips64el" ] ; then cd ${srcdir}/gcc-build # increase stack size to prevent test failures @@ -84,6 +110,7 @@ check() { # do not abort on error as some are "expected" make -k check || true ${srcdir}/${_basedir}/contrib/test_summary + fi } package_gcc-libs() @@ -95,18 +122,18 @@ package_gcc-libs() cd ${srcdir}/gcc-build make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libstdc++-v3/src libitm libsanitizer/asan; do + for lib in libmudflap libgomp libstdc++-v3/src; do + make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES + done + [ "$CARCH" != "mips64el" ] && for lib in libitm libsanitizer/asan; do make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES done - [[ $CARCH == "x86_64" ]] && \ - make -j1 -C $CHOST/libsanitizer/tsan DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES - make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info - make -j1 -C $CHOST/libitm DESTDIR=${pkgdir} install-info + [ "$CARCH" != "mips64el" ] && make -j1 -C $CHOST/libitm DESTDIR=${pkgdir} install-info - make -j1 DESTDIR=${pkgdir} install-target-libquadmath + make -j1 DESTDIR=${pkgdir} install-target-libquadmath make -j1 DESTDIR=${pkgdir} install-target-libgfortran make -j1 DESTDIR=${pkgdir} install-target-libobjc @@ -115,7 +142,7 @@ package_gcc-libs() # remove static libraries find ${pkgdir} -name *.a -delete - + # Install Runtime Library Exception install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \ ${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION @@ -136,17 +163,17 @@ package_gcc() mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.18-gdb.py # unfortunately it is much, much easier to install the lot and clean-up the mess... - rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*} - rm $pkgdir/usr/lib/*.so* - rm $pkgdir/usr/lib/lib{atomic,gfortran,go{,begin},iberty,objc}.a - rm $pkgdir/usr/lib/libgfortran.spec - rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{libcaf_single,libgfortranbegin}.a - rm -r $pkgdir/usr/lib/go - rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.info - rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo - rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1 + rm -f $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*} + rm -f $pkgdir/usr/lib/*.so* + rm -f $pkgdir/usr/lib/lib{atomic,gfortran,go{,begin},iberty,objc}.a + rm -f $pkgdir/usr/lib/libgfortran.spec + rm -rf $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc} + rm -f $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1} + rm -f $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{libcaf_single,libgfortranbegin}.a + rm -rf $pkgdir/usr/lib/go + rm -f $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.info + rm -f $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo + rm -f $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1 # many packages expect this symlinks ln -s gcc ${pkgdir}/usr/bin/cc @@ -205,11 +232,11 @@ package_gcc-fortran() ln -s gfortran ${pkgdir}/usr/bin/f95 # remove files included in gcc-libs or gcc - rm ${pkgdir}/usr/lib/lib{gfortran,gcc_s}.so* - rm ${pkgdir}/usr/lib/libquadmath.{a,so*} - rm ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/{*.o,libgc*} - rm ${pkgdir}/usr/share/info/libquadmath.info - rm -r ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/include + rm -f ${pkgdir}/usr/lib/lib{gfortran,gcc_s}.so* + rm -f ${pkgdir}/usr/lib/libquadmath.{a,so*} + rm -f ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/{*.o,libgc*} + rm -f ${pkgdir}/usr/share/info/libquadmath.info + rm -fr ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/include # Install Runtime Library Exception install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \ diff --git a/core/gcc/gcc-libs.install b/core/gcc/gcc-libs.install index 23553b8f0..a6ac198f2 100644 --- a/core/gcc/gcc-libs.install +++ b/core/gcc/gcc-libs.install @@ -4,13 +4,13 @@ filelist=(libgomp.info libquadmath.info) post_upgrade() { [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null + [ -f $infodir/$file.gz ] && install-info $infodir/$file.gz $infodir/dir 2> /dev/null || true done } pre_remove() { [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + [ -f $infodir/$file.gz ] && install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null || true done } diff --git a/core/gcc/gcc_mips64el_lib.patch b/core/gcc/gcc_mips64el_lib.patch new file mode 100644 index 000000000..c938d9b30 --- /dev/null +++ b/core/gcc/gcc_mips64el_lib.patch @@ -0,0 +1,24 @@ +diff -ru gcc-4.7-20120324.orig/gcc/config/mips/linux64.h gcc-4.7-20120324/gcc/config/mips/linux64.h +--- gcc-4.7-20120324.orig/gcc/config/mips/linux64.h 2012-04-06 11:32:50.545152897 +0200 ++++ gcc-4.7-20120324/gcc/config/mips/linux64.h 2012-04-06 12:06:58.501290352 +0200 +@@ -23,9 +23,9 @@ + #define GNU_USER_LINK_EMULATION64 "elf64%{EB:b}%{EL:l}tsmip" + #define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32" + +-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1" + #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1" +-#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" ++#define GLIBC_DYNAMIC_LINKERN32 "/lib/ld.so.1" + #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" + #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" + #define GNU_USER_DYNAMIC_LINKERN32 \ +diff -ru gcc-4.7-20120324.orig/gcc/config/mips/t-linux64 gcc-4.7-20120324/gcc/config/mips/t-linux64 +--- gcc-4.7-20120324.orig/gcc/config/mips/t-linux64 2012-04-06 11:32:50.379989000 +0200 ++++ gcc-4.7-20120324/gcc/config/mips/t-linux64 2012-04-06 12:05:55.461021317 +0200 +@@ -18,4 +18,4 @@ + + MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 + MULTILIB_DIRNAMES = n32 32 64 +-MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64 ++MULTILIB_OSDIRNAMES = ../lib ../lib32 ../lib64 |