summaryrefslogtreecommitdiffstats
path: root/source/ap/ksh93
diff options
context:
space:
mode:
Diffstat (limited to 'source/ap/ksh93')
-rwxr-xr-xsource/ap/ksh93/ksh93.SlackBuild10
-rw-r--r--source/ap/ksh93/ksh93.use.clang.for.tests.diff17
2 files changed, 4 insertions, 23 deletions
diff --git a/source/ap/ksh93/ksh93.SlackBuild b/source/ap/ksh93/ksh93.SlackBuild
index a7a60b489..b8f9e6c12 100755
--- a/source/ap/ksh93/ksh93.SlackBuild
+++ b/source/ap/ksh93/ksh93.SlackBuild
@@ -79,11 +79,6 @@ 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 \) \
@@ -130,10 +125,13 @@ fi
mkdir -p $PKG/usr/doc/ksh93-$VERSION
( cd src/cmd/ksh93
- cp -a COMPATIBILITY DESIGN OBSOLETE PROMO.mm README RELEASE* TYPES \
+ cp -a COMPATIBILITY* DESIGN* OBSOLETE* README* RELEASE* TYPES* \
$PKG/usr/doc/ksh93-$VERSION
)
+cp -a CHANGELOG* CONTRIBUTING* README* \
+ $PKG/usr/doc/ksh93-$VERSION
mkdir -p $PKG/usr/doc/ksh93-$VERSION/LICENSE
+cp -a LICENSE $PKG/usr/doc/ksh93-$VERSION/LICENSE/LICENSE
cp -a lib/package/LICENSES/* $PKG/usr/doc/ksh93-$VERSION/LICENSE
find . -name "*.def" -exec cp -a "{}" $PKG/usr/doc/ksh93-$VERSION/LICENSE \;
find . -name "*.lic" -exec cp -a "{}" $PKG/usr/doc/ksh93-$VERSION/LICENSE \;
diff --git a/source/ap/ksh93/ksh93.use.clang.for.tests.diff b/source/ap/ksh93/ksh93.use.clang.for.tests.diff
deleted file mode 100644
index 4fda65f64..000000000
--- a/source/ap/ksh93/ksh93.use.clang.for.tests.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./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 ]