mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-13 06:45:24 +01:00
Remove XBPS
This commit is contained in:
parent
bd29c5f855
commit
d91deb50c9
9 changed files with 25 additions and 140 deletions
|
|
@ -24,7 +24,7 @@ echo "Installing packages into sysc"
|
|||
|
||||
install_tar() {
|
||||
echo "${1}: installing package"
|
||||
src_apply_tar "$@"
|
||||
src_apply "$@"
|
||||
}
|
||||
|
||||
# Install packages.
|
||||
|
|
|
|||
|
|
@ -67,9 +67,6 @@ build curl-7.83.0
|
|||
|
||||
build zlib-1.2.13
|
||||
|
||||
build xbps-0.59.1
|
||||
export XBPS_TARGET_ARCH="${ARCH}"
|
||||
|
||||
build automake-1.16.3
|
||||
|
||||
build autoconf-2.71
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
|
||||
|
||||
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)
|
||||
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
|
||||
|
||||
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)
|
||||
|
|
@ -1 +0,0 @@
|
|||
https://github.com/void-linux/xbps/archive/refs/tags/0.59.1.tar.gz 0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
# TODO: add mechanism to change output filename to something nicer
|
||||
|
||||
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 "${DESTDIR}${PREFIX}/lib/musl/libxbps.so"*
|
||||
rm -r "${DESTDIR}${PREFIX}/share/bash-completion/completions"
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue