mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-08 16:13:50 +02:00
iproute2: fix musl build
This commit is contained in:
parent
34ea8c3e8b
commit
77816b9a77
2 changed files with 41 additions and 1 deletions
40
srcpkgs/iproute2/patches/fix-install-errors.patch
Normal file
40
srcpkgs/iproute2/patches/fix-install-errors.patch
Normal 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
|
||||||
|
--- ./Makefile 2018-06-27 22:58:35.818077991 +0200
|
||||||
|
+++ ./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)
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'iproute2'
|
# Template file for 'iproute2'
|
||||||
pkgname=iproute2
|
pkgname=iproute2
|
||||||
version=5.7.0
|
version=5.7.0
|
||||||
revision=1
|
revision=2
|
||||||
build_style=configure
|
build_style=configure
|
||||||
make_install_args="SBINDIR=/usr/bin"
|
make_install_args="SBINDIR=/usr/bin"
|
||||||
hostmakedepends="pkg-config perl flex"
|
hostmakedepends="pkg-config perl flex"
|
||||||
|
|
Loading…
Add table
Reference in a new issue