From 4219368092c7d4bc84b70646aed8ab2cfe5d0668 Mon Sep 17 00:00:00 2001
From: Sebastian Kemper <sebastian_ml@gmx.net>
Date: Tue, 26 Dec 2017 14:34:45 +0100
Subject: [PATCH] baresip suite: improve MAKE_FLAGS

- add CROSS_COMPILE and OS to MAKE_FLAGS; this should help when
  compiling on other OSes, e.g. Darwin.
- move RELEASE up (alphabetical sort)

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
---
 libs/re/Makefile     | 6 ++++--
 libs/rem/Makefile    | 6 ++++--
 net/baresip/Makefile | 4 +++-
 net/restund/Makefile | 4 +++-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/libs/re/Makefile b/libs/re/Makefile
index ddb51cb..235587b 100644
--- a/libs/re/Makefile
+++ b/libs/re/Makefile
@@ -53,11 +53,13 @@ TARGET_CFLAGS+=-D_GNU_SOURCE
 endif
 
 MAKE_FLAGS+= \
+	CROSS_COMPILE="$(TARGET_CROSS)" \
 	EXTRA_LFLAGS="$(TARGET_LDFLAGS)" \
 	LD="$(TARGET_CC)" \
+	OS=linux \
+	RELEASE=1 \
 	SYSROOT="$(shell $(FIND) $(TOOLCHAIN_DIR) -path '*/include/pthread.h' | sed -ne '1s|/include/pthread.h||p')" \
-	SYSROOT_ALT="$(STAGING_DIR)/usr" \
-	RELEASE=1
+	SYSROOT_ALT="$(STAGING_DIR)/usr"
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/share/re
diff --git a/libs/rem/Makefile b/libs/rem/Makefile
index d50ae87..91d42ed 100644
--- a/libs/rem/Makefile
+++ b/libs/rem/Makefile
@@ -34,14 +34,16 @@ define Package/librem
 endef
 
 MAKE_FLAGS+= \
+	CROSS_COMPILE="$(TARGET_CROSS)" \
 	EXTRA_LFLAGS="$(TARGET_LDFLAGS)" \
 	LD="$(TARGET_CC)" \
 	LIBRE_MK="$(STAGING_DIR)/usr/share/re/re.mk" \
 	LIBRE_INC="$(STAGING_DIR)/usr/include/re" \
 	LIBRE_SO="$(STAGING_DIR)/usr/lib" \
+	OS=linux \
+	RELEASE=1 \
 	SYSROOT="$(shell $(FIND) $(TOOLCHAIN_DIR) -path '*/include/pthread.h' | sed -ne '1s|/include/pthread.h||p')" \
-	SYSROOT_ALT="$(STAGING_DIR)/usr" \
-	RELEASE=1
+	SYSROOT_ALT="$(STAGING_DIR)/usr"
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
diff --git a/net/baresip/Makefile b/net/baresip/Makefile
index b238271..7a27f3b 100644
--- a/net/baresip/Makefile
+++ b/net/baresip/Makefile
@@ -96,15 +96,17 @@ BARESIP_MOD_OPTIONS:= \
 	$(foreach m,$(baresip-mods),$(baresip-mod-$(m))=$(if $(CONFIG_PACKAGE_baresip-mod-$(m)),1))
 
 MAKE_FLAGS+= \
+	CROSS_COMPILE="$(TARGET_CROSS)" \
 	EXTRA_LFLAGS="$(TARGET_LDFLAGS)" \
 	LD="$(TARGET_CC)" \
 	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" \
+	OS=linux \
+	RELEASE=1 \
 	SYSROOT="$(shell $(FIND) $(TOOLCHAIN_DIR) -path '*/include/pthread.h' | sed -ne '1s|/include/pthread.h||p')" \
 	SYSROOT_ALT="$(STAGING_DIR)/usr" \
-	RELEASE=1 \
 	$(BARESIP_MOD_OPTIONS)
 
 TARGET_CFLAGS+=-D_GNU_SOURCE
diff --git a/net/restund/Makefile b/net/restund/Makefile
index 6206be4..28537e9 100644
--- a/net/restund/Makefile
+++ b/net/restund/Makefile
@@ -47,14 +47,16 @@ RESTUND_MOD_OPTIONS:= \
 	$(foreach m,$(restund-mods),$(restund-mod-$(m))=$(if $(CONFIG_PACKAGE_restund-mod-$(m)),1))
 
 MAKE_FLAGS+= \
+	CROSS_COMPILE="$(TARGET_CROSS)" \
 	EXTRA_LFLAGS="$(TARGET_LDFLAGS)" \
 	LD="$(TARGET_CC)" \
 	LIBRE_MK="$(STAGING_DIR)/usr/share/re/re.mk" \
 	LIBRE_INC="$(STAGING_DIR)/usr/include/re" \
 	LIBRE_SO="$(STAGING_DIR)/usr/lib" \
+	OS=linux \
+	RELEASE=1 \
 	SYSROOT="$(shell $(FIND) $(TOOLCHAIN_DIR) -path '*/include/pthread.h' | sed -ne '1s|/include/pthread.h||p')" \
 	SYSROOT_ALT="$(STAGING_DIR)/usr" \
-	RELEASE=1 \
 	$(RESTUND_MOD_OPTIONS)
 
 define Package/restund/install