From a1520a07fafdbb7b0d793ccca07b2a3a9006a55b Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 20 Dec 2021 13:40:19 +1100 Subject: [PATCH] Add xbps-0.59.1. This also required - merging of usr/sbin and usr/bin (which should be done anyway), because of a dodgy PATH searcher - moving of zlib earlier. --- SHA256SUMS.sources | 1 + sysc.py | 4 +++ sysc/run.sh | 5 ++++ sysc/run2.sh | 6 +++-- sysc/xbps-0.59.1/checksums | 17 +++++++++++++ sysc/xbps-0.59.1/patches/cflags.patch | 18 +++++++++++++ sysc/xbps-0.59.1/patches/no-shared.patch | 32 ++++++++++++++++++++++++ sysc/xbps-0.59.1/xbps-0.59.1.sh | 19 ++++++++++++++ 8 files changed, 100 insertions(+), 2 deletions(-) create mode 100644 sysc/xbps-0.59.1/checksums create mode 100644 sysc/xbps-0.59.1/patches/cflags.patch create mode 100644 sysc/xbps-0.59.1/patches/no-shared.patch create mode 100644 sysc/xbps-0.59.1/xbps-0.59.1.sh diff --git a/SHA256SUMS.sources b/SHA256SUMS.sources index 4b4970b..8669366 100644 --- a/SHA256SUMS.sources +++ b/SHA256SUMS.sources @@ -105,3 +105,4 @@ f694bee56099b8d72c3843d97e27f2306aa9946741e34a27391f6f6f19c7bcd0 util-linux-2.1 4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066 zlib-1.2.11.tar.xz f0b19ff39c3c9a5898a219497ababbadab99d8178acc980155c7e1271089b5a0 libarchive-3.5.2.tar.xz 0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 openssl-1.1.1l.tar.gz +0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a xbps-0.59.1.tar.gz diff --git a/sysc.py b/sysc.py index 68af54b..51ac777 100755 --- a/sysc.py +++ b/sysc.py @@ -156,6 +156,10 @@ class SysC(SysGeneral): # openssl-1.1.1l self.get_file("https://www.openssl.org/source/openssl-1.1.1l.tar.gz") + # xbps 0.59.1 + self.get_file("https://github.com/void-linux/xbps/archive/refs/tags/0.59.1.tar.gz", + output="xbps-0.59.1.tar.gz") + # autoconf 2.71 self.get_file("https://mirrors.kernel.org/gnu/autoconf/autoconf-2.71.tar.xz") diff --git a/sysc/run.sh b/sysc/run.sh index dedf40b..a2f8606 100755 --- a/sysc/run.sh +++ b/sysc/run.sh @@ -22,6 +22,11 @@ create_fhs() { for d in bin lib sbin; do ln -s "usr/${d}" "/${d}" done + # Make sbin a symlink to bin + mv /usr/sbin/* /usr/bin/ + rmdir /usr/sbin + ln -s bin /usr/sbin + ln -s bin /sbin mkdir /etc /proc /run /sys /tmp /var mount -t proc proc /proc mount -t sysfs sysfs /sys diff --git a/sysc/run2.sh b/sysc/run2.sh index 669b087..47454ec 100755 --- a/sysc/run2.sh +++ b/sysc/run2.sh @@ -58,6 +58,10 @@ build libarchive-3.5.2 build openssl-1.1.1l +build zlib-1.2.11 + +build xbps-0.59.1 + build automake-1.16.3 build autoconf-2.71 @@ -68,8 +72,6 @@ build gettext-0.21 build texinfo-6.7 -build zlib-1.2.11 - build gcc-4.7.4 build gperf-3.1 diff --git a/sysc/xbps-0.59.1/checksums b/sysc/xbps-0.59.1/checksums new file mode 100644 index 0000000..43baa57 --- /dev/null +++ b/sysc/xbps-0.59.1/checksums @@ -0,0 +1,17 @@ +d5dd2452d19c5341d152c4b3e5f471f258019f0524cf6284586c97d7a7f574b4 /usr/lib/musl/libxbps.a +cda47e99d0776ba53da60b9f4af4295bd6f5ff01911bfdf542ff1c7c1bbe63ec /usr/bin/xbps-alternatives +782e19505686402af63d67b74136c9890b756aca7294f1b791b31320f5d0c943 /usr/bin/xbps-checkvers +239559cc5b83512ed64b3d381c8ba9faa0279db12572f1f33ec7bcef4218a1dc /usr/bin/xbps-create +3e896e8ecffc3e8a587a7f50a10f4885188954c784b73ba84f60398527424ea8 /usr/bin/xbps-dgraph +7cee04a68508784358e06321bd8d1fe00185dd46d9ae8a5f6945f2fe1c63ec5a /usr/bin/xbps-digest +9432755fb93205d0f6dc989437cce7f6c1a31ff5f1565e3f3014ea9e19a6f19b /usr/bin/xbps-fbulk +f49d84be0abf309a0ed0931f8a4e333324eab0b45e9205c428c58952dab496e4 /usr/bin/xbps-fetch +24377345408c1244d3b2e4bee522a33a8d47ae2bbbf237d57e4c211f1a6fb818 /usr/bin/xbps-install +249e8eacfa1d249f17284d3bdb6b4d93b5adf0578740d3a832e9351447764765 /usr/bin/xbps-pkgdb +b1429d1625a70c83819bf23e7902bb21f4a3087d8e5279b183dd9c1bbde1689f /usr/bin/xbps-query +09e6c73c75ef349319767e1b303c946298c4055bf976bdac9d344f05ef4a79d9 /usr/bin/xbps-reconfigure +0c0fc22668ca7030a9051482b01551a3aedd17a4e4bdc20c1066179765ab3cd5 /usr/bin/xbps-remove +0a49921cee8cff1f0a58ccbe63b8b56a2804a06dc7793e784b6cb17d64075785 /usr/bin/xbps-rindex +cf7c54c2d19f59dd7f85ca0bddecd367dd9b61abae7cd441963f2aa7d7a24d44 /usr/bin/xbps-uchroot +857f99b2e89fa7df73903671c6d5ccc2c5c887cfd35a7357629f6c8686cdcb99 /usr/bin/xbps-uhelper +56d6f585f41b29dd27815fd90ddb5eb0bd7226551893c7f6e00babd45bb1f271 /usr/bin/xbps-uunshare diff --git a/sysc/xbps-0.59.1/patches/cflags.patch b/sysc/xbps-0.59.1/patches/cflags.patch new file mode 100644 index 0000000..229806c --- /dev/null +++ b/sysc/xbps-0.59.1/patches/cflags.patch @@ -0,0 +1,18 @@ +SPDX-FileCopyrightText: 2021 fosslinux + +SPDX-License-Identifier: GPL-3.0-or-later + +Do not use CC argument Wno-unused-command-line-argument. +Unsupported in GCC 4. + +--- mk/prog.mk 2021-12-18 21:32:27.025764282 +1100 ++++ mk/prog.mk 2021-12-18 21:32:06.909579026 +1100 +@@ -10,8 +10,6 @@ + BINS += $(BIN).static + endif + +-CFLAGS += -Wno-unused-command-line-argument +- + .PHONY: all + all: $(BINS) + diff --git a/sysc/xbps-0.59.1/patches/no-shared.patch b/sysc/xbps-0.59.1/patches/no-shared.patch new file mode 100644 index 0000000..67177ea --- /dev/null +++ b/sysc/xbps-0.59.1/patches/no-shared.patch @@ -0,0 +1,32 @@ +SPDX-FileCopyrightText: 2021 fosslinux + +SPDX-License-Identifier: GPL-3.0-or-later + +Do not build or install shared binaries. +Additionally, install static binaries with normal names. + +--- mk/prog.mk 2021-12-18 21:39:55.589895753 +1100 ++++ mk/prog.mk 2021-12-18 21:45:08.260778227 +1100 +@@ -21,9 +21,8 @@ + .PHONY: install + install: all + install -d $(DESTDIR)$(SBINDIR) +- install -m 755 $(BIN) $(DESTDIR)$(SBINDIR) + ifdef BUILD_STATIC +- install -m 755 $(BIN).static $(DESTDIR)$(SBINDIR) ++ install -m 755 $(BIN).static $(DESTDIR)$(SBINDIR)/$(BIN) + endif + ifdef MAN + install -d $(DESTDIR)$(MANDIR)/man$(MANSECTION) +@@ -49,9 +48,5 @@ + ${SILENT}$(CC) -static $(OBJS) $(CPPFLAGS) -L$(TOPDIR)/lib \ + $(CFLAGS) $(LDFLAGS) $(PROG_LDFLAGS) $(STATIC_LIBS) -o $@ + +-$(BIN): $(OBJS) $(TOPDIR)/lib/libxbps.so +- @printf " [CCLD]\t\t$@\n" +- ${SILENT}$(CC) $^ $(CPPFLAGS) -L$(TOPDIR)/lib \ +- $(CFLAGS) $(PROG_CFLAGS) $(LDFLAGS) $(PROG_LDFLAGS) \ +- -lxbps -o $@ +- ++$(BIN): ++.PHONY = $(BIN) diff --git a/sysc/xbps-0.59.1/xbps-0.59.1.sh b/sysc/xbps-0.59.1/xbps-0.59.1.sh new file mode 100644 index 0000000..152c521 --- /dev/null +++ b/sysc/xbps-0.59.1/xbps-0.59.1.sh @@ -0,0 +1,19 @@ +# SPDX-FileCopyrightText: 2021 fosslinux +# +# SPDX-License-Identifier: GPL-3.0-or-later + +src_configure() { + PKG_CONFIG_PATH="${PREFIX}/lib/musl/pkgconfig" \ + ./configure --prefix="${PREFIX}" \ + --libdir="${PREFIX}/lib/musl" \ + --pkgconfigdir="${PREFIX}/lib/musl/pkgconfig" \ + --enable-rpath \ + --enable-static + echo "CFLAGS += -Wno-error" >> config.mk +} + +src_install() { + default + + rm "${PREFIX}/lib/musl/libxbps.so"* +}