From 9c4607f4933539cc80635dde1bd4787f80015db0 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 26 Nov 2017 22:42:05 +0100 Subject: [PATCH] baresip: 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 --- net/baresip/Makefile | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/net/baresip/Makefile b/net/baresip/Makefile index aac72a3..48e7677 100644 --- a/net/baresip/Makefile +++ b/net/baresip/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=baresip PKG_VERSION:=0.5.6 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.creytiv.com/pub/ @@ -20,6 +20,8 @@ PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=docs/COPYING PKG_MAINTAINER:=Jiri Slachta +PKG_INSTALL:=1 + baresip-mods:= \ alsa \ avcodec \ @@ -75,23 +77,17 @@ BARESIP_MOD_OPTIONS:= \ TARGET_CFLAGS += $(FPIC) -D_GNU_SOURCE -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - LIBRE_MK="$(STAGING_DIR)/usr/share/re/re.mk" \ - LIBRE_INC="$(STAGING_DIR)/usr/include/re" \ - LIBRE_SO="$(STAGING_DIR)/usr/lib" \ - LIBREM_PATH="../rem" \ - CC="$(TARGET_CC)" \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - EXTRA_CFLAGS="$(TARGET_CFLAGS) -DOPENWRT" \ - SYSROOT="$$$$($(FIND) $(TOOLCHAIN_DIR) -path '*/include/pthread.h' | sed -ne '1s#/include/pthread.h##p')" \ - SYSROOT_ALT="$(STAGING_DIR)/usr" \ - RELEASE=1 \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - OS="linux" \ - $(BARESIP_MOD_OPTIONS) \ - all install -endef +MAKE_FLAGS+= \ + EXTRA_LFLAGS="$(TARGET_LDFLAGS)" \ + LIBRE_MK="$(STAGING_DIR)/usr/share/re/re.mk" \ + LIBRE_INC="$(STAGING_DIR)/usr/include/re" \ + LIBRE_SO="$(STAGING_DIR)/usr/lib" \ + LIBREM_PATH="$(STAGING_DIR)/usr" \ + SYSROOT="$(shell $(FIND) $(TOOLCHAIN_DIR) -path '*/include/pthread.h' | sed -ne '1s|/include/pthread.h||p')" \ + SYSROOT_ALT="$(STAGING_DIR)/usr" \ + RELEASE=1 \ + OS="linux" \ + $(BARESIP_MOD_OPTIONS) define Package/baresip/install $(INSTALL_DIR) $(1)/usr/bin