mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2026-05-05 12:26:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

main/iproute2: fix install(1) invocation if libmnl isn't available

Browse Source
This commit is contained in:
Sören Tempel 2018-06-27 23:03:10 +02:00
parent ed3867ce17
commit f4ec0f7bd2
2 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/iproute2/APKBUILD
View File

@ -10,7 +10,8 @@ depends=""
install="$pkgname.post-install"
makedepends="bison flex bash iptables-dev libelf-dev"
subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
source="https://kernel.org/pub/linux/utils/net/iproute2/iproute2-$pkgver.tar.xz"
source="https://kernel.org/pub/linux/utils/net/iproute2/iproute2-$pkgver.tar.xz
fix-install-errors.patch"
builddir="$srcdir"/$pkgname-$pkgver
prepare() {
@ -52,4 +53,5 @@ bashcomp() {
rmdir -p "$pkgdir"/usr/share 2>/dev/null || true
}
sha512sums="ccd7fb70afd58f1fcd4e17c38a24607207da853c4d6118fda423efa6e51faad3ad03c4d6d58a579c40ef9c68aaf13b1c455e12b0c36e155712d3d4db3c2ff4b5 iproute2-4.17.0.tar.xz"
sha512sums="ccd7fb70afd58f1fcd4e17c38a24607207da853c4d6118fda423efa6e51faad3ad03c4d6d58a579c40ef9c68aaf13b1c455e12b0c36e155712d3d4db3c2ff4b5 iproute2-4.17.0.tar.xz
24fc2a901650e11f80bcaa82c839e70c21aafdf3c5b8a357d932d066a0b98ae2ec8379fc17a0a16a1b5b4fa5edc131179c10fc02e55d6101701df5a09966912c fix-install-errors.patch"

40
main/iproute2/fix-install-errors.patch Normal file
View File

@ -0,0 +1,40 @@
Without this patch the following error message shows up three times
during `make install:`
install -m 0755 /home/travis/build/alpinelinux/aports/main/iproute2/pkg/iproute2/sbin
BusyBox v1.28.4 (2018-05-30 10:45:57 UTC) multi-call binary.
Usage: install [-cdDsp] [-o USER] [-g GRP] [-m MODE] [-t DIR] [SOURCE]... DEST
Copy files and set attributes
-c Just copy (default)
-d Create directories
-D Create leading target directories
-s Strip symbol table
-p Preserve date
-o USER Set ownership
-g GRP Set group ownership
-m MODE Set permissions
-t DIR Install to DIR
make[1]: *** [Makefile:25: install] Error 1
diff -upr iproute2-4.17.0.orig/Makefile iproute2-4.17.0/Makefile
--- iproute2-4.17.0.orig/Makefile 2018-06-27 22:58:35.818077991 +0200
+++ iproute2-4.17.0/Makefile 2018-06-27 23:00:33.118560603 +0200
@@ -61,7 +61,17 @@ WFLAGS += -Wmissing-declarations -Wold-s
CFLAGS := $(WFLAGS) $(CCOPTS) -I../include -I../include/uapi $(DEFINES) $(CFLAGS)
YACCFLAGS = -d -t -v
-SUBDIRS=lib ip tc bridge misc netem genl tipc devlink rdma man
+SUBDIRS=lib ip tc bridge misc netem genl man
+
+# The following subdirs require libmnl. If libmnl isn't installed
+# install(1) is called with invalid arguments when the install
+# target is invoked in those subdirs because $(TARGETS) is empty.
+#
+# To prevent these errors we only include the subdirs if libmnl is
+# actually available.
+ifeq ($(HAVE_MNL),y)
+SUBDIRS += tipc devlink rdma
+endif
LIBNETLINK=../lib/libutil.a ../lib/libnetlink.a
LDLIBS += $(LIBNETLINK)