删除 patches/300-macos-compat.patch
This commit is contained in:
parent
f1c78063b9
commit
4a9a3770b5
@ -1,22 +0,0 @@
|
|||||||
--- a/Makefile.linux
|
|
||||||
+++ b/Makefile.linux
|
|
||||||
@@ -96,13 +96,13 @@ 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 . )
|
|
||||||
+#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 . )
|
|
||||||
# clock_gettime() needs -lrt when glibc version < 2.17
|
|
||||||
-LDLIBS += $(shell if [ $(GLIBC_VERSION_MAJOR) -lt 2 ] \
|
|
||||||
- || [ \( $(GLIBC_VERSION_MAJOR) -eq 2 \) -a \( $(GLIBC_VERSION_MINOR) -lt 17 \) ] ; \
|
|
||||||
- then echo "-lrt" ; fi )
|
|
||||||
+#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
|
|
Loading…
x
Reference in New Issue
Block a user