From 3e99129ce30e9474c935b340011d77bf3e72842b Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 25 Jan 2021 20:42:50 +0000 Subject: Mon Jan 25 20:42:50 UTC 2021 a/openssl10-solibs-1.0.2u-x86_64-2.txz: Removed. d/make-4.3-x86_64-2.txz: Rebuilt. We'll upgrade to make-4.3 again (with a few patches from Fedora) since this is now working with all the sources that we ship. l/gst-plugins-base0-0.10.36-x86_64-4.txz: Removed. l/gst-plugins-good0-0.10.31-x86_64-4.txz: Removed. l/gstreamer0-0.10.36-x86_64-3.txz: Removed. l/libcap-2.47-x86_64-1.txz: Upgraded. l/libsamplerate-0.2.1-x86_64-1.txz: Upgraded. l/libvisual-plugins-0.4.0-x86_64-6.txz: Rebuilt. Drop actor_gstreamer.so (requires gstreamer0). l/mozjs78-78.7.0esr-x86_64-1.txz: Upgraded. l/talloc-2.3.2-x86_64-1.txz: Upgraded. n/NetworkManager-1.28.0-x86_64-4.txz: Rebuilt. Rebuilt for ppp-2.4.9. n/openssl10-1.0.2u-x86_64-2.txz: Removed. n/ppp-2.4.9-x86_64-1.txz: Upgraded. n/rp-pppoe-3.14-x86_64-3.txz: Rebuilt. Rebuilt for ppp-2.4.9. x/ibus-libpinyin-1.12.0-x86_64-1.txz: Upgraded. x/ibus-table-1.12.4-x86_64-1.txz: Upgraded. x/libpinyin-2.6.0-x86_64-1.txz: Upgraded. xap/mozilla-firefox-78.7.0esr-x86_64-1.txz: Upgraded. This release contains security fixes and improvements. For more information, see: https://www.mozilla.org/en-US/firefox/78.7.0/releasenotes/ (* Security fix *) xfce/xfce4-whiskermenu-plugin-2.5.3-x86_64-1.txz: Upgraded. --- source/d/make/make.SlackBuild | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'source/d/make/make.SlackBuild') diff --git a/source/d/make/make.SlackBuild b/source/d/make/make.SlackBuild index f97a27c2e..01036257e 100755 --- a/source/d/make/make.SlackBuild +++ b/source/d/make/make.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2005-2020 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2021 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=make -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-8} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -68,7 +68,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf make-$VERSION -tar xvf $CWD/make-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/make-$VERSION.tar.?z || exit 1 cd make-$VERSION || exit 1 chown -R root:root . find . \ @@ -77,9 +77,10 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -zcat $CWD/make.guile30.diff.gz | patch -p1 --verbose || exit 1 -zcat $CWD/make.glibc-2.27.glob.diff.gz | patch -p1 --verbose || exit 1 -zcat $CWD/b552b05251980f693c729e251f93f5225b400714.patch.gz | patch -p1 --verbose || exit 1 +# Patches from Fedora: +zcat $CWD/make-4.0-noclock_gettime.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/make-4.3-getcwd.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/make-4.3-j8k.patch.gz | patch -p1 --verbose || exit 1 autoreconf -vif -- cgit v1.2.3-65-gdbad