diff options
author | Eric Hameleers <alien@slackware.com> | 2020-12-10 16:42:44 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2020-12-10 16:42:44 +0000 |
commit | ceffd309fcf6d9f29d53ea25f125a1d673f554d9 (patch) | |
tree | 1200eadd4a11af8e4899c9955b656fa9f2d92ee7 | |
parent | 7b45eb3b3e7f8b05efba9977cd4f2ea7d9d236a5 (diff) | |
download | asb-ceffd309fcf6d9f29d53ea25f125a1d673f554d9.tar.gz asb-ceffd309fcf6d9f29d53ea25f125a1d673f554d9.tar.xz |
MinGW-w64: update to v8.0.0 and GCC 10.2.0
-rwxr-xr-x | MinGW-w64/build/MinGW-w64.SlackBuild | 50 |
1 files changed, 33 insertions, 17 deletions
diff --git a/MinGW-w64/build/MinGW-w64.SlackBuild b/MinGW-w64/build/MinGW-w64.SlackBuild index 4a1f8f2c..fd793065 100755 --- a/MinGW-w64/build/MinGW-w64.SlackBuild +++ b/MinGW-w64/build/MinGW-w64.SlackBuild @@ -42,6 +42,9 @@ # 7.0.0_gcc9.3.0-1: # 21/Sep/2020 by Eric Hameleers <alien@slackware.com> # * Initial build. +# 8.0.0_gcc10.2.0-1: +# 10/dec`2020 by Eric Hameleers <alien@slackware.com> +# * Update. # # Run 'sh MinGW-w64.SlackBuild' to build a Slackware package. # The package (.t?z) and .txt file as well as build logs are created in /tmp . @@ -61,8 +64,8 @@ MINGW_DOCS="AUTHORS COPYING* DISCLAIMER*" # Core tools: BINUTILS=2.35 -GCC=9.3.0 -MINGW=v7.0.0 +GCC=10.2.0 +MINGW=v8.0.0 # Package version: VERSION=${VERSION:-${MINGW}_gcc${GCC}} @@ -340,6 +343,25 @@ function build_support_tools_mingw() { } # end build_support_tools_mingw +function untar_and_patch() { + cd $TMP/tmp-$PRGNAM || exit 1 + rm -rf * + echo "[MINGW] Extracting the source archive(s) for $PRGNAM..." + for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do + tar -xf ${SOURCE[$i]} + done + + # Fix errors in compilation: + cd gcc-${GCC} + cat $SRCDIR/patches/0020-libgomp-Don-t-hard-code-MS-printf-attributes.patch \ + | patch -p1 --verbose || exit 1 + sed -i libbacktrace/configure -e 's|\-Werror||g' || exit 1 + cd .. + + chown -R root:root * + chmod -R u+w,go+r-w,a+rX-st * +} # end untar_and_patch + if [ "$BUILD_GCC" == "YES" ]; then # # --- GCC --- @@ -347,13 +369,9 @@ if [ "$BUILD_GCC" == "YES" ]; then # We extract the sources twice (and remove them inbetween), # to build native GCC and MinGW in two separate stages: +untar_and_patch || exit 1 + cd $TMP/tmp-$PRGNAM || exit 1 -echo "[GCC] Extracting the source archive(s) for $PRGNAM..." -for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do - tar -xf ${SOURCE[$i]} -done -chown -R root:root * -chmod -R u+w,go+r-w,a+rX-st * # Make the process use our tools as they get built: export PATH="${GCC_BOOTSTRAP_PATH}/bin:${GCC_BOOTSTRAP_PATH}/lib:${GCC_BOOTSTRAP_PATH}/include:${PATH}" @@ -491,14 +509,9 @@ fi # End $BUILD_GCC == YES # We extract the sources twice (and remove them inbetween), # to build native GCC and MinGW in two separate stages: +untar_and_patch || exit 1 + cd $TMP/tmp-$PRGNAM || exit 1 -rm -rf * -echo "[MINGW] Extracting the source archive(s) for $PRGNAM..." -for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do - tar -xf ${SOURCE[$i]} -done -chown -R root:root * -chmod -R u+w,go+r-w,a+rX-st * # Make the process use our tools as they get built: if [ "$BUILD_GCC" == "YES" ]; then @@ -733,6 +746,9 @@ cat $SRCDIR/profile.d/mingw-w64.csh | sed -e "s/@@VERSION@@/$VERSION/" \ > $PKG/etc/profile.d/mingw-w64.csh chmod 0755 $PKG/etc/profile.d/mingw-w64.* +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + # Add documentation: mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -745,9 +761,9 @@ cat $SRCDIR/slack-desc > $PKG/install/slack-desc # Build the package: cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log +makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz}.md5 +md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 cd - cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt |