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 <sebastian_ml@gmx.net>

diff --git a/net/baresip/Makefile b/net/baresip/Makefile
index aac72a33033f769d5253594aaeaed9c7cc68a35b..48e7677fc3a11e48e2e7fc1d2e51719ce071e72a 100644 (file)
--- 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 <jiri@slachta.eu>
 
+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