mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-21 10:15:12 +03:00
bcce51aa23
- remove the sed stuff - pass configure opts instead of sed config.h - don't leak aports' git ref into miniupnpd binary - add missing test scripts - refactor init.d script - generate uuid from post-install - improve error message when external/internal interface is missing
22 lines
882 B
Diff
22 lines
882 B
Diff
Upstream: https://github.com/miniupnp/miniupnp/pull/553
|
|
|
|
diff --git a/Makefile.linux b/Makefile.linux
|
|
index 8f16886..fc85d50 100644
|
|
--- a/Makefile.linux
|
|
+++ b/Makefile.linux
|
|
@@ -95,6 +95,7 @@ $(info please install uuid-dev package / libuuid)
|
|
endif # ($(TEST),1)
|
|
endif # ($(TARGET_OPENWRT,)
|
|
|
|
+ifneq ($(shell --ldd --version | grep GLIBC),)
|
|
GLIBC_VERSION := $(shell ldd --version | head -n 1 | sed 's/^.* //')
|
|
GLIBC_VERSION_MAJOR = $(shell echo $(GLIBC_VERSION) | cut -f 1 -d . )
|
|
GLIBC_VERSION_MINOR = $(shell echo $(GLIBC_VERSION) | cut -f 2 -d . )
|
|
@@ -102,6 +103,7 @@ GLIBC_VERSION_MINOR = $(shell echo $(GLIBC_VERSION) | cut -f 2 -d . )
|
|
LDLIBS += $(shell if [ $(GLIBC_VERSION_MAJOR) -lt 2 ] \
|
|
|| [ \( $(GLIBC_VERSION_MAJOR) -eq 2 \) -a \( $(GLIBC_VERSION_MINOR) -lt 17 \) ] ; \
|
|
then echo "-lrt" ; fi )
|
|
+endif
|
|
|
|
TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o
|
|
|