4 files changed, 27 insertions, 14 deletions
diff --git a/libraries/dietlibc/dietlibc.SlackBuild b/libraries/dietlibc/dietlibc.SlackBuild
index 9ecae89321..88768d4029 100644
--- a/libraries/dietlibc/dietlibc.SlackBuild
+++ b/libraries/dietlibc/dietlibc.SlackBuild
@@ -23,13 +23,15 @@
 #   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 #   SUCH DAMAGE.
 
+# 20250519 bkw: BUILD=2, fix 32-bit build.
+# 20250512 bkw: update for v0.35, fix profile.d scripts.
 # 20230709 bkw: BUILD=2
 # - new maintainer.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=dietlibc
-VERSION=${VERSION:-0.34}
+VERSION=${VERSION:-0.35}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -66,18 +68,31 @@ chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
+# 20250519 bkw: first reason the 32-bit build failed: dietlibc's
+# list of x86 syscalls is missing the one for close_range.
+# Latest CVS from upstream doesn't fix this, but it's simple.
+sed -i '1i#define __NR_close_range 436' i386/syscalls.h
+
+# 20250519 bkw: "json" is a host tool, used by the build, doesn't need
+# to be built with the weird CFLAGS used for the rest of the project.
+# This fixes 32-bit builds (64-bit wasn't broken for some reason).
+make json CC="${CC:-gcc}" CFLAGS="-O2 -fPIC"
+
 make
 make install DESTDIR=$PKG
 
-mkdir -p $PKG/etc/profile.d
-cat $CWD/profile.d/dietlibc.sh > $PKG/etc/profile.d/dietlibc.sh
-cat $CWD/profile.d/dietlibc.csh > $PKG/etc/profile.d/dietlibc.csh
-chmod 0755 $PKG/etc/profile.d/*
-
-strip $PKG/opt/diet/bin/*
+mkdir -p $PKG/usr/bin
+for i in $PKG/opt/diet/bin/*; do
+  strip $i
+  ln -sf /opt/diet/bin/$( basename $i ) $PKG/usr/bin
+done
 
 gzip -9 $PKG/opt/diet/man/*/*
 
+# 20250513 bkw: actually install the profile scripts.
+mkdir -p $PKG/etc/profile.d/
+install -oroot -groot -m0755 $CWD/profile.d/* $PKG/etc/profile.d/
+
 PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
 mkdir -p $PKGDOC
 cp -a AUTHOR* BUGS* C* FAQ* PORTING* README* SECURITY* THANKS* TODO* $PKGDOC
diff --git a/libraries/dietlibc/dietlibc.info b/libraries/dietlibc/dietlibc.info
index fa3f2e1c16..94f250bfd8 100644
--- a/libraries/dietlibc/dietlibc.info
+++ b/libraries/dietlibc/dietlibc.info
@@ -1,8 +1,8 @@
 PRGNAM="dietlibc"
-VERSION="0.34"
+VERSION="0.35"
 HOMEPAGE="http://www.fefe.de/dietlibc/"
-DOWNLOAD="http://www.fefe.de/dietlibc/dietlibc-0.34.tar.xz"
-MD5SUM="4f04a6f642548cc5be716a6e0de6b631"
+DOWNLOAD="http://www.fefe.de/dietlibc/dietlibc-0.35.tar.xz"
+MD5SUM="100e0321b49fdfd2de8c63bc1e30aad8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/dietlibc/profile.d/dietlibc.csh b/libraries/dietlibc/profile.d/dietlibc.csh
index d675e09eff..e33d3a06ec 100644
--- a/libraries/dietlibc/profile.d/dietlibc.csh
+++ b/libraries/dietlibc/profile.d/dietlibc.csh
@@ -1,3 +1,2 @@
 #!/bin/csh
-setenv PATH ${PATH}:/opt/diet/bin
-setenv MANPATH ${MANPATH}:/opt/diet/man
+setenv MANPATH /opt/diet/man:${MANPATH}
diff --git a/libraries/dietlibc/profile.d/dietlibc.sh b/libraries/dietlibc/profile.d/dietlibc.sh
index a32ca597b8..37a3964d8f 100644
--- a/libraries/dietlibc/profile.d/dietlibc.sh
+++ b/libraries/dietlibc/profile.d/dietlibc.sh
@@ -1,3 +1,2 @@
 #!/bin/sh
-export PATH="${PATH}:/opt/diet/bin"
-export MANPATH="${MANPATH}:/opt/diet/man"
+export MANPATH="/opt/diet/man:$MANPATH"