diff options
author | Eric Hameleers <alien@slackware.com> | 2022-05-15 20:42:59 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2022-05-15 20:42:59 +0000 |
commit | e50bbfe2d0d94a9b4d033721930db5786f82704a (patch) | |
tree | 817b83b21ebb4d60622b9f71f530d2d9098d53aa | |
parent | 6c355ed3aa9b5e90361b7e46588d15a940cd268a (diff) | |
download | multilib-e50bbfe2d0d94a9b4d033721930db5786f82704a.tar.gz multilib-e50bbfe2d0d94a9b4d033721930db5786f82704a.tar.xz |
gcc-multilib: update to 12.1.0
-rwxr-xr-x | source/current/gcc/gcc-multilib.SlackBuild | 51 |
1 files changed, 6 insertions, 45 deletions
diff --git a/source/current/gcc/gcc-multilib.SlackBuild b/source/current/gcc/gcc-multilib.SlackBuild index f97703a..5885a1c 100755 --- a/source/current/gcc/gcc-multilib.SlackBuild +++ b/source/current/gcc/gcc-multilib.SlackBuild @@ -2,7 +2,7 @@ # GCC package build script (written by volkerdi@slackware.com) # # Copyright 2003, 2004 Slackware Linux, Inc., Concord, California, USA -# Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -60,7 +60,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gcc -SRCVER=${SRCVER:-"11.3.0"} +SRCVER=${SRCVER:-"12.1.0"} VERSION=$(echo $SRCVER | cut -f 1 -d _) BUILD=${BUILD:-1alien} @@ -68,7 +68,7 @@ BUILD=${BUILD:-1alien} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # What do we want to build -LANGS=${LANGS:-'ada,brig,c,c++,d,fortran,go,lto,objc,obj-c++'} +LANGS=${LANGS:-'ada,c,c++,d,fortran,go,lto,objc,obj-c++'} echo "Building these compilers: $LANGS"; sleep 5 @@ -93,7 +93,6 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "gcc-gnat-${VERSION}_multilib-$ARCH-$BUILD.txz" echo "gcc-objc-${VERSION}_multilib-$ARCH-$BUILD.txz" echo "gcc-go-${VERSION}_multilib-$ARCH-$BUILD.txz" - echo "gcc-brig-${VERSION}_multilib-$ARCH-$BUILD.txz" echo "gcc-gdc-${VERSION}_multilib-$ARCH-$BUILD.txz" exit 0 fi @@ -156,14 +155,12 @@ PKG2=$TMP/package-gcc-g++ PKG3=$TMP/package-gcc-gfortran PKG4=$TMP/package-gcc-gnat PKG6=$TMP/package-gcc-objc -#PKG7=$TMP/package-gcc-g++-gch PKG8=$TMP/package-gcc-go -PKG9=$TMP/package-gcc-brig PKG10=$TMP/package-gcc-gdc # Clear the build locations: -rm -rf $PKG{1,2,3,4,6,8,9,10} -mkdir -p $PKG{1,2,3,4,6,8,9,10}/usr/doc/gcc-$VERSION +rm -rf $PKG{1,2,3,4,6,8,10} +mkdir -p $PKG{1,2,3,4,6,8,10}/usr/doc/gcc-$VERSION # Insert package descriptions: mkdir -p $PKG{1,2,3,4,6,8,9,10}/install @@ -172,9 +169,7 @@ cat $CWD/slack-desc.gcc-g++ > $PKG2/install/slack-desc cat $CWD/slack-desc.gcc-gfortran > $PKG3/install/slack-desc cat $CWD/slack-desc.gcc-gnat > $PKG4/install/slack-desc cat $CWD/slack-desc.gcc-objc > $PKG6/install/slack-desc -#cat $CWD/slack-desc.gcc-g++-gch > $PKG7/install/slack-desc cat $CWD/slack-desc.gcc-go > $PKG8/install/slack-desc -cat $CWD/slack-desc.gcc-brig > $PKG9/install/slack-desc cat $CWD/slack-desc.gcc-gdc > $PKG10/install/slack-desc # Extract the source code: @@ -187,12 +182,6 @@ tar xf $CWD/gcc-$SRCVER.tar.?z || exit 1 # Smite the fixincludes: zcat $CWD/patches/gcc-no_fixincludes.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 - # Fix a gfortran bug: - zcat $CWD/patches/gfortran.deferred-shape-vs-assumed-shape.patch.gz | patch -p0 --verbose --backup --suffix=.orig || exit 1 - - # Fix regressions in 10.3.0 (and presumably 11.1.0 since they still apply cleanly): - zcat $CWD/patches/PR100102-2.a1b3484a8e6c53c8084723e3f1738d402374198e.patch.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 - # Fix perms/owners: chown -R root:root . find . -perm 777 -exec chmod 755 {} \+ @@ -277,14 +266,6 @@ tar xf $CWD/gcc-$SRCVER.tar.?z || exit 1 $PKG8/usr/doc/gcc-${VERSION}/gcc/go ) - mkdir -p $PKG9/usr/doc/gcc-${VERSION}/gcc/brig - ( cd brig || exit 0 - if [ -r ChangeLog ]; then - cat ChangeLog | head -n 1000 > $PKG9/usr/doc/gcc-${VERSION}/gcc/brig/ChangeLog - touch -r ChangeLog $PKG9/usr/doc/gcc-${VERSION}/gcc/brig/ChangeLog - fi - ) - mkdir -p $PKG10/usr/doc/gcc-${VERSION}/gcc/d ( cd d || exit 0 if [ -r ChangeLog ]; then @@ -377,7 +358,7 @@ tar xf $CWD/gcc-$SRCVER.tar.?z || exit 1 # First run: use # LANGS="all" to just build c,c++,fortran,lto,objc # Second run: use - # LANGS="ada,brig,c,c++,fortran,go,lto,objc" + # LANGS="ada,c,c++,d,fortran,go,lto,objc,obj-c++" if [ "$ARCH" = "x86_64" ]; then export PKG_CONFIG_PATH="/usr/lib64/pkgconfig:/usr/lib/pkgconfig" @@ -707,22 +688,6 @@ fi mv $PKG1/usr/man/man1/gofmt.1.gz usr/man/man1 ) -# gcc-brig: -( cd $PKG9 - mkdir -p usr/bin - mv $PKG1/usr/bin/*brig* usr/bin - mkdir -p usr/lib${LIBDIRSUFFIX} - mv $PKG1/usr/lib${LIBDIRSUFFIX}/libhsail* usr/lib${LIBDIRSUFFIX} - if [ "$ARCH" = "x86_64" ]; then - mkdir -p usr/lib - mv $PKG1/usr/lib/libhsail* usr/lib - fi - mkdir -p usr/libexec/gcc/$TARGET/$VERSION - mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/brig1 usr/libexec/gcc/$TARGET/$VERSION - mkdir -p usr/man/man1 - mv $PKG1/usr/man/man1/gccbrig.1.gz usr/man/man1 -) - # gcc-gdc: ( cd $PKG10 mkdir -p usr/bin @@ -778,10 +743,6 @@ echo $LANGS | grep -qw go && \ ( cd $PKG8 makepkg -l y -c n $TMP/gcc-go-${VERSION}_multilib-$ARCH-$BUILD.txz ) -echo $LANGS | grep -qw brig && \ -( cd $PKG9 - makepkg -l y -c n $TMP/gcc-brig-${VERSION}_multilib-$ARCH-$BUILD.txz ) - echo $LANGS | grep -qw d && \ ( cd $PKG10 makepkg -l y -c n $TMP/gcc-gdc-${VERSION}_multilib-$ARCH-$BUILD.txz ) |