From 9e32d91c27e484f868d263cb757c56df50ebdb66 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 2 Mar 2014 15:10:20 +0100 Subject: some fixes for test-framework target --- mk/build.mk | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index 2d4523e75..37f27b12b 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -389,6 +389,12 @@ endif |sed -e "s#^config \(.*\)#\1=y#" \ >> $(TOPDIR)/.defconfig; \ fi + @if [ ! -z "$(COLLECTION)" ];then \ + grep -h "^config" target/packages/pkg-available/* \ + |grep -i "$(COLLECTION)" \ + |sed -e "s#^config \(.*\)#\1=y#" \ + >> $(TOPDIR)/.defconfig; \ + fi @if [ ! -z "$(PKG)" ];then \ grep "^config" target/config/Config.in \ |grep -i "$(PKG)" \ @@ -556,9 +562,10 @@ test-framework: mkdir -p $(TOPDIR)/firmware/$(SYSTEM)_$(ARCH)_$$libc; \ ( \ for arch in arm mips mipsel x86 x86_64;do \ - echo === building qemu-$$arch for $$libc on $$(date); \ + tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#"); \ + echo === building qemu-$$arch for $$libc with $$tarch on $$(date); \ $(GMAKE) prereq && \ - $(GMAKE) ARCH=$$arch SYSTEM=qemu-$$arch LIBC=$$libc FS=archive defconfig; \ + $(GMAKE) ARCH=$$tarch SYSTEM=qemu-$$arch LIBC=$$libc FS=archive COLLECTION=test defconfig; \ $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \ rm .config; \ done; \ -- cgit v1.2.3 From 00fa581bc6acc3158b3008019e81802a5d70418c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 2 Mar 2014 15:22:50 +0100 Subject: remove REAL_GNU_TARGET_NAME, it is a relict from buildroot days, I do not know why this is required. the names are not unique between arch with different abi --- mk/vars.mk | 6 ++---- package/binutils/Makefile | 4 ++-- package/bitlbee/Makefile | 2 +- package/eglibc/Makefile | 2 +- package/gcc/Makefile | 4 ++-- package/kmod/Makefile | 2 +- package/libx264/Makefile | 2 +- package/openjdk7/Makefile | 2 +- package/pcc-libs/Makefile | 4 ++-- package/pcc/Makefile | 4 ++-- toolchain/Makefile | 4 ++-- toolchain/binutils/Makefile | 2 +- toolchain/eglibc/Makefile | 14 +++++++------- toolchain/eglibc/Makefile.inc | 8 ++++---- toolchain/gcc/Makefile | 29 ++++++++++------------------- toolchain/gdb/Makefile | 4 +--- toolchain/glibc/Makefile.inc | 10 +++++----- toolchain/musl/Makefile | 16 ++++++++-------- 18 files changed, 53 insertions(+), 66 deletions(-) (limited to 'mk') diff --git a/mk/vars.mk b/mk/vars.mk index ef50e59d8..3798757bc 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -49,11 +49,9 @@ TARGET_PATH= ${SCRIPT_DIR}:${STAGING_TARGET_DIR}/scripts:${STAGING_HOST_DIR}/bi HOST_PATH= ${SCRIPT_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH} AUTOTOOL_PATH= ${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${STAGING_TARGET_DIR}/scripts:${_PATH} ifeq ($(ADK_TARGET_ABI_X32),y) -REAL_GNU_TARGET_NAME= $(CPU_ARCH)-x32-linux-$(ADK_TARGET_SUFFIX) GNU_TARGET_NAME= $(CPU_ARCH)-x32-linux else -REAL_GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX) -GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux +GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX) endif ifeq ($(ADK_DISABLE_HONOUR_CFLAGS),) @@ -67,7 +65,7 @@ TARGET_CROSS:= TARGET_COMPILER_PREFIX?= CONFIGURE_TRIPLE:= else -TARGET_CROSS:= $(STAGING_HOST_DIR)/bin/$(REAL_GNU_TARGET_NAME)- +TARGET_CROSS:= $(STAGING_HOST_DIR)/bin/$(GNU_TARGET_NAME)- TARGET_COMPILER_PREFIX?=${TARGET_CROSS} CONFIGURE_TRIPLE:= --build=${GNU_HOST_NAME} --host=${GNU_TARGET_NAME} --target=${GNU_TARGET_NAME} endif diff --git a/package/binutils/Makefile b/package/binutils/Makefile index 19b945f41..b6e6fb616 100644 --- a/package/binutils/Makefile +++ b/package/binutils/Makefile @@ -35,8 +35,8 @@ TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) TARGET_CFLAGS+= -fPIC ifeq ($(ADK_NATIVE),) CONFIGURE_ARGS+= --disable-werror \ - --host=$(REAL_GNU_TARGET_NAME) \ - --target=$(REAL_GNU_TARGET_NAME) + --host=$(GNU_TARGET_NAME) \ + --target=$(GNU_TARGET_NAME) else CONFIGURE_ARGS+= --disable-werror endif diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile index e3ca9f404..0852d8e4f 100644 --- a/package/bitlbee/Makefile +++ b/package/bitlbee/Makefile @@ -20,7 +20,7 @@ $(eval $(call PKG_template,BITLBEE,bitlbee,${PKG_VERSION}-${PKG_RELEASE},${PKG_D CONFIG_STYLE:= minimal TARGET_CFLAGS+= -fPIC -CONFIGURE_ARGS:= --target=${REAL_GNU_TARGET_NAME} \ +CONFIGURE_ARGS:= --target=${GNU_TARGET_NAME} \ --prefix=/usr \ --bindir=/usr/sbin \ --etcdir=/etc/bitlbee \ diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index 5c21cac3a..9070b5b09 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -77,7 +77,7 @@ endif (cd $(WRKBUILD); \ ${EGLIBC_ENV} \ $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)/libc/configure \ - --host=$(REAL_GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ --prefix=$(IDIR_EGLIBC_DEV)/usr \ --with-headers=$(IDIR_EGLIBC_DEV)/usr/include \ ${EGLIBC_CONFOPTS} \ diff --git a/package/gcc/Makefile b/package/gcc/Makefile index 99984ac20..6d8ee9620 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -55,8 +55,8 @@ endif CONFIGURE_ENV+= have_sys_sdt_h=no -CONFIGURE_ARGS+= --host=$(REAL_GNU_TARGET_NAME) \ - --target=$(REAL_GNU_TARGET_NAME) \ +CONFIGURE_ARGS+= --host=$(GNU_TARGET_NAME) \ + --target=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ --disable-__cxa_atexit \ --without-headers \ diff --git a/package/kmod/Makefile b/package/kmod/Makefile index 944f47599..e02addded 100644 --- a/package/kmod/Makefile +++ b/package/kmod/Makefile @@ -20,7 +20,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,KMOD,kmod,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CONFIG_STYLE:= minimal -CONFIGURE_ARGS+= --host=${REAL_GNU_TARGET_NAME} +CONFIGURE_ARGS+= --host=${GNU_TARGET_NAME} kmod-install: $(INSTALL_DIR) $(IDIR_KMOD)/usr/bin diff --git a/package/libx264/Makefile b/package/libx264/Makefile index 0a82c5f62..96f6de14d 100644 --- a/package/libx264/Makefile +++ b/package/libx264/Makefile @@ -29,7 +29,7 @@ CONFIGURE_ARGS+= --disable-cli \ --disable-opencl \ --enable-shared \ --prefix=/usr \ - --host=${REAL_GNU_TARGET_NAME} \ + --host=${GNU_TARGET_NAME} \ --sysroot=${STAGING_TARGET_DIR} \ --cross-prefix=$(TARGET_CROSS) diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index 57a9248bb..d9c2f04de 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -88,7 +88,7 @@ CONFIGURE_ARGS+= $(CONFIGURE_COMMON) CONFIGURE_ARGS+= --disable-bootstrap CONFIGURE_ENV+= LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib -MAKE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/bin \ +MAKE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/bin \ ALT_OPENWIN_HOME=$(STAGING_DIR)/usr/ \ ALT_CUPS_HEADERS_PATH=$(STAGING_DIR)/usr/include/ \ ALT_FREETYPE_HEADERS_PATH=$(STAGING_DIR)/usr/include/ \ diff --git a/package/pcc-libs/Makefile b/package/pcc-libs/Makefile index 9860b6805..16b05879e 100644 --- a/package/pcc-libs/Makefile +++ b/package/pcc-libs/Makefile @@ -20,8 +20,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,PCC_LIBS,pcc-libs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) # we cross-compile a native compiler for the target system -CONFIGURE_ARGS+= --host=${REAL_GNU_TARGET_NAME} -CONFIGURE_ARGS+= --target=${REAL_GNU_TARGET_NAME} +CONFIGURE_ARGS+= --host=${GNU_TARGET_NAME} +CONFIGURE_ARGS+= --target=${GNU_TARGET_NAME} pcc-libs-install: $(INSTALL_DIR) $(IDIR_PCC_LIBS)/usr/bin diff --git a/package/pcc/Makefile b/package/pcc/Makefile index c7f3878da..8adc848ca 100644 --- a/package/pcc/Makefile +++ b/package/pcc/Makefile @@ -22,8 +22,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,PCC,pcc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) # we cross-compile a native compiler for the target system -CONFIGURE_ARGS+= --host=${REAL_GNU_TARGET_NAME} -CONFIGURE_ARGS+= --target=${REAL_GNU_TARGET_NAME} +CONFIGURE_ARGS+= --host=${GNU_TARGET_NAME} +CONFIGURE_ARGS+= --target=${GNU_TARGET_NAME} CONFIGURE_ARGS+= --with-assembler=/usr/bin/as CONFIGURE_ARGS+= --with-linker=/usr/bin/ld diff --git a/toolchain/Makefile b/toolchain/Makefile index b61133b28..460cbf97f 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -60,8 +60,8 @@ endif $(STAGING_HOST_DIR): @mkdir -p $(STAGING_HOST_DIR)/lib @mkdir -p $(STAGING_HOST_DIR)/include - @mkdir -p $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) - @ln -sf ../lib $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/lib + @mkdir -p $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME) + @ln -sf ../lib $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/lib %-download: $(TRACE) toolchain/$(patsubst %-download,%,$@)/download diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index 201f8538c..8ebbea53c 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -29,7 +29,7 @@ $(WRKBUILD)/.configured: (cd $(WRKBUILD); \ $(WRKBUILD)/configure \ --prefix=$(STAGING_HOST_DIR) \ - --target=$(REAL_GNU_TARGET_NAME) \ + --target=$(GNU_TARGET_NAME) \ --with-sysroot=$(STAGING_TARGET_DIR) \ --disable-multilib \ --disable-dependency-tracking \ diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile index e2028dcd4..20b6f33ac 100644 --- a/toolchain/eglibc/Makefile +++ b/toolchain/eglibc/Makefile @@ -30,11 +30,11 @@ $(WRKBUILD)/.headers_configure: $(WRKBUILD)/libc/option-groups.config (cd $(EGLIBC_BUILD_DIR_INITIAL); \ ${EGLIBC_ENV} \ - CC="${REAL_GNU_TARGET_NAME}-gcc $(ADK_TARGET_ABI_CFLAGS)" \ + CC="${GNU_TARGET_NAME}-gcc $(ADK_TARGET_ABI_CFLAGS)" \ $(WRKBUILD)/libc/configure \ --prefix=$(STAGING_TARGET_DIR)/usr \ --with-headers=$(STAGING_TARGET_DIR)/usr/include \ - --host=$(REAL_GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ ${EGLIBC_CONFOPTS} \ ); touch $@ @@ -42,7 +42,7 @@ $(WRKBUILD)/.headers_configure: $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure (cd $(EGLIBC_BUILD_DIR_INITIAL); \ ${EGLIBC_ENV} \ - CC="${REAL_GNU_TARGET_NAME}-gcc $(ADK_TARGET_ABI_CFLAGS)" \ + CC="${GNU_TARGET_NAME}-gcc $(ADK_TARGET_ABI_CFLAGS)" \ $(MAKE) install-headers install-bootstrap-headers=yes cross-compiling=yes \ ); touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h @@ -61,12 +61,12 @@ $(WRKBUILD)/.configured: $(EGLIBC_BUILD_DIR_FINAL)/option-groups.config (cd $(EGLIBC_BUILD_DIR_FINAL); \ ${EGLIBC_ENV} \ - CC="${REAL_GNU_TARGET_NAME}-gcc $(ADK_TARGET_ABI_CFLAGS)" \ + CC="${GNU_TARGET_NAME}-gcc $(ADK_TARGET_ABI_CFLAGS)" \ $(WRKBUILD)/libc/configure \ --prefix=/usr \ --enable-shared \ --enable-stackguard-randomization \ - --host=$(REAL_GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ ${EGLIBC_CONFOPTS} \ ); touch $@ @@ -74,13 +74,13 @@ $(WRKBUILD)/.configured: $(EGLIBC_BUILD_DIR_FINAL)/libc.so: $(WRKBUILD)/.compiled: $(WRKBUILD)/.configured ${EGLIBC_ENV} \ - CC="${REAL_GNU_TARGET_NAME}-gcc $(ADK_TARGET_ABI_CFLAGS)" \ + CC="${GNU_TARGET_NAME}-gcc $(ADK_TARGET_ABI_CFLAGS)" \ $(MAKE) -C $(EGLIBC_BUILD_DIR_FINAL) cross-compiling=yes all touch $@ $(WRKBUILD)/.installed: $(EGLIBC_BUILD_DIR_FINAL)/libc.so ${EGLIBC_ENV} \ - CC="${REAL_GNU_TARGET_NAME}-gcc $(ADK_TARGET_ABI_CFLAGS)" \ + CC="${GNU_TARGET_NAME}-gcc $(ADK_TARGET_ABI_CFLAGS)" \ $(MAKE) -C $(EGLIBC_BUILD_DIR_FINAL) install_root=$(STAGING_TARGET_DIR) install ${INSTALL_DIR} ${STAGING_TARGET_DIR}/etc ${INSTALL_DATA} ${WRKBUILD}/libc/posix/gai.conf ${STAGING_TARGET_DIR}/etc/ diff --git a/toolchain/eglibc/Makefile.inc b/toolchain/eglibc/Makefile.inc index 1ac72ef54..7213a45c3 100644 --- a/toolchain/eglibc/Makefile.inc +++ b/toolchain/eglibc/Makefile.inc @@ -22,10 +22,10 @@ EGLIBC_ENV:= PATH='${TARGET_PATH}' \ BUILD_CC=${CC_FOR_BUILD} \ GCC_HONOUR_COPTS=s \ CFLAGS="$(TARGET_CFLAGS_LIBC)" \ - CC=${REAL_GNU_TARGET_NAME}-gcc \ - CXX=${REAL_GNU_TARGET_NAME}-g++ \ - AR=${REAL_GNU_TARGET_NAME}-ar \ - RANLIB=${REAL_GNU_TARGET_NAME}-ranlib \ + CC=${GNU_TARGET_NAME}-gcc \ + CXX=${GNU_TARGET_NAME}-g++ \ + AR=${GNU_TARGET_NAME}-ar \ + RANLIB=${GNU_TARGET_NAME}-ranlib \ libc_cv_cc_with_libunwind=no \ libc_cv_forced_unwind=yes \ libc_cv_c_cleanup=yes \ diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 4b0212f77..d29778c2e 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -12,7 +12,7 @@ GCC_CONFOPTS= --prefix=$(STAGING_HOST_DIR) \ --with-bugurl="http://www.openadk.org/" \ --build=$(GNU_HOST_NAME) \ --host=$(GNU_HOST_NAME) \ - --target=$(REAL_GNU_TARGET_NAME) \ + --target=$(GNU_TARGET_NAME) \ --with-gmp=$(STAGING_HOST_DIR) \ --with-mpfr=$(STAGING_HOST_DIR) \ --with-libelf=$(STAGING_HOST_DIR) \ @@ -122,10 +122,10 @@ GCC_BUILD_DIR_FINAL:= $(WRKBUILD)-final $(GCC_BUILD_DIR_MINIMAL)/.configured: mkdir -p $(GCC_BUILD_DIR_MINIMAL) # these symlinks are very important, do not remove - rm -rf $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include - ln -sf ${STAGING_TARGET_DIR}/usr/include $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include - rm -rf ${STAGING_HOST_DIR}/$(REAL_GNU_TARGET_NAME)/lib - ln -sf ${STAGING_TARGET_DIR}/lib $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/lib + rm -rf $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/sys-include + ln -sf ${STAGING_TARGET_DIR}/usr/include $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/sys-include + rm -rf ${STAGING_HOST_DIR}/$(GNU_TARGET_NAME)/lib + ln -sf ${STAGING_TARGET_DIR}/lib $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/lib ifeq ($(ADK_LINUX_SH),y) (cd ${STAGING_TARGET_DIR}/ && ln -sf . m4 && ln -sf . m4-nofpu) endif @@ -182,29 +182,20 @@ $(WRKBUILD)/.compiled: $(GCC_BUILD_DIR_FINAL)/.configured $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled PATH='$(TARGET_PATH)' $(MAKE) -C $(GCC_BUILD_DIR_FINAL) install - # Set up the symlinks to enable lying about target name - set -e; \ - cd $(STAGING_HOST_DIR); \ - ln -sf $(REAL_GNU_TARGET_NAME) $(GNU_TARGET_NAME); \ - cd bin; \ - for app in $(REAL_GNU_TARGET_NAME)-* ; do \ - ln -sf $${app} \ - $(GNU_TARGET_NAME)$${app##$(REAL_GNU_TARGET_NAME)}; \ - done; # remove duplicate tools, convert hardlinks to symlinks set -e; \ cd $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/bin; \ for app in ar as c++ g++ gcc ld ld.bfd nm objcopy objdump ranlib strip; do \ - ln -sf ../../bin/$(REAL_GNU_TARGET_NAME)-$${app} $${app}; \ + ln -sf ../../bin/$(GNU_TARGET_NAME)-$${app} $${app}; \ done; (cd $(STAGING_HOST_DIR)/bin && \ - ln -sf $(REAL_GNU_TARGET_NAME)-gcc $(REAL_GNU_TARGET_NAME)-gcc-${PKG_VERSION}) + ln -sf $(GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-gcc-${PKG_VERSION}) # setup symlink, so that gcc/g++ find cc1plus - (cd $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/ && \ + (cd $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/ && \ ln -sf ../libexec .) # setup symlink, so that gcc/g++ find stddef.h - (cd $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/lib/ && \ - ln -sf ../../host_${CPU_ARCH}_${ADK_TARGET_SUFFIX}_${ADK_TARGET_LIBC}/lib/gcc .) + (cd $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/lib/ && \ + ln -sf ../../host_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_SUFFIX}/lib/gcc .) # fix linking g++ apps with libtool @-test -d $(STAGING_TARGET_DIR)/lib32 && \ cd $(STAGING_TARGET_DIR)/lib32 && \ diff --git a/toolchain/gdb/Makefile b/toolchain/gdb/Makefile index c56ed99f9..a66e3fe7d 100644 --- a/toolchain/gdb/Makefile +++ b/toolchain/gdb/Makefile @@ -18,7 +18,7 @@ $(WRKBUILD)/.configured: --prefix=$(STAGING_HOST_DIR) \ --build=$(GNU_HOST_NAME) \ --host=$(GNU_HOST_NAME) \ - --target=$(REAL_GNU_TARGET_NAME) \ + --target=$(GNU_TARGET_NAME) \ --disable-dependency-tracking \ --without-uiout \ --enable-gdbmi \ @@ -41,8 +41,6 @@ $(WRKBUILD)/.compiled: $(WRKBUILD)/.installed: install -c $(WRKBUILD)/gdb/gdb $(TARGET_CROSS)gdb - cd $(STAGING_HOST_DIR)/bin && \ - ln -fs $(TARGET_CROSS)gdb $(GNU_TARGET_NAME)-gdb touch $@ include ${TOPDIR}/mk/toolchain.mk diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc index e28405643..3c1a3167d 100644 --- a/toolchain/glibc/Makefile.inc +++ b/toolchain/glibc/Makefile.inc @@ -7,7 +7,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 5374d29864b583622b62bfc6b8429418 PKG_SITES:= ${MASTER_SITE_GNU:=glibc/} GLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \ - --host=$(REAL_GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ --with-headers=$(STAGING_TARGET_DIR)/usr/include \ --disable-sanity-checks \ --disable-nls \ @@ -23,10 +23,10 @@ GLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \ GLIBC_ENV:= PATH='${TARGET_PATH}' \ BUILD_CC=${CC_FOR_BUILD} \ CFLAGS="$(TARGET_CFLAGS_LIBC)" \ - CC=${REAL_GNU_TARGET_NAME}-gcc \ - CXX=${REAL_GNU_TARGET_NAME}-g++ \ - AR=${REAL_GNU_TARGET_NAME}-ar \ - RANLIB=${REAL_GNU_TARGET_NAME}-ranlib \ + CC=${GNU_TARGET_NAME}-gcc \ + CXX=${GNU_TARGET_NAME}-g++ \ + AR=${GNU_TARGET_NAME}-ar \ + RANLIB=${GNU_TARGET_NAME}-ranlib \ libc_cv_forced_unwind=yes \ libc_cv_cc_with_libunwind=yes \ libc_cv_c_cleanup=yes \ diff --git a/toolchain/musl/Makefile b/toolchain/musl/Makefile index b94c4e916..abb7af366 100644 --- a/toolchain/musl/Makefile +++ b/toolchain/musl/Makefile @@ -7,25 +7,25 @@ include Makefile.inc include ${TOPDIR}/mk/buildhlp.mk ifeq ($(CPU_ARCH),ppc) -REAL_GNU_TARGET_NAME:= $(subst ppc,powerpc,$(REAL_GNU_TARGET_NAME)) +GNU_TARGET_NAME:= $(subst ppc,powerpc,$(GNU_TARGET_NAME)) endif ifeq ($(CPU_ARCH),mips64el) -REAL_GNU_TARGET_NAME:= $(subst mips64el,mips,$(REAL_GNU_TARGET_NAME)) +GNU_TARGET_NAME:= $(subst mips64el,mips,$(GNU_TARGET_NAME)) endif ifeq ($(CPU_ARCH),mips64) -REAL_GNU_TARGET_NAME:= $(subst mips64,mips,$(REAL_GNU_TARGET_NAME)) +GNU_TARGET_NAME:= $(subst mips64,mips,$(GNU_TARGET_NAME)) endif ifeq ($(CPU_ARCH),microblazeel) -REAL_GNU_TARGET_NAME:= $(subst microblazeel,microblaze,$(REAL_GNU_TARGET_NAME)) +GNU_TARGET_NAME:= $(subst microblazeel,microblaze,$(GNU_TARGET_NAME)) endif ifeq ($(CPU_ARCH),sh4) -REAL_GNU_TARGET_NAME:= $(subst sh4,sh,$(REAL_GNU_TARGET_NAME)) +GNU_TARGET_NAME:= $(subst sh4,sh,$(GNU_TARGET_NAME)) endif $(WRKBUILD)/.headers: (cd $(WRKBUILD); CC='$(TARGET_CC)' CROSS_COMPILE='$(TARGET_CROSS)' \ ./configure --prefix=/usr \ - --target=$(REAL_GNU_TARGET_NAME) \ + --target=$(GNU_TARGET_NAME) \ --disable-gcc-wrapper \ ) $(MAKE) -C $(WRKBUILD) DESTDIR=$(STAGING_TARGET_DIR) install-headers @@ -37,7 +37,7 @@ $(WRKBUILD)/.compiled: $(MAKE) CFLAGS='$(TARGET_CFLAGS)' -C $(WRKBUILD) clean (cd $(WRKBUILD); CC='$(TARGET_CC)' CROSS_COMPILE='$(TARGET_CROSS)' \ ./configure --prefix=/usr \ - --target=$(REAL_GNU_TARGET_NAME) \ + --target=$(GNU_TARGET_NAME) \ --disable-gcc-wrapper \ ) $(MAKE) CFLAGS='$(TARGET_CFLAGS)' -C $(WRKBUILD) all @@ -52,7 +52,7 @@ $(WRKBUILD)/.fixup: $(MAKE) CFLAGS='$(TARGET_CFLAGS)' -C $(WRKBUILD) clean (cd $(WRKBUILD); CC='$(TARGET_CC)' CROSS_COMPILE='$(TARGET_CROSS)' \ ./configure --prefix=/usr \ - --target=$(REAL_GNU_TARGET_NAME) \ + --target=$(GNU_TARGET_NAME) \ --disable-gcc-wrapper \ ) $(MAKE) CFLAGS='$(TARGET_CFLAGS)' -C $(WRKBUILD) all -- cgit v1.2.3 From beb47ef07ddcd99d751088c588bc8135f6aae7ce Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 3 Mar 2014 07:41:20 +0100 Subject: only strip toolchain and target dirs for ADK_TOOLCHAIN --- mk/build.mk | 4 ++-- scripts/rstrip.sh | 9 +++------ target/packages/pkg-available/test | 1 + toolchain/glibc/Makefile | 7 +++++-- toolchain/musl/Makefile | 7 +++++-- toolchain/uClibc/Makefile | 7 +++++-- 6 files changed, 21 insertions(+), 14 deletions(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index 37f27b12b..8c1e73743 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -561,8 +561,8 @@ test-framework: for libc in uclibc glibc musl;do \ mkdir -p $(TOPDIR)/firmware/$(SYSTEM)_$(ARCH)_$$libc; \ ( \ - for arch in arm mips mipsel x86 x86_64;do \ - tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#"); \ + for arch in arm mips mipsel i686 x86_64;do \ + tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#i686#x86#"); \ echo === building qemu-$$arch for $$libc with $$tarch on $$(date); \ $(GMAKE) prereq && \ $(GMAKE) ARCH=$$tarch SYSTEM=qemu-$$arch LIBC=$$libc FS=archive COLLECTION=test defconfig; \ diff --git a/scripts/rstrip.sh b/scripts/rstrip.sh index bacf25ca7..46a4586da 100644 --- a/scripts/rstrip.sh +++ b/scripts/rstrip.sh @@ -5,10 +5,6 @@ SELF=${0##*/} -if [[ -z $debug ]];then - debug=1 -fi - if [[ -z $prefix ]]; then echo >&2 "$SELF: strip command not defined ('prefix' variable not set)" exit 1 @@ -64,12 +60,13 @@ find $TARGETS -type f -a -exec file {} \; | \ echo "$SELF: $V:$S" echo "-> $T $F" eval "chmod u+w $F" - if [[ $debug -eq 1 ]];then + if [[ $debug -ne 0 ]];then + echo "mkdir for $D" >> /tmp/debug eval "mkdir -p $D/usr/lib/debug/$Q" eval "$O --only-keep-debug $F $D/usr/lib/debug/$P.debug" fi eval "$T $F" - if [[ $debug -eq 1 ]];then + if [[ $debug -ne 0 ]];then eval "cd $D/usr/lib/debug/$Q && $O --add-gnu-debuglink=$R.debug $F" fi done diff --git a/target/packages/pkg-available/test b/target/packages/pkg-available/test index 8af24a816..d7bbcf26a 100644 --- a/target/packages/pkg-available/test +++ b/target/packages/pkg-available/test @@ -3,6 +3,7 @@ config ADK_PKG_TEST default n select ADK_PACKAGE_STRACE select ADK_PACKAGE_SOCAT + select ADK_PACKAGE_MAKE help Package collection used to build adk-test-framework root filesystem. diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index 00bd67cbc..41987bada 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -73,8 +73,11 @@ $(WRKBUILD)/.fixup: -find $(STAGING_TARGET_DIR) -type f -name \*_pic\* -delete rm -rf $(STAGING_TARGET_DIR)/usr/share/locale $(STAGING_TARGET_DIR)/usr/share/i18n rm -rf $(STAGING_TARGET_DIR)/usr/lib/gconv - PATH="$(TARGET_PATH)" debug='' prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_TARGET_DIR) - debug='' prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_HOST_DIR)/bin $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/ +ifeq ($(ADK_TOOLCHAIN),y) + # strip target libs and host tools for toolchain builds + PATH="$(TARGET_PATH)" debug='0' prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_TARGET_DIR) + debug='0' prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_HOST_DIR)/bin $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/ +endif touch $@ include ${TOPDIR}/mk/toolchain.mk diff --git a/toolchain/musl/Makefile b/toolchain/musl/Makefile index abb7af366..d675dc4cc 100644 --- a/toolchain/musl/Makefile +++ b/toolchain/musl/Makefile @@ -59,8 +59,11 @@ $(WRKBUILD)/.fixup: $(MAKE) -C $(WRKBUILD) DESTDIR=$(STAGING_TARGET_DIR) install # cleanup toolchain -find $(STAGING_TARGET_DIR) $(STAGING_HOST_DIR) -name \*.la -delete - PATH="$(TARGET_PATH)" debug='' prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_TARGET_DIR) - debug='' prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_HOST_DIR) +ifeq ($(ADK_TOOLCHAIN),y) + # strip target libs and host tools for toolchain builds + PATH="$(TARGET_PATH)" debug='0' prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_TARGET_DIR) + debug='0' prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_HOST_DIR) +endif touch $@ include ${TOPDIR}/mk/toolchain.mk diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index 7e53b5d21..4ee9af510 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -120,8 +120,11 @@ endif ln -s libc.so.0 $(STAGING_TARGET_DIR)/lib/libc.so # cleanup toolchain -find $(STAGING_TARGET_DIR) $(STAGING_HOST_DIR) -name \*.la -delete - PATH="$(TARGET_PATH)" debug='' prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_TARGET_DIR) - debug='' prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_HOST_DIR) +ifeq ($(ADK_TOOLCHAIN),y) + # strip target libs and host tools for toolchain builds + PATH="$(TARGET_PATH)" debug='0' prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_TARGET_DIR) + debug='0' prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_HOST_DIR) +endif touch $@ include ${TOPDIR}/mk/toolchain.mk -- cgit v1.2.3 From b8baf73967b23844f8a15a9a58f0fb623a95d4f1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 3 Mar 2014 08:37:34 +0100 Subject: do not put the intermediate file into firmware dir --- mk/image.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'mk') diff --git a/mk/image.mk b/mk/image.mk index 3f199c9cc..ec61ff374 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -145,7 +145,7 @@ ${FW_DIR}/${ROOTFSUSERTARBALL}: ${TARGET_DIR} sed "s#\(.*\)#:0:0::::::\1#" | sort | \ ${STAGING_HOST_DIR}/usr/bin/cpio -o -Hustar -P | gzip -n9 >$@ -${FW_DIR}/${INITRAMFS}_list: ${TARGET_DIR} +${STAGING_TARGET_DIR}/${INITRAMFS}_list: ${TARGET_DIR} $(BASH) ${LINUX_DIR}/scripts/gen_initramfs_list.sh -u squash -g squash \ ${TARGET_DIR}/ >$@ ( \ @@ -159,8 +159,8 @@ ${FW_DIR}/${INITRAMFS}_list: ${TARGET_DIR} echo "nod /dev/ram 0655 0 0 b 1 1"; \ ) >>$@ -${FW_DIR}/${INITRAMFS}: ${FW_DIR}/${INITRAMFS}_list - ${LINUX_DIR}/usr/gen_init_cpio ${FW_DIR}/${INITRAMFS}_list | \ +${FW_DIR}/${INITRAMFS}: ${STAGING_TARGET_DIR}/${INITRAMFS}_list + ${LINUX_DIR}/usr/gen_init_cpio ${STAGING_TARGET_DIR}/${INITRAMFS}_list | \ ${ADK_COMPRESSION_TOOL} -c >$@ ${BUILD_DIR}/root.squashfs: ${TARGET_DIR} @@ -172,13 +172,13 @@ ${FW_DIR}/${ROOTFSJFFS2}: ${TARGET_DIR} ${STAGING_HOST_DIR}/usr/bin/mkfs.jffs2 $(ADK_JFFS2_OPTS) -q -r ${TARGET_DIR} \ --pad=$(ADK_TARGET_MTD_SIZE) -o ${FW_DIR}/${ROOTFSJFFS2} $(MAKE_TRACE) -createinitramfs: ${FW_DIR}/${INITRAMFS}_list +createinitramfs: ${STAGING_TARGET_DIR}/${INITRAMFS}_list ${SED} 's/.*CONFIG_(BLK_DEV_INITRD|INITRAMFS_SOURCE|INITRAMFS_COMPRESSION).*//' \ ${LINUX_DIR}/.config ( \ echo "CONFIG_BLK_DEV_INITRD=y"; \ echo "CONFIG_ACPI_INITRD_TABLE_OVERRIDE=n"; \ - echo 'CONFIG_INITRAMFS_SOURCE="${FW_DIR}/${INITRAMFS}_list"'; \ + echo 'CONFIG_INITRAMFS_SOURCE="${STAGING_TARGET_DIR}/${INITRAMFS}_list"'; \ echo '# CONFIG_INITRAMFS_COMPRESSION_NONE is not set'; \ echo 'CONFIG_INITRAMFS_ROOT_UID=0'; \ echo 'CONFIG_INITRAMFS_ROOT_GID=0'; \ -- cgit v1.2.3 From 7d2b38ba6e51a5da5250ef394b9fe69a72783459 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 4 Mar 2014 17:47:21 +0100 Subject: fix qemu-ppc64 building on Darwin, use --with-cpu=ultrasparc for qemu-sparc64, still another issue exist. --- Makefile | 2 +- mk/build.mk | 2 +- target/config/Config.in | 2 +- .../patches/3.13.5/ppc64-missing_arch_random.patch | 11 ++++++++ toolchain/gcc/Makefile | 4 +++ toolchain/glibc/patches/glibc-cross.patch | 33 +++++++++++----------- toolchain/glibc/patches/sparc64.patch | 21 -------------- 7 files changed, 34 insertions(+), 41 deletions(-) create mode 100644 target/linux/patches/3.13.5/ppc64-missing_arch_random.patch delete mode 100644 toolchain/glibc/patches/sparc64.patch (limited to 'mk') diff --git a/Makefile b/Makefile index b703f6656..9d3d982d7 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # material, please see the LICENCE file in the top-level directory. _UNLIMIT= __limit=$$(ulimit -dH 2>/dev/null); \ - test -n "$$__limit" && ulimit -Sd $$__limit; + test -n "$$__limit" && ulimit -Sd $$__limit; ulimit -n 1024; all: checkreloc .prereq_done @${_UNLIMIT} ${GMAKE_INV} all diff --git a/mk/build.mk b/mk/build.mk index 8c1e73743..ce0f88ae0 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -561,7 +561,7 @@ test-framework: for libc in uclibc glibc musl;do \ mkdir -p $(TOPDIR)/firmware/$(SYSTEM)_$(ARCH)_$$libc; \ ( \ - for arch in arm mips mipsel i686 x86_64;do \ + for arch in arm mips mipsel mips64 mips64el ppc ppc64 sparc sparc64 i686 x86_64;do \ tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#i686#x86#"); \ echo === building qemu-$$arch for $$libc with $$tarch on $$(date); \ $(GMAKE) prereq && \ diff --git a/target/config/Config.in b/target/config/Config.in index c8e566cc8..ab6bf353b 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -579,7 +579,7 @@ config ADK_TARGET_CFLAGS default "-march=atom" if ADK_CPU_ATOM default "-march=amdfam10" if ADK_CPU_AMDFAM10 default "-mcpu=v8" if ADK_CPU_SPARC_V8 - default "-m64 -mcpu=v9" if ADK_CPU_SPARC_V9 + default "-m64 -mcpu=ultrasparc" if ADK_CPU_SPARC_V9 default "-march=loongson2f -Wa,-mfix-loongson2f-nop" if ADK_CPU_LOONGSON2F default "-march=mips32" if ADK_CPU_MIPS32 default "-march=mips64" if ADK_CPU_MIPS64 diff --git a/target/linux/patches/3.13.5/ppc64-missing_arch_random.patch b/target/linux/patches/3.13.5/ppc64-missing_arch_random.patch new file mode 100644 index 000000000..b341a7be5 --- /dev/null +++ b/target/linux/patches/3.13.5/ppc64-missing_arch_random.patch @@ -0,0 +1,11 @@ +diff -Nur linux-3.13.5.orig/arch/powerpc/platforms/pseries/Kconfig linux-3.13.5/arch/powerpc/platforms/pseries/Kconfig +--- linux-3.13.5.orig/arch/powerpc/platforms/pseries/Kconfig 2014-02-22 22:35:30.000000000 +0100 ++++ linux-3.13.5/arch/powerpc/platforms/pseries/Kconfig 2014-03-04 13:55:06.000000000 +0100 +@@ -20,6 +20,7 @@ + select PPC_DOORBELL + select HAVE_CONTEXT_TRACKING + select HOTPLUG_CPU if SMP ++ select ARCH_RANDOM + default y + + config PPC_SPLPAR diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index bbbd3d09c..138e3a0d0 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -100,6 +100,10 @@ ifeq ($(ADK_CPU_CORTEX_A9),y) GCC_CONFOPTS+= --with-arch=armv7-a --with-tune=cortex-a9 --with-fpu=neon endif +ifeq ($(ADK_CPU_SPARC_V9),y) +GCC_CONFOPTS+= --with-cpu=ultrasparc +endif + ifneq ($(ADK_TARGET_MIPS_ABI),) GCC_CONFOPTS+= --with-abi=${ADK_TARGET_MIPS_ABI} endif diff --git a/toolchain/glibc/patches/glibc-cross.patch b/toolchain/glibc/patches/glibc-cross.patch index 4084fd20d..a1903179d 100644 --- a/toolchain/glibc/patches/glibc-cross.patch +++ b/toolchain/glibc/patches/glibc-cross.patch @@ -1,8 +1,8 @@ -diff -Nur glibc-2.18.orig/sunrpc/rpc/types.h glibc-2.18/sunrpc/rpc/types.h ---- glibc-2.18.orig/sunrpc/rpc/types.h 2013-08-11 00:52:55.000000000 +0200 -+++ glibc-2.18/sunrpc/rpc/types.h 2013-09-13 08:25:18.000000000 +0200 -@@ -69,19 +69,25 @@ - #include +diff -Nur glibc-2.19.orig/sunrpc/rpc/types.h glibc-2.19/sunrpc/rpc/types.h +--- glibc-2.19.orig/sunrpc/rpc/types.h 2014-02-07 10:04:38.000000000 +0100 ++++ glibc-2.19/sunrpc/rpc/types.h 2014-03-03 13:42:42.000000000 +0100 +@@ -74,19 +74,24 @@ + # define __daddr_t_defined #endif -#ifndef __u_char_defined @@ -18,15 +18,14 @@ diff -Nur glibc-2.18.orig/sunrpc/rpc/types.h glibc-2.18/sunrpc/rpc/types.h +typedef unsigned short u_short; +typedef unsigned int u_int; +typedef unsigned long u_long; -+#if __WORDSIZE == 64 ++#if __WORDSIZE == 64 ++#ifndef __APPLE__ +typedef long int quad_t; +typedef unsigned long int u_quad_t; ++#endif +#elif defined __GLIBC_HAVE_LONG_LONG +typedef long long int quad_t; +typedef unsigned long long int u_quad_t; -+#endif -+#if defined(_CROSS_RPCGEN_) -+typedef u_quad_t fsid_t; #endif -#ifndef __daddr_t_defined -typedef __daddr_t daddr_t; @@ -39,14 +38,14 @@ diff -Nur glibc-2.18.orig/sunrpc/rpc/types.h glibc-2.18/sunrpc/rpc/types.h # define __daddr_t_defined #endif -diff -Nur glibc-2.18.orig/sunrpc/rpc_main.c glibc-2.18/sunrpc/rpc_main.c ---- glibc-2.18.orig/sunrpc/rpc_main.c 2013-08-11 00:52:55.000000000 +0200 -+++ glibc-2.18/sunrpc/rpc_main.c 2013-09-13 08:26:07.000000000 +0200 +diff -Nur glibc-2.19.orig/sunrpc/rpc_main.c glibc-2.19/sunrpc/rpc_main.c +--- glibc-2.19.orig/sunrpc/rpc_main.c 2014-02-07 10:04:38.000000000 +0100 ++++ glibc-2.19/sunrpc/rpc_main.c 2014-03-04 07:12:00.000000000 +0100 @@ -38,7 +38,11 @@ #include #include #include -+#ifdef _CROSS_RPCGEN_ ++#ifdef __APPLE__ +#define gettext(X) (X) +#else #include @@ -70,14 +69,14 @@ diff -Nur glibc-2.18.orig/sunrpc/rpc_main.c glibc-2.18/sunrpc/rpc_main.c } else -diff -Nur glibc-2.18.orig/sunrpc/rpc_scan.c glibc-2.18/sunrpc/rpc_scan.c ---- glibc-2.18.orig/sunrpc/rpc_scan.c 2013-08-11 00:52:55.000000000 +0200 -+++ glibc-2.18/sunrpc/rpc_scan.c 2013-09-13 08:25:18.000000000 +0200 +diff -Nur glibc-2.19.orig/sunrpc/rpc_scan.c glibc-2.19/sunrpc/rpc_scan.c +--- glibc-2.19.orig/sunrpc/rpc_scan.c 2014-02-07 10:04:38.000000000 +0100 ++++ glibc-2.19/sunrpc/rpc_scan.c 2014-03-04 07:11:29.000000000 +0100 @@ -37,7 +37,11 @@ #include #include #include -+#ifdef _CROSS_RPCGEN_ ++#ifdef __APPLE__ +#define gettext(X) (X) +#else #include diff --git a/toolchain/glibc/patches/sparc64.patch b/toolchain/glibc/patches/sparc64.patch deleted file mode 100644 index c8ff7ce9f..000000000 --- a/toolchain/glibc/patches/sparc64.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nur glibc-2.12.1.orig/sysdeps/sparc/sparc64/Makefile glibc-2.12.1/sysdeps/sparc/sparc64/Makefile ---- glibc-2.12.1.orig/sysdeps/sparc/sparc64/Makefile 2010-07-27 13:34:39.000000000 +0200 -+++ glibc-2.12.1/sysdeps/sparc/sparc64/Makefile 2011-01-01 23:58:16.370676501 +0100 -@@ -1,3 +1,5 @@ -+sysdep-CFLAGS += -mcpu=v9 -Wa,-Av9a -+ - ifeq ($(subdir),csu) - sysdep_routines += hp-timing - elide-routines.os += hp-timing -@@ -10,3 +12,11 @@ - ifeq ($(subdir),string) - sysdep_routines += align-cpy - endif -+ -+ASFLAGS-.o += -Wa,-Av9a -+ASFLAGS-.os += -Wa,-Av9a -+ASFLAGS-.op += -Wa,-Av9a -+ASFLAGS-.og += -Wa,-Av9a -+ASFLAGS-.ob += -Wa,-Av9a -+ASFLAGS-.oS += -Wa,-Av9a -+ -- cgit v1.2.3 From 8742eed1875b53d62216f03f132cea48fa61dec5 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 4 Mar 2014 18:16:33 +0100 Subject: remove visible parts of guiconfig, I don't like it, don't wanna support it --- Makefile | 4 ---- mk/build.mk | 10 ---------- 2 files changed, 14 deletions(-) (limited to 'mk') diff --git a/Makefile b/Makefile index 9d3d982d7..bf2b3be01 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,6 @@ help: @echo ' config - Update current config utilising a line-oriented program' @echo ' menuconfig - Update current config utilising a menu based program' @echo ' (default when .config does not exist)' - @echo ' guiconfig - Update current config utilising a gui based program' @echo ' oldconfig - Update current config utilising a provided .configs base' @echo ' allmodconfig - New config selecting all packages as modules when possible' @echo ' allconfig - New config selecting all packages when possible' @@ -129,9 +128,6 @@ image_clean imageclean cleanimage: .prereq_done menuconfig: .prereq_done @${GMAKE_INV} menuconfig -guiconfig: .prereq_done - @${GMAKE_INV} guiconfig - defconfig: .prereq_done @${GMAKE_INV} defconfig diff --git a/mk/build.mk b/mk/build.mk index ce0f88ae0..8efd7becc 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -80,7 +80,6 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_KERNEL_DEBUG_WITH_KGDB=n noconfig_targets:= menuconfig \ - guiconfig \ _config \ _mconfig \ distclean \ @@ -506,15 +505,6 @@ menuconfig: $(CONFIG)/mconf defconfig .menu package/Config.in.auto @$(CONFIG)/mconf $(CONFIG_CONFIG_IN) ${POSTCONFIG} -guiconfig: $(CONFIG)/gconf defconfig .menu package/Config.in.auto - @${BASH} ${TOPDIR}/scripts/update-sys - @${BASH} ${TOPDIR}/scripts/update-pkg - @if [ ! -f .config ];then \ - $(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \ - fi - @$(CONFIG)/gconf $(CONFIG_CONFIG_IN) - ${POSTCONFIG} - _config: $(CONFIG)/conf .menu package/Config.in.auto -@touch .config @$(CONFIG)/conf ${W} $(CONFIG_CONFIG_IN) -- cgit v1.2.3