summaryrefslogtreecommitdiff
path: root/source/ap/ksh93
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-05-06 01:29:24 +0000
committerEric Hameleers <alien@slackware.com>2019-05-06 08:59:45 +0200
commita008351b6dc8bee9070c602604863bb9aa13fed6 (patch)
tree3b5743999002c43f3552786c313b09bf347ae9bc /source/ap/ksh93
parentd23d57452f0df78f7600abd83fcdfcd826a63dca (diff)
downloadcurrent-a008351b6dc8bee9070c602604863bb9aa13fed6.tar.gz
Mon May 6 01:29:24 UTC 201920190506012924
a/kernel-generic-4.19.40-x86_64-1.txz: Upgraded. a/kernel-huge-4.19.40-x86_64-1.txz: Upgraded. a/kernel-modules-4.19.40-x86_64-1.txz: Upgraded. ap/ksh93-20190505_4cb3a115-x86_64-1.txz: Upgraded. d/kernel-headers-4.19.40-x86-1.txz: Upgraded. k/kernel-source-4.19.40-noarch-1.txz: Upgraded. l/libgsf-1.14.46-x86_64-1.txz: Upgraded. xap/mozilla-firefox-60.6.2esr-x86_64-1.txz: Upgraded. This update addresses the issue of add-ons failing to load. For more information, see: https://www.mozilla.org/en-US/firefox/60.6.2/releasenotes/ isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/ap/ksh93')
-rwxr-xr-xsource/ap/ksh93/ksh93.SlackBuild5
-rw-r--r--source/ap/ksh93/ksh93.use.clang.for.tests.diff17
2 files changed, 22 insertions, 0 deletions
diff --git a/source/ap/ksh93/ksh93.SlackBuild b/source/ap/ksh93/ksh93.SlackBuild
index 950f5459..6a3a9590 100755
--- a/source/ap/ksh93/ksh93.SlackBuild
+++ b/source/ap/ksh93/ksh93.SlackBuild
@@ -77,6 +77,11 @@ rm -rf $SRCNAM-$VERSION
tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1
cd $SRCNAM-$VERSION || exit 1
+# A test script defaults to GCC, which doesn't make sense as we use clang
+# to compile ksh93. This probably wouldn't be as much of a problem except
+# that it fails with GCC9.
+zcat $CWD/ksh93.use.clang.for.tests.diff.gz | patch -p1 --verbose || exit 1
+
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/ap/ksh93/ksh93.use.clang.for.tests.diff b/source/ap/ksh93/ksh93.use.clang.for.tests.diff
new file mode 100644
index 00000000..4fda65f6
--- /dev/null
+++ b/source/ap/ksh93/ksh93.use.clang.for.tests.diff
@@ -0,0 +1,17 @@
+--- ./scripts/libast_prereq.sh.orig 2019-05-05 13:34:36.069904205 -0500
++++ ./scripts/libast_prereq.sh 2019-05-05 13:37:19.117888974 -0500
+@@ -20,12 +20,12 @@
+
+ if [ -z "$CC" ];
+ then
+- CC=cc
++ CC=clang
+ fi
+
+ cd "$MESON_BUILD_ROOT"
+
+-if cc --version | grep -q "GCC"
++if $CC --version | grep -q "GCC"
+ then
+ gcc_major_version=$(cc -dumpversion | cut -d. -f1)
+ if [ "$gcc_major_version" -ge 9 ]