[Astlinux-commits] SF.net SVN: astlinux:[7338] branches/1.0/package

[<abe...@us...>]

Revision: 7338
          http://sourceforge.net/p/astlinux/code/7338
Author:   abelbeck
Date:     2015-11-22 15:56:32 +0000 (Sun, 22 Nov 2015)
Log Message:
-----------
Cleanup hardcoded ARCH values set to i386

Modified Paths:
--------------
    branches/1.0/package/kamailio/kamailio.mk
    branches/1.0/package/opensips/opensips.mk

Modified: branches/1.0/package/kamailio/kamailio.mk
===================================================================
--- branches/1.0/package/kamailio/kamailio.mk	2015-11-22 15:02:08 UTC (rev 7337)
+++ branches/1.0/package/kamailio/kamailio.mk	2015-11-22 15:56:32 UTC (rev 7338)
@@ -24,6 +24,12 @@
 KAMAILIO_INCLUDE_MODULES += presence presence_xml xmlrpc
 endif
 
+ifeq ($(ARCH),i586)
+KAMAILIO_TARGET_ARCH = i386
+else
+KAMAILIO_TARGET_ARCH = $(ARCH)
+endif
+
 KAMAILIO_ENV_ARGS = \
 	LOCALBASE="$(STAGING_DIR)/usr" \
 	SYSBASE="$(STAGING_DIR)/usr" \
@@ -44,7 +50,7 @@
 	exclude_modules="$(KAMAILIO_EXCLUDE_MODULES)" \
 	modules_dirs="modules" \
 	LIBDIR=usr/lib \
-	ARCH="i386" \
+	ARCH="$(KAMAILIO_TARGET_ARCH)" \
 	OS="linux"
 
 define KAMAILIO_BUILD_CMDS

Modified: branches/1.0/package/opensips/opensips.mk
===================================================================
--- branches/1.0/package/opensips/opensips.mk	2015-11-22 15:02:08 UTC (rev 7337)
+++ branches/1.0/package/opensips/opensips.mk	2015-11-22 15:56:32 UTC (rev 7338)
@@ -18,6 +18,12 @@
 	pua pua_bla pua_mi pua_usrloc pua_xmpp pua_dialoginfo regex dialplan mi_http pi_http cachedb_sql \
 	mi_json presence_callinfo presence_xcapdiff
 
+ifeq ($(ARCH),i586)
+OPENSIPS_TARGET_ARCH = i386
+else
+OPENSIPS_TARGET_ARCH = $(ARCH)
+endif
+
 define OPENSIPS_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) \
 	LOCALBASE="$(STAGING_DIR)/usr" \
@@ -30,7 +36,7 @@
 		prefix="" \
 		bin-prefix=/usr/ \
 		cfg-prefix=/ \
-		ARCH="i386" \
+		ARCH="$(OPENSIPS_TARGET_ARCH)" \
 		OS="linux" \
 		include_modules="$(OPENSIPS_INCLUDE_MODULES)" \
 		exclude_modules="$(OPENSIPS_EXCLUDE_MODULES)" \

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.