Merge branch 'master' of git.cheetah.remote:xilinux/buildfiles

8 files changed, 16 insertions, 10 deletions

diff --git a/repo/system/elogind/elogind.xibuild b/repo/system/elogind/elogind.xibuild
index c5f1774..d974c90 100644
--- a/repo/system/elogind/elogind.xibuild
+++ b/repo/system/elogind/elogind.xibuild
@@ -85,7 +85,6 @@ password required    pam_deny.so
 # End /etc/pam.d/elogind-user
 EOF
 
-
 }
 
 postinstall () {
diff --git a/repo/system/libcxx/toolchain-libcxx.xibuild b/repo/system/libcxx/toolchain-libcxx.xibuild
deleted file mode 100644
index e69de29..0000000
--- a/repo/system/libcxx/toolchain-libcxx.xibuild
+++ /dev/null
diff --git a/repo/system/musl/toolchain-musl.xibuild b/repo/system/musl/toolchain-musl.xibuild
index ed46c6e..4f73171 100644
--- a/repo/system/musl/toolchain-musl.xibuild
+++ b/repo/system/musl/toolchain-musl.xibuild
@@ -12,4 +12,16 @@ build () {
 
 package () {
     make install DESTDIR=$PKG_DEST
+
+    rm -v $PKG_DEST/lib/ld-musl-x86_64.so.1
+    ln -sv libc.so $PKG_DEST/lib/ld-musl-x86_64.so.1
+
+    mkdir $PKG_DEST/bin
+    mkdir $PKG_DEST/etc
+    ln -sv ../lib/libc.so $PKG_DEST/bin/ldd
+
+    cat > $PKG_DEST/etc/ld-musl-x86_64.path << "EOF"
+$PKG_DEST/lib
+EOF
+
 }
diff --git a/repo/system/nspr/nspr.xibuild b/repo/system/nspr/nspr.xibuild
index 30a47da..0b5fdc5 100644
--- a/repo/system/nspr/nspr.xibuild
+++ b/repo/system/nspr/nspr.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make "
-DEPS="musl bash"
+DEPS="musl"
 
 PKG_VER=4.33
 
diff --git a/repo/system/tcl/tcl.xibuild b/repo/system/tcl/tcl.xibuild
index 6495948..41513e7 100644
--- a/repo/system/tcl/tcl.xibuild
+++ b/repo/system/tcl/tcl.xibuild
@@ -33,10 +33,6 @@ build () {
     unset SRCDIR
 }
 
-check () {
-    make test
-}
-
 package () {
     make DESTDIR=$PKG_DEST install
 
diff --git a/repo/system/ubase/ubase.xibuild b/repo/system/ubase/ubase.xibuild
index 0fd1258..e95aceb 100644
--- a/repo/system/ubase/ubase.xibuild
+++ b/repo/system/ubase/ubase.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make findutils sed"
-DEPS="musl"
+DEPS="musl utmps"
 
 SOURCE=https://git.suckless.org/ubase
 
diff --git a/repo/system/utmps/utmps.xibuild b/repo/system/utmps/utmps.xibuild
index 900aae8..f0112e6 100644
--- a/repo/system/utmps/utmps.xibuild
+++ b/repo/system/utmps/utmps.xibuild
@@ -23,8 +23,7 @@ build () {
             --enable-shared      \
             --libdir=/usr/lib    \
             --with-dynlib=/lib   \
-            --libexecdir="/lib/utmps" \
-            --with=dynlib=/lib
+            --libexecdir="/lib/utmps" 
     make
 }
 
diff --git a/repo/system/xz/xz.xibuild b/repo/system/xz/xz.xibuild
index a1d4e17..9c1f849 100644
--- a/repo/system/xz/xz.xibuild
+++ b/repo/system/xz/xz.xibuild
@@ -9,7 +9,7 @@ DESC="Tools for the lzma and xz compression formats"
 
 
 build () {
-    ./autogen.sh
+    autoreconf -fi
     ./configure --prefix=/usr --disable-static --docdir=/usr/share/doc/xz-$PKG_VER
     make
 }