OpenWrt
/
telephony
mirror of https://git.openwrt.org/feed/telephony.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

restund: Use default Build/Compile routine 

Change from custom make call to using the default Build/Compile routine.
This applies the standard memory corruption mitigation methods, e.g.
FORTIFY_SOURCE and RELRO, to the package if they are enabled (default).

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
Sebastian Kemper 2017-11-26 22:27:58 +01:00
parent f38e08a904
commit 2f036a1f81
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
net/restund/Makefile
View File

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=restund PKG_NAME:=restund
PKG_VERSION:=0.4.12 PKG_VERSION:=0.4.12
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.creytiv.com/pub/ PKG_SOURCE_URL:=http://www.creytiv.com/pub/
@ -20,6 +20,8 @@ PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=docs/COPYING PKG_LICENSE_FILES:=docs/COPYING
PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu> PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
PKG_INSTALL:=1
restund-mods:= mysql restund-mods:= mysql
PKG_CONFIG_DEPENDS:= $(patsubst %,CONFIG_PACKAGE_restund-mod-%,$(restund-mods)) PKG_CONFIG_DEPENDS:= $(patsubst %,CONFIG_PACKAGE_restund-mod-%,$(restund-mods))
@ -44,22 +46,16 @@ restund-mod-mysql:= USE_MYSQL
RESTUND_MOD_OPTIONS:= \ RESTUND_MOD_OPTIONS:= \
$(foreach m,$(restund-mods),$(restund-mod-$(m))=$(if $(CONFIG_PACKAGE_restund-mod-$(m)),1)) $(foreach m,$(restund-mods),$(restund-mod-$(m))=$(if $(CONFIG_PACKAGE_restund-mod-$(m)),1))
define Build/Compile MAKE_FLAGS+= \
$(MAKE) -C $(PKG_BUILD_DIR) \ EXTRA_LFLAGS="$(TARGET_LDFLAGS)" \
LIBRE_MK="$(STAGING_DIR)/usr/share/re/re.mk" \ LIBRE_MK="$(STAGING_DIR)/usr/share/re/re.mk" \
LIBRE_INC="$(STAGING_DIR)/usr/include/re" \ LIBRE_INC="$(STAGING_DIR)/usr/include/re" \
LIBRE_SO="$(STAGING_DIR)/usr/lib" \ LIBRE_SO="$(STAGING_DIR)/usr/lib" \
CC="$(TARGET_CC)" \ SYSROOT="$(shell $(FIND) $(TOOLCHAIN_DIR) -path '*/include/pthread.h' | sed -ne '1s|/include/pthread.h||p')" \
EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
DESTDIR="$(PKG_INSTALL_DIR)" \
SYSROOT="$$$$($(FIND) $(TOOLCHAIN_DIR) -path '*/include/pthread.h' | sed -ne '1s#/include/pthread.h##p')" \
SYSROOT_ALT="$(STAGING_DIR)/usr" \ SYSROOT_ALT="$(STAGING_DIR)/usr" \
RELEASE=1 \ RELEASE=1 \
CROSS_COMPILE="$(TARGET_CROSS)" \
OS="linux" \ OS="linux" \
$(RESTUND_MOD_OPTIONS) \ $(RESTUND_MOD_OPTIONS)
all install
endef
define Package/restund/install define Package/restund/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin