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

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

Revision: 7343
          http://sourceforge.net/p/astlinux/code/7343
Author:   abelbeck
Date:     2015-11-23 15:30:19 +0000 (Mon, 23 Nov 2015)
Log Message:
-----------
Follow-up to r7338, use KERNEL_ARCH instead

Revision Links:
--------------
    http://sourceforge.net/p/astlinux/code/7338

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-23 14:13:29 UTC (rev 7342)
+++ branches/1.0/package/kamailio/kamailio.mk	2015-11-23 15:30:19 UTC (rev 7343)
@@ -24,12 +24,6 @@
 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" \
@@ -50,7 +44,7 @@
 	exclude_modules="$(KAMAILIO_EXCLUDE_MODULES)" \
 	modules_dirs="modules" \
 	LIBDIR=usr/lib \
-	ARCH="$(KAMAILIO_TARGET_ARCH)" \
+	ARCH="$(KERNEL_ARCH)" \
 	OS="linux"
 
 define KAMAILIO_BUILD_CMDS

Modified: branches/1.0/package/opensips/opensips.mk
===================================================================
--- branches/1.0/package/opensips/opensips.mk	2015-11-23 14:13:29 UTC (rev 7342)
+++ branches/1.0/package/opensips/opensips.mk	2015-11-23 15:30:19 UTC (rev 7343)
@@ -18,12 +18,6 @@
 	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" \
@@ -36,7 +30,7 @@
 		prefix="" \
 		bin-prefix=/usr/ \
 		cfg-prefix=/ \
-		ARCH="$(OPENSIPS_TARGET_ARCH)" \
+		ARCH="$(KERNEL_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.