status-im
/
miniupnp
mirror of https://github.com/status-im/miniupnp.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Applied patch to OpenWRT compatibility

This commit is contained in:
Guilherme Senges 2019-08-29 17:44:40 -03:00 committed by Thomas Bernard
parent f24ca07640
commit 62d62e4f88
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
miniupnpd/Makefile.linux
View File

@ -77,7 +77,10 @@ CPPFLAGS += -DIPTABLES_143
endif endif
CFLAGS += $(shell $(PKG_CONFIG) --cflags libiptc) CFLAGS += $(shell $(PKG_CONFIG) --cflags libiptc)
#OpenWrt packager passes correct libraries
ifeq ($(TARGET_OPENWRT),)
LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libiptc) LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libiptc)
endif
LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-L libiptc) LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-L libiptc)
LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-other libiptc) LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-other libiptc)
else else
@ -157,6 +160,8 @@ LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libmnl)
LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libnetfilter_conntrack) LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libnetfilter_conntrack)
endif # ($(TEST),1) endif # ($(TEST),1)
# OpenWrt packager disables https server for IGD v2 and hardcodes libuuid support
ifeq ($(TARGET_OPENWRT),)
LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libssl) LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libssl)
TEST := $(shell $(PKG_CONFIG) --exists uuid && echo 1) TEST := $(shell $(PKG_CONFIG) --exists uuid && echo 1)
@ -165,6 +170,7 @@ LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l uuid)
else else
$(info please install uuid-dev package / libuuid) $(info please install uuid-dev package / libuuid)
endif # ($(TEST),1) endif # ($(TEST),1)
endif # ($(TARGET_OPENWRT,)
GLIBC_VERSION := $(shell ldd --version | head -n 1 | sed 's/^.* //') GLIBC_VERSION := $(shell ldd --version | head -n 1 | sed 's/^.* //')
GLIBC_VERSION_MAJOR = $(shell echo $(GLIBC_VERSION) | cut -f 1 -d . ) GLIBC_VERSION_MAJOR = $(shell echo $(GLIBC_VERSION) | cut -f 1 -d . )

19
miniupnpd/genconfig.sh
View File

@ -379,12 +379,19 @@ case $FW in
esac esac
# UUID API # UUID API
if grep uuid_create /usr/include/uuid.h > /dev/null 2>&1 ; then case $OS_NAME in
echo "#define BSD_UUID" >> ${CONFIGFILE} OpenWRT)
fi echo "#define LIB_UUID" >> ${CONFIGFILE}
if grep uuid_generate /usr/include/uuid/uuid.h > /dev/null 2>&1 ; then ;;
echo "#define LIB_UUID" >> ${CONFIGFILE} *)
fi if grep uuid_create /usr/include/uuid.h > /dev/null 2>&1 ; then
echo "#define BSD_UUID" >> ${CONFIGFILE}
fi
if grep uuid_generate /usr/include/uuid/uuid.h > /dev/null 2>&1 ; then
echo "#define LIB_UUID" >> ${CONFIGFILE}
fi
;;
esac
# set V6SOCKETS_ARE_V6ONLY to 0 if it was not set above # set V6SOCKETS_ARE_V6ONLY to 0 if it was not set above
if [ -z "$V6SOCKETS_ARE_V6ONLY" ] ; then if [ -z "$V6SOCKETS_ARE_V6ONLY" ] ; then