fix more users of

package/bitlbee/Makefile

@@ -29,7 +29,7 @@ CONFIGURE_ARGS:=	--target=${GNU_TARGET_NAME} \
 			--datadir=/usr/share/bitlbee \
 			--config=/var/lib/bitlbee \
 			--arch=Linux \
-			--cpu="${ARCH}" \
+			--cpu="${ADK_TARGET_ARCH}" \
 			--debug=0 \
 			--strip=0 \
 			--ipv6=1 \

package/cairo/Makefile

@@ -35,7 +35,7 @@ HOST_CONFIGURE_ARGS+=	--enable-ft=yes \
 			--disable-test-surfaces \
 			--disable-full-testing
 
-ifeq (,$(filter arm,$(TARGET_ARCH)))
+ifeq (,$(filter arm,$(ADK_TARGET_ARCH)))
 TARGET_CFLAGS:=         $(filter-out -Os,$(TARGET_CFLAGS))
 endif
 CONFIGURE_ARGS+=	--enable-ft=yes \

package/fontconfig/Makefile

@@ -26,7 +26,7 @@ $(eval $(call PKG_template,FONTCONFIG,fontconfig,${PKG_VERSION}-${PKG_RELEASE},$
 
 HOST_STYLE:=		auto
 TARGET_LDFLAGS+=	-liconv
-CONFIGURE_ARGS+=	--with-arch=${ARCH} \
+CONFIGURE_ARGS+=	--with-arch=${ADK_TARGET_ARCH} \
 			--enable-libxml2 \
 			--disable-docs
 

package/glibc/Makefile

@@ -71,7 +71,7 @@ endif
 	done
 	# header package
 	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) \
-		HOSTCC=$(CC_FOR_BUILD) ARCH=$(ARCH) V=1 \
+		HOSTCC=$(CC_FOR_BUILD) ARCH=$(ADK_TARGET_ARCH) V=1 \
 		INSTALL_HDR_PATH=$(IDIR_GLIBC_DEV)/usr \
 		headers_install
 	(cd $(WRKBUILD); \

package/libpri/Makefile

@@ -21,7 +21,7 @@ $(eval $(call PKG_template,LIBPRI,libpri,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEP
 
 CONFIG_STYLE:=		manual
 
-MAKE_FLAGS+=		CC='${TARGET_CC}' LDCONFIG='' ARCH=$(ARCH)
+MAKE_FLAGS+=		CC='${TARGET_CC}' LDCONFIG='' ARCH=$(ADK_TARGET_ARCH)
 FAKE_FLAGS+=		INSTALL_BASE=/usr
 
 libpri-install:

package/mplayer/Makefile

@@ -101,7 +101,7 @@ CONFIGURE_ARGS:=	--prefix=/usr \
 			--enable-x11 \
 			--confdir=/etc \
 			--enable-cross-compile \
-			--target=${ARCH}-linux \
+			--target=${ADK_TARGET_ARCH}-linux \
 			--cc='$(TARGET_CC)' \
 			--host-cc=$(CC_FOR_BUILD) \
 			--enable-fbdev \

package/musl/Makefile

@@ -75,7 +75,7 @@ endif
 musl-dev-install:
 	${INSTALL_DIR} ${IDIR_MUSL_DEV}/usr/lib 
 	${CP} ${STAGING_TARGET_DIR}/usr/lib/crt*.o ${IDIR_MUSL_DEV}/usr/lib
-	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \
+	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) ARCH=$(ADK_TARGET_ARCH) V=1 \
 		INSTALL_HDR_PATH=$(IDIR_MUSL_DEV)/usr \
 		headers_install
 	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION} \

package/nginx/Makefile

@@ -26,7 +26,7 @@ CONFIGURE_ARGS:=        --prefix=/srv/nginx \
 			--sbin-path=/usr/sbin \
 			--user=nginx \
 			--group=nginx \
-			--crossbuild=Linux::$(ARCH) \
+			--crossbuild=Linux::$(ADK_TARGET_ARCH) \
 			--with-cc="$(TARGET_CC)" \
                         --with-cc-opt="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
                         --with-ld-opt="$(TARGET_LDFLAGS)" \

package/openafs/Makefile

@@ -23,7 +23,7 @@ $(eval $(call PKG_template,OPENAFS,openafs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D
 
 XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 CONFIGURE_ENV+=		ac_cv_path_PATH_CPP=$(TARGET_CROSS)cpp
-CONFIGURE_ARGS:=	--with-afs-sysname=$(ARCH)_linux26 \
+CONFIGURE_ARGS:=	--with-afs-sysname=$(ADK_TARGET_ARCH)_linux26 \
 			--with-linux-kernel-headers=${LINUX_DIR} \
 			--disable-strip-binaries \
 			--disable-linux-syscall-probing

package/opensips/Makefile

@@ -141,7 +141,7 @@ do-build:
 		NO_EPOLL=1 \
 		CC="$(TARGET_CC)" \
 		OS="linux" \
-		ARCH="$(ARCH)"  \
+		ARCH="$(ADK_TARGET_ARCH)"  \
 		CFLAGS="$(TARGET_CFLAGS) -fPIC" \
 		LOCALBASE="$(STAGING_TARGET_DIR)/usr" \
 		SYSBASE="$(STAGING_TARGET_DIR)/usr" \

package/uclibc/Makefile

@@ -53,7 +53,7 @@ uclibc-dev-install:
 	for file in libcrypt libdl libm libresolv libutil; do \
 		cd $(IDIR_UCLIBC_DEV)/$(ADK_TARGET_LIBC_PATH); ln -sf $$file-$(GIT_VERSION).so $$file.so; \
 	done
-	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \
+	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) ARCH=$(ADK_TARGET_ARCH) V=1 \
 		INSTALL_HDR_PATH=$(IDIR_UCLIBC_DEV)/usr \
 		headers_install
 	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION} \