# HG changeset patch # User Pascal Bellard # Date 1427185893 -3600 # Node ID ae76ef329371c7f841de16c53e3ee9288e3b82bd # Parent 09581cbfaf3e23c0c070ae22ef46a885e1ecd11d gcc49: remove gfortran & objc diff -r 09581cbfaf3e -r ae76ef329371 gcc49/receipt --- a/gcc49/receipt Tue Mar 24 08:43:01 2015 +0100 +++ b/gcc49/receipt Tue Mar 24 09:31:33 2015 +0100 @@ -10,8 +10,7 @@ TARBALL="$SOURCE-$VERSION.tar.bz2" WEB_SITE="http://gcc.gnu.org/" WGET_URL="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$TARBALL" -TAGS="compiler C" -#HOST_ARCH="i486 arm" +TAGS="compiler C C++" # We need gawk since busybox awk is not sufficient. We have BUILD_DEPENDS # for cookutils that are not used by tazwok/cook-toolchain since it install @@ -19,75 +18,36 @@ DEPENDS="binutils libgomp libobjc gcc-lib-base mpc-library elfutils" BUILD_DEPENDS="mpc-library mpfr-dev gmp-dev elfutils-dev" -# Handle cross compilation (native i486/ARM gcc) -case "$ARCH" in - i?86) - ARCH_ARGS="--with-tune=$ARCH" - pkgversion="SliTaz" - languages="c,c++,objc,fortran" ;; - arm*) - pkgversion="SliTaz ARM" - languages="c,c++" ;; -esac - # Rules to configure and make the package. compile_rules() { - # Package slitaz-toolchain use 'cook --options' when rebuilding - # the full SliTaz toolchain. - [ "$2" == "--first-pass" ] && opt=$2 - [ "$3" == "--first-pass" ] && opt=$3 + ARCH_ARGS="--with-tune=$ARCH" + pkgversion="SliTaz" + languages="c,c++" # Use libiberty.a from binutils. sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in || return 1 - case "$ARCH" in - i?86) sed -i 's/^T_CFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in ;; - esac - - #sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in + sed -i 's/^T_CFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in mkdir -p ../gcc-build && cd ../gcc-build - # This is the default GCC and we want a native build to cross compile after. - # SliTaz target i486 host so we need a native i486 build for GCC. - case "$opt" in - --first-pass) - # Used by slitaz-toolchain when rebuilding the full toolchain. - echo "cook: configure GCC for: toolchain first pass" - $src/configure \ - --libexecdir=/usr/lib \ - --disable-nls \ - --enable-shared \ - --enable-languages=c,c++ \ - --disable-libstdcxx-pch \ - --enable-__cxa_atexit \ - --enable-clocale=gnu \ - --enable-threads=posix \ - --disable-bootstrap \ - --program-suffix=-49 \ - ${CONFIGURE_ARGS} && - make && make install ;; - *) - # Used by default to produce a full featured X86 GCC compiler. - echo "cook: configure GCC for: final/full build" - $src/configure \ - --libexecdir=/usr/lib \ - --enable-nls \ - --enable-languages=${languages} \ - --enable-shared \ - --with-system-zlib \ - --enable-clocale=gnu \ - --enable-objc-gc \ - --enable-__cxa_atexit \ - --enable-lto \ - --enable-threads=posix \ - --disable-bootstrap \ - --program-suffix=-49 \ - --with-pkgversion="$pkgversion" \ - ${CONFIGURE_ARGS} ${ARCH_ARGS} && - make && make install ;; - esac + $src/configure \ + --libexecdir=/usr/lib \ + --enable-nls \ + --enable-languages=${languages} \ + --enable-shared \ + --with-system-zlib \ + --enable-clocale=gnu \ + --enable-objc-gc \ + --enable-__cxa_atexit \ + --enable-lto \ + --enable-threads=posix \ + --disable-bootstrap \ + --program-suffix=-49 \ + --with-pkgversion="$pkgversion" \ + ${CONFIGURE_ARGS} ${ARCH_ARGS} && + make && make install } # Rules to gen a SliTaz package suitable for Tazpkg. @@ -96,38 +56,13 @@ mkdir -p $fs/usr/share cp -a $install/usr/bin $fs/usr - # Copy all libs. Remove libgcc_s.so and libstdc++.so they goes in - # the gcc-lib-base package. + # Copy all libs. cp -a $install/usr/lib $fs/usr - rm -f $fs/usr/lib/libgcc_s.so* - rm -f $fs/usr/lib/libstdc++.so* - rm -f $fs/usr/lib/libgomp.so* - rm -f $fs/usr/lib/libobjc.so* # Include files. cp -a $install/usr/include $fs/usr - # Gfortran goes in gfortran package. - rm -f $fs/usr/bin/*gfortran - rm -f $fs/usr/lib/libgfortran* - rm -f $fs/usr/lib/gcc/*/$VERSION/libgfortran* - rm -rf $fs/usr/lib/gcc/*/$VERSION/f* - # Remove build directory. rm -rf $WOK/$PACKAGE/source/$PACKAGE-build rm -rf $WOK/$PACKAGE/$PACKAGE-build } - -# Post install commands for Tazpkg. -post_install() -{ - local root - root=$1 - echo "Processing post-install commands..." - if [ ! -f "$root/lib/cpp" ]; then - ln -s ../usr/bin/cpp $root/lib - fi - if [ ! -f "$root/usr/bin/cc" ]; then - ln -s gcc $root/usr/bin/cc - fi -} diff -r 09581cbfaf3e -r ae76ef329371 llvm/receipt --- a/llvm/receipt Tue Mar 24 08:43:01 2015 +0100 +++ b/llvm/receipt Tue Mar 24 09:31:33 2015 +0100 @@ -16,8 +16,8 @@ # Rules to configure and make the package. compile_rules() { - export CC="gcc-49" - ./configure --prefix=/usr --sysconfdir=/etc \ + ./configure CC=gcc-49 CXX=gcc-49 \ + --prefix=/usr --sysconfdir=/etc \ --enable-libffi \ --enable-optimized \ --enable-shared \ @@ -25,7 +25,6 @@ --disable-assertions \ --disable-debug-runtime \ --disable-expensive-checks \ - --disable-compiler-version-checks \ $CONFIGURE_ARGS && make && make DESTDIR=$DESTDIR install }