aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Watson <urchlay@slackware.uk>2024-03-12 21:35:43 -0400
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2024-03-16 10:22:20 +0700
commitebd4e81a1fe92d7ca8521c10f34b28cef2c70dcb (patch)
tree44afb03ba6c03956bb15d855860d4728ba59aacc
parentf58f82348b51d9612f518426b370d7e4fdaaa1ba (diff)
development/cosmocc: Updated for version 3.3.2.
Signed-off-by: B. Watson <urchlay@slackware.uk> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--development/cosmocc/cosmocc.SlackBuild27
-rw-r--r--development/cosmocc/cosmocc.info6
-rw-r--r--development/cosmocc/wrapper.sh3
3 files changed, 24 insertions, 12 deletions
diff --git a/development/cosmocc/cosmocc.SlackBuild b/development/cosmocc/cosmocc.SlackBuild
index bfb1b259ca59..b8f92c53b3d3 100644
--- a/development/cosmocc/cosmocc.SlackBuild
+++ b/development/cosmocc/cosmocc.SlackBuild
@@ -7,6 +7,11 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20240312 bkw:
+# - update for v3.3.2.
+# - use wrapper script rather than symlinks for /usr/bin/* since the
+# symlinks didn't actually work.
+
# 20240219 bkw: BUILD=3
# - Take over maintenance.
# - Relicense as WTFPL.
@@ -16,8 +21,8 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=cosmocc
-VERSION=${VERSION:-3.2.4}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-3.3.2}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -58,15 +63,19 @@ for i in bin include x86_64-linux-cosmo aarch64-linux-cosmo libexec; do
mv $i $PKG/opt/$PRGNAM
done
-$(cd $PKG/usr/bin/;
- for i in mktemper march-native zipcopy apelink cosmocross cosmoar \
- assimilate zipobj cosmoaddr2line cosmocc mkdeps cosmoc++ \
- cosmoinstall pecheck; do
- ln -s ../../opt/$PRGNAM/bin/$i $i;
- done;);
+install -oroot -groot -m0755 $CWD/wrapper.sh $PKG/opt/$PRGNAM/bin/wrapper.sh
+
+# 20240312 bkw: can't use symlinks for these, or else we get:
+# /usr/bin/cosmocc: line 327: /usr/bin/x86_64-linux-cosmo-gcc: No such file or directory
+for i in mktemper march-native zipcopy apelink cosmocross cosmoar \
+ assimilate zipobj cosmoaddr2line cosmocc mkdeps cosmoc++ \
+ cosmoinstall pecheck
+do
+ ln -s ../../opt/$PRGNAM/bin/wrapper.sh $PKG/usr/bin/$i
+done
# remove empty directories:
-rmdir $PKG/opt/cosmocc/libexec/gcc/{x86_64,aarch64}-linux-cosmo/11.2.0/install-tools
+rmdir $PKG/opt/cosmocc/libexec/gcc/{x86_64,aarch64}-linux-cosmo/*/install-tools || true
PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
mkdir -p $PKGDOC
diff --git a/development/cosmocc/cosmocc.info b/development/cosmocc/cosmocc.info
index 0f56d7f645bb..61866f46d427 100644
--- a/development/cosmocc/cosmocc.info
+++ b/development/cosmocc/cosmocc.info
@@ -1,10 +1,10 @@
PRGNAM="cosmocc"
-VERSION="3.2.4"
+VERSION="3.3.2"
HOMEPAGE="https://github.com/jart/cosmopolitan"
DOWNLOAD="UNSUPPORTED"
MD5SUM=""
-DOWNLOAD_x86_64="https://cosmo.zip/pub/cosmocc/cosmocc-3.2.4.zip"
-MD5SUM_x86_64="77388a5964416aaa65ac60e400e3569a"
+DOWNLOAD_x86_64="https://cosmo.zip/pub/cosmocc/cosmocc-3.3.2.zip"
+MD5SUM_x86_64="5a6be78d383795581c74a8854cd9d284"
REQUIRES=""
MAINTAINER="B. Watson"
EMAIL="urchlay@slackware.uk"
diff --git a/development/cosmocc/wrapper.sh b/development/cosmocc/wrapper.sh
new file mode 100644
index 000000000000..09cfb295d11a
--- /dev/null
+++ b/development/cosmocc/wrapper.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /opt/cosmocc/bin/$( basename $0 ) "$@"