summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-06-02 11:11:56 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-06-02 17:13:35 +0200
commit48758993b09a96f83c2bd190a5586421c90428e7 (patch)
tree28e4554cb26cc1294d06d6241b255d9e20190deb /package
parent8a2c6310e1e2764865ef684217130ed713d654e7 (diff)
refactor CPU_ARCH/ARCH variables
After Joerg asked me about the difference between ADK_TARGET_ARCH and ADK_TARGET_CPU_ARCH I recognized many duplication of variables for this information. These patch fixes this up. Use make cleandir && make menuconfig && make
Diffstat (limited to 'package')
-rw-r--r--package/busybox/Makefile4
-rw-r--r--package/ffmpeg/Makefile2
-rw-r--r--package/gcc/Makefile2
-rw-r--r--package/glibc/Makefile2
-rw-r--r--package/libhugetlbfs/Makefile2
-rw-r--r--package/libmad/Makefile18
-rw-r--r--package/libnet/Makefile6
-rw-r--r--package/musl/Makefile20
-rw-r--r--package/nss/Makefile2
-rw-r--r--package/openjdk7/Makefile6
-rw-r--r--package/perl/Makefile2
-rw-r--r--package/ruby-ldap/Makefile8
12 files changed, 37 insertions, 37 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 36ed09f06..f5c852fb2 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -24,8 +24,8 @@ BUILD_STYLE:= manual
INSTALL_STYLE:= manual
BB_MAKE_FLAGS:= V=1 \
- ARCH="${ARCH}" \
- IPKG_ARCH="${CPU_ARCH}" \
+ ARCH="${ADK_TARGET_ARCH}" \
+ IPKG_ARCH="${ADK_TARGET_CPU_ARCH}" \
HOSTCC="${CC_FOR_BUILD}" \
HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \
CROSS_COMPILE="$(TARGET_CROSS)"
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile
index e7f3493f3..64c333548 100644
--- a/package/ffmpeg/Makefile
+++ b/package/ffmpeg/Makefile
@@ -123,7 +123,7 @@ endif
CONFIG_STYLE:= minimal
CONFIGURE_ARGS:= --prefix=/usr \
--target-os=linux \
- --arch=${CPU_ARCH} \
+ --arch=${ADK_TARGET_CPU_ARCH} \
--enable-cross-compile \
--sysroot=${STAGING_TARGET_DIR} \
--cross-prefix=${TARGET_CROSS} \
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index bef430d12..88cc5b436 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -44,7 +44,7 @@ CONFIGURE_ARGS+= --enable-languages=c,c++
else
CONFIGURE_ARGS+= --enable-languages=c
endif
-ifeq ($(CPU_ARCH),ppc)
+ifeq ($(ADK_TARGET_CPU_ARCH),ppc)
CONFIGURE_ARGS+= --disable-target-optspace --with-long-double-64 --enable-secureplt
TARGET_CFLAGS+= '-Wl,--secure-plt'
else
diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index a74493e23..ff7e1277d 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -42,7 +42,7 @@ endif
glibc-dev-install:
${INSTALL_DIR} $(IDIR_GLIBC_DEV)/$(ADK_TARGET_LIBC_PATH) $(IDIR_GLIBC_DEV)/usr/lib
# install linker script
- cp ./files/libc.so.$(CPU_ARCH) $(IDIR_GLIBC_DEV)/usr/lib/libc.so
+ cp ./files/libc.so.$(ADK_TARGET_CPU_ARCH) $(IDIR_GLIBC_DEV)/usr/lib/libc.so
ifeq ($(ADK_TARGET_ABI_O32),y)
ifeq ($(ADK_big),y)
$(SED) "s#@@ELFTARGET@@#elf32-tradbigmips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so
diff --git a/package/libhugetlbfs/Makefile b/package/libhugetlbfs/Makefile
index dca03494e..96a6cd5bb 100644
--- a/package/libhugetlbfs/Makefile
+++ b/package/libhugetlbfs/Makefile
@@ -22,7 +22,7 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBHUGETLBFS,libhugetlbfs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIG_STYLE:= manual
-XAKE_FLAGS+= PREFIX=/usr DESTDIR=${WRKINST} ADK_ARCH=${CPU_ARCH}
+XAKE_FLAGS+= PREFIX=/usr DESTDIR=${WRKINST} ADK_ARCH=${ADK_TARGET_CPU_ARCH}
ALL_TARGET:= libs tools
libhugetlbfs-install:
diff --git a/package/libmad/Makefile b/package/libmad/Makefile
index b12245425..62afb0b24 100644
--- a/package/libmad/Makefile
+++ b/package/libmad/Makefile
@@ -21,31 +21,31 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBMAD,libmad,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
FPM:=default
-ifeq (${CPU_ARCH},i486)
+ifeq (${ADK_TARGET_CPU_ARCH},i486)
FPM:=intel
endif
-ifeq (${CPU_ARCH},i586)
+ifeq (${ADK_TARGET_CPU_ARCH},i586)
FPM:=intel
endif
-ifeq (${CPU_ARCH},i686)
+ifeq (${ADK_TARGET_CPU_ARCH},i686)
FPM:=intel
endif
-ifeq (${CPU_ARCH},arm)
+ifeq (${ADK_TARGET_CPU_ARCH},arm)
FPM:=arm
endif
-ifeq (${CPU_ARCH},mipsel)
+ifeq (${ADK_TARGET_CPU_ARCH},mipsel)
FPM:=mips
endif
-ifeq (${CPU_ARCH},mips)
+ifeq (${ADK_TARGET_CPU_ARCH},mips)
FPM:=mips
endif
-ifeq (${CPU_ARCH},ppc)
+ifeq (${ADK_TARGET_CPU_ARCH},ppc)
FPM:=ppc
endif
-ifeq (${CPU_ARCH},sparc)
+ifeq (${ADK_TARGET_CPU_ARCH},sparc)
FPM:=sparc
endif
-ifeq (${CPU_ARCH},x86_64)
+ifeq (${ADK_TARGET_CPU_ARCH},x86_64)
FPM:=64bit
endif
diff --git a/package/libnet/Makefile b/package/libnet/Makefile
index 72bbd2800..45c11c02f 100644
--- a/package/libnet/Makefile
+++ b/package/libnet/Makefile
@@ -23,13 +23,13 @@ $(eval $(call PKG_template,LIBNET,libnet,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEP
AUTOTOOL_STYLE:= autoreconf
ENDIAN:=lil
-ifeq (${CPU_ARCH},mips)
+ifeq (${ADK_TARGET_CPU_ARCH},mips)
ENDIAN:=big
endif
-ifeq (${CPU_ARCH},mips64)
+ifeq (${ADK_TARGET_CPU_ARCH},mips64)
ENDIAN:=big
endif
-ifeq (${CPU_ARCH},ppc)
+ifeq (${ADK_TARGET_CPU_ARCH},ppc)
ENDIAN:=big
endif
diff --git a/package/musl/Makefile b/package/musl/Makefile
index a440cd7d4..c1606b5dd 100644
--- a/package/musl/Makefile
+++ b/package/musl/Makefile
@@ -24,32 +24,32 @@ CONFIG_STYLE:= manual
BUILD_STYLE:= manual
INSTALL_STYLE:= manual
-MARCH:= $(CPU_ARCH)
-ifeq ($(CPU_ARCH),i686)
+MARCH:= $(ADK_TARGET_CPU_ARCH)
+ifeq ($(ADK_TARGET_CPU_ARCH),i686)
MARCH:= i386
endif
-ifeq ($(CPU_ARCH),i586)
+ifeq ($(ADK_TARGET_CPU_ARCH),i586)
MARCH:= i386
endif
-ifeq ($(CPU_ARCH),i486)
+ifeq ($(ADK_TARGET_CPU_ARCH),i486)
MARCH:= i386
endif
-ifeq ($(CPU_ARCH),mipsel)
+ifeq ($(ADK_TARGET_CPU_ARCH),mipsel)
MARCH:= mips
endif
-ifeq ($(CPU_ARCH),mips64el)
+ifeq ($(ADK_TARGET_CPU_ARCH),mips64el)
MARCH:= mips
endif
-ifeq ($(CPU_ARCH),mips64)
+ifeq ($(ADK_TARGET_CPU_ARCH),mips64)
MARCH:= mips
endif
-ifeq ($(CPU_ARCH),ppc)
+ifeq ($(ADK_TARGET_CPU_ARCH),ppc)
MARCH:= powerpc
endif
-ifeq ($(CPU_ARCH),sh4)
+ifeq ($(ADK_TARGET_CPU_ARCH),sh4)
MARCH:= sh
endif
-ifeq ($(CPU_ARCH),sh4eb)
+ifeq ($(ADK_TARGET_CPU_ARCH),sh4eb)
MARCH:= sheb
endif
ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
diff --git a/package/nss/Makefile b/package/nss/Makefile
index 4468cadf5..589e6f259 100644
--- a/package/nss/Makefile
+++ b/package/nss/Makefile
@@ -45,7 +45,7 @@ TARGET_LDFLAGS+= -ldl -pthread -lrt
XAKE_FLAGS+= SOURCE_MD_DIR=${WRKDIST}/dist DIST=${WRKDIST}/dist
XAKE_FLAGS+= ARCHFLAG="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} ${TARGET_LDFLAGS}"
-XAKE_FLAGS+= NSS_DISABLE_DBM=1 OS_TEST=${CPU_ARCH} OS_TARGET=Linux OS_RELEASE=2.6 OS_ARCH=Linux
+XAKE_FLAGS+= NSS_DISABLE_DBM=1 OS_TEST=${ADK_TARGET_CPU_ARCH} OS_TARGET=Linux OS_RELEASE=2.6 OS_ARCH=Linux
XAKE_FLAGS+= ARTOOL="${TARGET_CROSS}ar" RANLIB="${TARGET_CROSS}ranlib" NSS_USE_SYSTEM_SQLITE=1
XAKE_FLAGS+= NSS_USE_SYSTEM_ZLIB=1
ALL_TARGET:= all
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile
index cd0fa2646..9147f5dbb 100644
--- a/package/openjdk7/Makefile
+++ b/package/openjdk7/Makefile
@@ -44,11 +44,11 @@ TARGET_CFLAGS:= $(subst march=pentium-m,march=i686,$(TARGET_CFLAGS))
TARGET_CFLAGS:= $(subst march=atom,march=i686,$(TARGET_CFLAGS))
BOOTSTRAPJDK:= ${STAGING_HOST_DIR}/bootstrap-jdk
-JDKARCH:= $(CPU_ARCH)
-ifeq ($(ARCH),x86)
+JDKARCH:= $(ADK_TARGET_CPU_ARCH)
+ifeq ($(ADK_TARGET_ARCH),x86)
JDKARCH:= i386
endif
-ifeq ($(CPU_ARCH),x86_64)
+ifeq ($(ADK_TARGET_CPU_ARCH),x86_64)
JDKARCH:= amd64
endif
diff --git a/package/perl/Makefile b/package/perl/Makefile
index 6d9249e79..f57a058ff 100644
--- a/package/perl/Makefile
+++ b/package/perl/Makefile
@@ -58,7 +58,7 @@ do-configure:
-e 's!%%CPPFLAGS%%!$(TARGET_CPPFLAGS)!g' \
-e 's!%%LIBDIRS%%!$(STAGING_TARGET_DIR)/lib $(STAGING_TARGET_DIR)/usr/lib!g' \
-e 's!%%INCDIRS%%!$(STAGING_TARGET_DIR)/include $(STAGING_TARGET_DIR)/usr/include!g' \
- ./files/config.sh.$(CPU_ARCH).$(ADK_TARGET_LIBC) > ${WRKBUILD}/config.sh
+ ./files/config.sh.$(ADK_TARGET_CPU_ARCH).$(ADK_TARGET_LIBC) > ${WRKBUILD}/config.sh
$(SED) "s#@@STAGING_HOST_DIR@@#${STAGING_HOST_DIR}/usr/bin#" ${WRKBUILD}/Makefile.SH
$(SED) "s#@@LIB@@##" ${WRKBUILD}/Makefile.SH
(cd ${WRKBUILD}; ./Configure -S)
diff --git a/package/ruby-ldap/Makefile b/package/ruby-ldap/Makefile
index c96ec7010..22366e38a 100644
--- a/package/ruby-ldap/Makefile
+++ b/package/ruby-ldap/Makefile
@@ -26,7 +26,7 @@ CONFIG_STYLE:= manual
FAKE_FLAGS+= DESTDIR="/"
do-configure:
- (cd $(WRKBUILD) && $(STAGING_HOST_DIR)/usr/bin/ruby -I$(STAGING_TARGET_DIR)/usr/lib/ruby/2.0.0/$(CPU_ARCH)-linux/ extconf.rb \
+ (cd $(WRKBUILD) && $(STAGING_HOST_DIR)/usr/bin/ruby -I$(STAGING_TARGET_DIR)/usr/lib/ruby/2.0.0/$(ADK_TARGET_CPU_ARCH)-linux/ extconf.rb \
--with-openldap2 \
--without-libnsl \
--with-ldap-dir=$(STAGING_TARGET_DIR)/usr \
@@ -34,10 +34,10 @@ do-configure:
--with-ldap-include=$(STAGING_TARGET_DIR)/usr/include)
ruby-ldap-install:
- $(INSTALL_DIR) $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/2.0.0/$(CPU_ARCH)-linux
+ $(INSTALL_DIR) $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/2.0.0/$(ADK_TARGET_CPU_ARCH)-linux
$(INSTALL_DIR) $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/2.0.0/ldap
- $(CP) $(STAGING_TARGET_DIR)/usr/lib/ruby/site_ruby/2.0.0/$(CPU_ARCH)-linux/ldap.so \
- $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/2.0.0/$(CPU_ARCH)-linux
+ $(CP) $(STAGING_TARGET_DIR)/usr/lib/ruby/site_ruby/2.0.0/$(ADK_TARGET_CPU_ARCH)-linux/ldap.so \
+ $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/2.0.0/$(ADK_TARGET_CPU_ARCH)-linux
$(CP) $(STAGING_TARGET_DIR)//usr/lib/ruby/site_ruby/2.0.0/ldap/*.rb \
$(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/2.0.0/ldap