diff options
| author | Eric Sauvageau <rmerl@lostrealm.ca> | 2016-06-05 19:24:35 +0300 |
|---|---|---|
| committer | Eric Sauvageau <rmerl@lostrealm.ca> | 2016-06-05 19:24:35 +0300 |
| commit | 5ae5d61f6ee8fceadca8b64814ccc22460410fa9 (patch) | |
| tree | f17f9ea9fdda7d225ec4b3495857251bea604eae | |
| parent | 13cb34943a7666e2cbc84f48ee0d7b10c743035b (diff) | |
| parent | cf21f6c19dc2f52fad258964a4850243928564cf (diff) | |
Merge pull request #920 from ppuryear/miniupnpd-libuuid
miniupnpd: Let miniupnpd use the UUID API from libuuid
| -rwxr-xr-x | release/src/router/Makefile | 8 | ||||
| -rwxr-xr-x | release/src/router/miniupnpd/genconfig.sh | 13 |
2 files changed, 11 insertions, 10 deletions
diff --git a/release/src/router/Makefile b/release/src/router/Makefile index 5e4826b83c..24caae3748 100755 --- a/release/src/router/Makefile +++ b/release/src/router/Makefile @@ -1862,15 +1862,15 @@ else cd miniupnpd && ./genconfig.sh --vendorcfg --leasefile endif -miniupnpd: $(IPTABLES) miniupnpd/config.h +miniupnpd: $(IPTABLES) e2fsprogs miniupnpd/config.h @$(SEP) cp -f ./shared/version.h miniupnpd$(MUVER)/. PKG_CONFIG=false ARCH=$(PLATFORM) \ $(MAKE) -C $@ -f Makefile.merlin $(PARALLEL_BUILD) \ IPTABLESPATH=$(TOP)/$(IPTABLES) \ - EXTRACFLAGS="-Os $(EXTRACFLAGS) -idirafter$(KERNEL_HEADER_DIR) -ffunction-sections -fdata-sections" \ - LDFLAGS="$(EXTRALDFLAGS) -ffunction-sections -fdata-sections -Wl,--gc-sections -L$(IPTC_LIBDIR)" \ - LDLIBS="-Wl,--as-needed $(IPTC_LIBS)" + EXTRACFLAGS="-Os $(EXTRACFLAGS) -idirafter$(KERNEL_HEADER_DIR) -ffunction-sections -fdata-sections -I$(TOP)/e2fsprogs/lib" \ + LDFLAGS="$(EXTRALDFLAGS) -ffunction-sections -fdata-sections -Wl,--gc-sections -L$(IPTC_LIBDIR) -L$(TOP)/e2fsprogs/lib" \ + LDLIBS="-Wl,--as-needed $(IPTC_LIBS) -luuid" miniupnpd-clean: -@$(MAKE) -C miniupnpd -f Makefile.merlin clean diff --git a/release/src/router/miniupnpd/genconfig.sh b/release/src/router/miniupnpd/genconfig.sh index 92c376ef20..07a213fc8a 100755 --- a/release/src/router/miniupnpd/genconfig.sh +++ b/release/src/router/miniupnpd/genconfig.sh @@ -343,6 +343,7 @@ case $OS_NAME in # echo "#ifdef RTCONFIG_IPV6" >> ${CONFIGFILE} # echo "#define ENABLE_IPV6" >> ${CONFIGFILE} # echo "#endif" >> ${CONFIGFILE} + echo "#define LIB_UUID" >> ${CONFIGFILE} FW=netfilter ;; Darwin) @@ -385,12 +386,12 @@ case $FW in esac # UUID API -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 +#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 # set V6SOCKETS_ARE_V6ONLY to 0 if it was not set above if [ -z "$V6SOCKETS_ARE_V6ONLY" ] ; then |