From 98a7a4c9d237cc6117ef01f3c98d3997dd48436e Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Tue, 28 Aug 2007 21:42:44 +0000 Subject: - misc cleanups (Cristian Ionescu-Idbohrn) --- Config.in | 14 ++++++------ package/dbus/dbus.mk | 2 +- package/jpeg/jpeg.mk | 4 ++-- package/modutils/modutils.mk | 10 ++++----- package/openntpd/openntpd.mk | 1 - package/tar/tar.mk | 15 +++++++------ target/iso9660/iso9660.mk | 6 +++--- toolchain/binutils/binutils.mk | 15 +++++++------ toolchain/ccache/ccache.mk | 48 +++++++++++++++++++++++++++-------------- toolchain/gcc/gcc-uclibc-3.x.mk | 28 ++++++++++++++---------- toolchain/gcc/gcc-uclibc-4.x.mk | 34 ++++++++++++++++------------- toolchain/uClibc/uclibc.mk | 36 +++++++++++++++++++------------ 12 files changed, 125 insertions(+), 88 deletions(-) diff --git a/Config.in b/Config.in index 92de8e0bf..5fe425934 100644 --- a/Config.in +++ b/Config.in @@ -108,7 +108,7 @@ config BR2_ARM_TYPE default ARM922T if BR2_arm922t default ARM926T if BR2_arm926t default ARM10T if BR2_arm10t - default ARM1136JF_S if BR2_arm1136jf_s + default ARM1136JF_S if BR2_arm1136jf_s default ARM1176JZ_S if BR2_arm1176jz_s default ARM1176JZF_S if BR2_arm1176jzf_s default ARM_SA110 if BR2_sa110 @@ -396,11 +396,11 @@ config BR2_ARCH config BR2_ENDIAN string default "LITTLE" if BR2_arm || BR2_cris || BR2_i386 || BR2_mipsel || \ - BR2_sh3 || BR2_sh4 || BR2_x86_64 || BR2_nios2 || \ + BR2_sh3 || BR2_sh4 || BR2_x86_64 || BR2_nios2 || \ BR2_sh64 default "BIG" if BR2_alpha || BR2_armeb || BR2_avr32 || BR2_m68k || BR2_mips || \ - BR2_powerpc || BR2_sh2a_nofpueb || BR2_sh2eb || \ - BR2_sh3eb || BR2_sh4eb || BR2_sparc + BR2_powerpc || BR2_sh2a_nofpueb || BR2_sh2eb || \ + BR2_sh3eb || BR2_sh4eb || BR2_sparc config BR2_GCC_TARGET_TUNE string @@ -635,7 +635,7 @@ config BR2_DL_DIR environment variable, then this overrides this configuration item. source "target/device/Mirrors.in" - + config BR2_STAGING_DIR string "Toolchain and header file location?" default "$(BUILD_DIR)/staging_dir" @@ -665,7 +665,7 @@ config BR2_TOPDIR_SUFFIX Add a custom string to the end of the build directories. build_ARCH -> build_ARCH_[SUFFIX] - toolchain_build_ARCH -> toolchain_build_ARCH_[SUFFIX] + toolchain_build_ARCH -> toolchain_build_ARCH_[SUFFIX] config BR2_GNU_BUILD_SUFFIX string "GNU build hostname suffix" @@ -785,5 +785,3 @@ source "toolchain/Config.in" source "package/Config.in" source "target/Config.in" - - diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index 8ecb39aa7..12dee320f 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -57,7 +57,7 @@ $(STAGING_DIR)/usr/lib/libdbus-1.so: $(DBUS_DIR)/$(DBUS_BINARY) $(MAKE) DESTDIR=$(STAGING_DIR) -C $(DBUS_DIR)/dbus install $(TARGET_DIR)/$(DBUS_TARGET_BINARY): $(STAGING_DIR)/usr/lib/libdbus-1.so - -mkdir $(TARGET_DIR)/var/run/dbus $(TARGET_DIR)/etc/init.d + mkdir -p $(TARGET_DIR)/var/run/dbus $(TARGET_DIR)/etc/init.d $(MAKE) DESTDIR=$(TARGET_DIR) -C $(DBUS_DIR)/dbus install rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0 rm -f $(TARGET_DIR)/usr/lib/libdbus-1.la \ diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk index eec158773..fe2634a2e 100644 --- a/package/jpeg/jpeg.mk +++ b/package/jpeg/jpeg.mk @@ -55,8 +55,8 @@ $(JPEG_DIR)/.configured: $(JPEG_DIR)/.unpacked --datadir=/usr/share \ --localstatedir=/var \ --includedir=/usr/include \ - --mandir=/usr/man \ - --infodir=/usr/info \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ --enable-shared \ --enable-static \ --without-x \ diff --git a/package/modutils/modutils.mk b/package/modutils/modutils.mk index 6253c50d8..8ad210356 100644 --- a/package/modutils/modutils.mk +++ b/package/modutils/modutils.mk @@ -40,7 +40,7 @@ $(MODUTILS_DIR1)/.configured: $(MODUTILS_DIR1)/.source --prefix=/ \ --sysconfdir=/etc \ ) - touch $(MODUTILS_DIR1)/.configured + touch $@ $(MODUTILS_DIR1)/.build: $(MODUTILS_DIR1)/.configured $(MAKE1) CC=$(TARGET_CC) -C $(MODUTILS_DIR1) @@ -98,7 +98,7 @@ $(MODUTILS_DIR2)/.source: $(DL_DIR)/$(MODUTILS_SOURCE) $(MODUTILS_CAT) $(DL_DIR)/$(MODUTILS_SOURCE) | tar -C $(TOOL_BUILD_DIR) -xvf - toolchain/patch-kernel.sh $(MODUTILS_DIR2) \ package/modutils \*.patch - touch $(MODUTILS_DIR2)/.source + touch $@ $(MODUTILS_DIR2)/.configured: $(MODUTILS_DIR2)/.source (cd $(MODUTILS_DIR2); \ @@ -109,16 +109,16 @@ $(MODUTILS_DIR2)/.configured: $(MODUTILS_DIR2)/.source --prefix=/ \ --sysconfdir=/etc \ ) - touch $(MODUTILS_DIR2)/.configured + touch $@ $(MODUTILS_DIR2)/$(MODUTILS_BINARY): $(MODUTILS_DIR2)/.configured $(MAKE1) -C $(MODUTILS_DIR2) - touch -c $(MODUTILS_DIR2)/$(MODUTILS_BINARY) + touch -c $@ $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod: $(MODUTILS_DIR2)/$(MODUTILS_BINARY) mkdir -p $(STAGING_DIR)/bin cp $(MODUTILS_DIR2)/$(MODUTILS_BINARY) $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod - touch -c $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod + touch -c $@ cross-depmod: uclibc $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod diff --git a/package/openntpd/openntpd.mk b/package/openntpd/openntpd.mk index 310d1cdb1..974582865 100644 --- a/package/openntpd/openntpd.mk +++ b/package/openntpd/openntpd.mk @@ -78,4 +78,3 @@ ntpd-dirclean: ifeq ($(strip $(BR2_PACKAGE_OPENNTPD)),y) TARGETS+=ntpd endif - diff --git a/package/tar/tar.mk b/package/tar/tar.mk index d76f6b2ef..bcebd0375 100644 --- a/package/tar/tar.mk +++ b/package/tar/tar.mk @@ -19,7 +19,7 @@ tar-source: $(DL_DIR)/$(GNUTAR_SOURCE) $(GNUTAR_DIR)/.unpacked: $(DL_DIR)/$(GNUTAR_SOURCE) $(GNUTAR_CAT) $(DL_DIR)/$(GNUTAR_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(GNUTAR_DIR) package/tar/ tar\*.patch - touch $(GNUTAR_DIR)/.unpacked + touch $@ $(GNUTAR_DIR)/.configured: $(GNUTAR_DIR)/.unpacked (cd $(GNUTAR_DIR); rm -rf config.cache; \ @@ -45,7 +45,7 @@ $(GNUTAR_DIR)/.configured: $(GNUTAR_DIR)/.unpacked $(DISABLE_NLS) \ $(DISABLE_LARGEFILE) \ ) - touch $(GNUTAR_DIR)/.configured + touch $@ $(GNUTAR_DIR)/$(GNUTAR_BINARY): $(GNUTAR_DIR)/.configured $(MAKE) -C $(GNUTAR_DIR) @@ -53,12 +53,15 @@ $(GNUTAR_DIR)/$(GNUTAR_BINARY): $(GNUTAR_DIR)/.configured # This stuff is needed to work around GNU make deficiencies tar-target_binary: $(GNUTAR_DIR)/$(GNUTAR_BINARY) @if [ -L $(TARGET_DIR)/$(GNUTAR_TARGET_BINARY) ]; then \ - rm -f $(TARGET_DIR)/$(GNUTAR_TARGET_BINARY); fi + rm -f $(TARGET_DIR)/$(GNUTAR_TARGET_BINARY); \ + fi @if [ ! -f $(GNUTAR_DIR)/$(GNUTAR_BINARY) -o $(TARGET_DIR)/$(GNUTAR_TARGET_BINARY) \ -ot $(GNUTAR_DIR)/$(GNUTAR_BINARY) ]; then \ - set -x; \ - rm -f $(TARGET_DIR)/$(GNUTAR_TARGET_BINARY); \ - cp -a $(GNUTAR_DIR)/$(GNUTAR_BINARY) $(TARGET_DIR)/$(GNUTAR_TARGET_BINARY); fi + set -x; \ + rm -f $(TARGET_DIR)/$(GNUTAR_TARGET_BINARY); \ + cp -a $(GNUTAR_DIR)/$(GNUTAR_BINARY) \ + $(TARGET_DIR)/$(GNUTAR_TARGET_BINARY); \ + fi tar: uclibc tar-target_binary diff --git a/target/iso9660/iso9660.mk b/target/iso9660/iso9660.mk index 9cdf486fa..74b33b812 100644 --- a/target/iso9660/iso9660.mk +++ b/target/iso9660/iso9660.mk @@ -17,12 +17,12 @@ mkisofs-source: $(DL_DIR)/$(MKISOFS_SOURCE) $(MKISOFS_DIR)/.unpacked: $(DL_DIR)/$(MKISOFS_SOURCE) $(MKISOFS_CAT) $(DL_DIR)/$(MKISOFS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(MKISOFS_DIR) target/iso9660/ \*.patch - touch $(MKISOFS_DIR)/.unpacked + touch $@ $(MKISOFS_DIR)/.configured: $(MKISOFS_DIR)/.unpacked (cd $(MKISOFS_DIR); rm -rf config.cache; \ - ) - touch $(MKISOFS_DIR)/.configured + ); + touch $@ $(MKISOFS_TARGET): $(MKISOFS_DIR)/.configured $(MAKE) -C $(MKISOFS_DIR) diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk index f62b0c2ba..2910ff6c8 100644 --- a/toolchain/binutils/binutils.mk +++ b/toolchain/binutils/binutils.mk @@ -112,7 +112,8 @@ $(BINUTILS_DIR1)/.configured: $(BINUTILS_DIR)/.patched $(MULTILIB) \ --disable-werror \ $(SOFT_FLOAT_CONFIG_OPTION) \ - $(EXTRA_BINUTILS_CONFIG_OPTIONS)) + $(EXTRA_BINUTILS_CONFIG_OPTIONS) \ + ) touch $@ $(BINUTILS_DIR1)/binutils/objdump: $(BINUTILS_DIR1)/.configured @@ -122,7 +123,7 @@ $(BINUTILS_DIR1)/binutils/objdump: $(BINUTILS_DIR1)/.configured # Unfortunatey, it isn't configureable. $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-ld: $(BINUTILS_DIR1)/binutils/objdump $(MAKE) -C $(BINUTILS_DIR1) $(BR2_SYSROOT_STAGING_DESTDIR) install - # tooldir=/usr build_tooldir=/usr install + # tooldir=/usr build_tooldir=/usr install #rm -f $(STAGING_DIR)/usr/bin/{ar,as,ld,nm,objdump,ranlib,strip} binutils: uclibc-configured $(BINUTILS_HOST_PREREQ) $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-ld @@ -133,7 +134,7 @@ binutils-clean: rm -rf $(STAGING_DIR)/usr/bin/*{ar,as,ld,nm,objdump,ranlib,strip} \ $(STAGING_DIR)/usr/lib/{libiberty*,ldscripts} -$(MAKE) -C $(BINUTILS_DIR1) DESTDIR=$(STAGING_DIR) \ - tooldir=/usr build_tooldir=/usr uninstall + tooldir=/usr build_tooldir=/usr uninstall -$(MAKE) -C $(BINUTILS_DIR1) clean binutils-dirclean: @@ -161,7 +162,8 @@ $(BINUTILS_DIR2)/.configured: $(BINUTILS_DIR)/.patched $(MULTILIB) \ $(BINUTILS_TARGET_CONFIG_OPTIONS) \ --disable-werror \ - $(SOFT_FLOAT_CONFIG_OPTION) ) + $(SOFT_FLOAT_CONFIG_OPTION) \ + ) touch $@ $(BINUTILS_DIR2)/binutils/objdump: $(BINUTILS_DIR2)/.configured @@ -173,7 +175,7 @@ $(TARGET_DIR)/usr/bin/ld: $(BINUTILS_DIR2)/binutils/objdump tooldir=/usr build_tooldir=/usr \ -C $(BINUTILS_DIR2) install #rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ - # $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc + # $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc -$(STRIP) $(TARGET_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin/* > /dev/null 2>&1 -$(STRIP) $(TARGET_DIR)/usr/bin/* > /dev/null 2>&1 @@ -182,7 +184,8 @@ binutils_target: $(BINUTILS_TARGET_PREREQ) $(TARGET_DIR)/usr/bin/ld binutils_target-clean: (cd $(TARGET_DIR)/usr/bin; \ rm -f addr2line ar as gprof ld nm objcopy \ - objdump ranlib readelf size strings strip) + objdump ranlib readelf size strings strip; \ + ) rm -f $(TARGET_DIR)/bin/$(REAL_GNU_TARGET_NAME)* -$(MAKE) -C $(BINUTILS_DIR2) clean diff --git a/toolchain/ccache/ccache.mk b/toolchain/ccache/ccache.mk index 93831138d..35585713d 100644 --- a/toolchain/ccache/ccache.mk +++ b/toolchain/ccache/ccache.mk @@ -54,27 +54,34 @@ $(STAGING_DIR)/$(CCACHE_TARGET_BINARY): $(CCACHE_DIR1)/$(CCACHE_BINARY) (cd $(STAGING_DIR)/usr/bin-ccache; \ ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-gcc; \ ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-cc; \ - ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(REAL_GNU_TARGET_NAME)-cc) + ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(REAL_GNU_TARGET_NAME)-cc; \ + ) [ -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc ] && \ - mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/usr/bin-ccache/ + mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc \ + $(STAGING_DIR)/usr/bin-ccache/ (cd $(STAGING_DIR)/usr/bin; \ ln -fs ccache $(GNU_TARGET_NAME)-cc; \ ln -fs ccache $(GNU_TARGET_NAME)-gcc; \ ln -fs ccache $(REAL_GNU_TARGET_NAME)-cc; \ - ln -fs ccache $(REAL_GNU_TARGET_NAME)-gcc) + ln -fs ccache $(REAL_GNU_TARGET_NAME)-gcc; \ + ) ifeq ($(BR2_INSTALL_LIBSTDCPP),y) [ -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++ ] && \ - mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/usr/bin-ccache/ + mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++ \ + $(STAGING_DIR)/usr/bin-ccache/ [ -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++ ] && \ - mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++ $(STAGING_DIR)/usr/bin-ccache/ + mv $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++ \ + $(STAGING_DIR)/usr/bin-ccache/ (cd $(STAGING_DIR)/usr/bin; \ ln -fs ccache $(GNU_TARGET_NAME)-c++; \ ln -fs ccache $(GNU_TARGET_NAME)-g++;\ ln -fs ccache $(REAL_GNU_TARGET_NAME)-c++; \ - ln -fs ccache $(REAL_GNU_TARGET_NAME)-g++) + ln -fs ccache $(REAL_GNU_TARGET_NAME)-g++; \ + ) (cd $(STAGING_DIR)/usr/bin-ccache; \ ln -fs $(REAL_GNU_TARGET_NAME)-c++ $(GNU_TARGET_NAME)-c++; \ - ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-g++) + ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-g++; \ + ) endif ccache: gcc $(STAGING_DIR)/$(CCACHE_TARGET_BINARY) @@ -85,25 +92,33 @@ ccache-clean: rm -rf $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc rm -rf $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc if [ -f $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-gcc ]; then \ - mv $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/usr/bin/; \ + mv $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-gcc \ + $(STAGING_DIR)/usr/bin/; \ (cd $(STAGING_DIR)/usr/bin; \ - ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(REAL_GNU_TARGET_NAME)-cc; \ - ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-cc; \ - ln -fs $(REAL_GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-gcc); \ + ln -fs $(REAL_GNU_TARGET_NAME)-gcc \ + $(REAL_GNU_TARGET_NAME)-cc; \ + ln -fs $(REAL_GNU_TARGET_NAME)-gcc \ + $(GNU_TARGET_NAME)-cc; \ + ln -fs $(REAL_GNU_TARGET_NAME)-gcc \ + $(GNU_TARGET_NAME)-gcc; \ + ); \ fi if [ -f $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-c++ ]; then \ rm -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++; \ - mv $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/usr/bin/; \ + mv $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-c++ \ + $(STAGING_DIR)/usr/bin/; \ fi if [ -f $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ ]; then \ rm -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++; \ - mv $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ $(STAGING_DIR)/usr/bin/; \ + mv $(STAGING_DIR)/usr/bin-ccache/$(REAL_GNU_TARGET_NAME)-g++ \ + $(STAGING_DIR)/usr/bin/; \ fi rm -rf $(STAGING_DIR)/usr/bin-ccache/* (cd $(STAGING_DIR)/usr/bin; \ ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-c++; \ - ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-g++;\ - ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(REAL_GNU_TARGET_NAME)-c++) + ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(GNU_TARGET_NAME)-g++; \ + ln -fs $(REAL_GNU_TARGET_NAME)-g++ $(REAL_GNU_TARGET_NAME)-c++; \ + ) -$(MAKE) -C $(CCACHE_DIR1) clean ccache-dirclean: @@ -160,7 +175,8 @@ $(TARGET_DIR)/$(CCACHE_TARGET_BINARY): $(CCACHE_DIR2)/$(CCACHE_BINARY) ln -fs /usr/bin/ccache cc; \ ln -fs /usr/bin/ccache gcc; \ ln -fs /usr/bin/ccache c++; \ - ln -fs /usr/bin/ccache g++;) + ln -fs /usr/bin/ccache g++; \ + ) ccache_target: uclibc $(TARGET_DIR)/$(CCACHE_TARGET_BINARY) diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk index 95ca6e80c..ea7c1e3af 100644 --- a/toolchain/gcc/gcc-uclibc-3.x.mk +++ b/toolchain/gcc/gcc-uclibc-3.x.mk @@ -188,7 +188,8 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched $(MULTILIB) \ $(SOFT_FLOAT_CONFIG_OPTION) \ $(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \ - $(EXTRA_GCC_CONFIG_OPTIONS)) + $(EXTRA_GCC_CONFIG_OPTIONS) \ + ) touch $@ $(GCC_BUILD_DIR1)/.compiled: $(GCC_BUILD_DIR1)/.configured @@ -250,7 +251,8 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(GCC_STAGING_PREREQ) $(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \ $(GCC_USE_SJLJ_EXCEPTIONS) \ $(DISABLE_LARGEFILE) \ - $(EXTRA_GCC_CONFIG_OPTIONS)) + $(EXTRA_GCC_CONFIG_OPTIONS) \ + ) touch $@ $(GCC_BUILD_DIR2)/.compiled: $(GCC_BUILD_DIR2)/.configured @@ -285,7 +287,7 @@ endif cd bin; \ for app in $(REAL_GNU_TARGET_NAME)-*; do \ ln -snf $${app} \ - $(GNU_TARGET_NAME)$${app##$(REAL_GNU_TARGET_NAME)}; \ + $(GNU_TARGET_NAME)$${app##$(REAL_GNU_TARGET_NAME)}; \ done; \ ) # @@ -309,14 +311,15 @@ endif # # Ok... that's enough of that. # - -mkdir -p $(TARGET_DIR)/usr/lib $(TARGET_DIR)/usr/sbin + mkdir -p $(TARGET_DIR)/usr/lib $(TARGET_DIR)/usr/sbin touch $@ $(GCC_BUILD_DIR2)/.libs_installed: $(GCC_BUILD_DIR2)/.installed ifeq ($(BR2_GCC_SHARED_LIBGCC),y) # These are in /lib, so... rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so* - cp -dpf $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib/libgcc_s* $(TARGET_DIR)/lib/ + cp -dpf $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib/libgcc_s* \ + $(TARGET_DIR)/lib/ -strip --strip-unneeded $(TARGET_DIR)/lib/libgcc_s* endif ifeq ($(BR2_INSTALL_LIBSTDCPP),y) @@ -328,8 +331,10 @@ ifeq ($(BR2_INSTALL_LIBGCJ),y) cp -dpf $(STAGING_DIR)/lib/lib-org-w3c-dom.so* $(TARGET_DIR)/usr/lib/ cp -dpf $(STAGING_DIR)/lib/lib-org-xml-sax.so* $(TARGET_DIR)/usr/lib/ mkdir -p $(TARGET_DIR)/usr/lib/security - cp -dpf $(STAGING_DIR)/usr/lib/security/libgcj.security $(TARGET_DIR)/usr/lib/security/ - cp -dpf $(STAGING_DIR)/usr/lib/security/classpath.security $(TARGET_DIR)/usr/lib/security/ + cp -dpf $(STAGING_DIR)/usr/lib/security/libgcj.security \ + $(TARGET_DIR)/usr/lib/security/ + cp -dpf $(STAGING_DIR)/usr/lib/security/classpath.security \ + $(TARGET_DIR)/usr/lib/security/ endif touch $@ @@ -342,8 +347,8 @@ gcc-source: $(DL_DIR)/$(GCC_SOURCE) gcc-clean: rm -rf $(GCC_BUILD_DIR2) for prog in cpp gcc gcc-[0-9]* protoize unprotoize gcov gccbug cc; do \ - rm -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-$$prog \ - rm -f $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-$$prog; \ + rm -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-$$prog; \ + rm -f $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-$$prog; \ done gcc-dirclean: gcc_initial-dirclean @@ -385,7 +390,8 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.prepared $(GCC_USE_SJLJ_EXCEPTIONS) \ $(DISABLE_LARGEFILE) \ $(EXTRA_GCC_CONFIG_OPTIONS) \ - $(EXTRA_TARGET_GCC_CONFIG_OPTIONS)) + $(EXTRA_TARGET_GCC_CONFIG_OPTIONS) \ + ) touch $@ $(GCC_BUILD_DIR3)/.compiled: $(GCC_BUILD_DIR3)/.configured @@ -444,7 +450,7 @@ endif # rm -f $(TARGET_DIR)/usr/lib/*.la* #rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ - # $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc + # $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc # Work around problem of missing syslimits.h if [ ! -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/include/syslimits.h ]; then \ echo "warning: working around missing syslimits.h"; \ diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index e9ab26e56..1a3f80aad 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -70,8 +70,8 @@ endif # ############################################################# -GCC_TARGET_PREREQ = -GCC_STAGING_PREREQ= $(STAGING_DIR)/usr/lib/libc.a +GCC_TARGET_PREREQ= +GCC_STAGING_PREREQ=$(STAGING_DIR)/usr/lib/libc.a GCC_TARGET_LANGUAGES:=c @@ -86,7 +86,7 @@ ifeq ($(BR2_GCC_CROSS_OBJC),y) GCC_CROSS_LANGUAGES:=$(GCC_CROSS_LANGUAGES),objc endif -GCC_COMMON_PREREQ= $(wildcard $(BR2_DEPENDS_DIR)/br2/install/libstdcpp*)\ +GCC_COMMON_PREREQ=$(wildcard $(BR2_DEPENDS_DIR)/br2/install/libstdcpp*)\ $(wildcard $(BR2_DEPENDS_DIR)/br2/install/libgcj*)\ $(wildcard $(BR2_DEPENDS_DIR)/br2/install/objc*)\ $(wildcard $(BR2_DEPENDS_DIR)/br2/install/fortran*)\ @@ -94,9 +94,9 @@ $(wildcard $(BR2_DEPENDS_DIR)/br2/prefer/ima*)\ $(wildcard $(BR2_DEPENDS_DIR)/br2/toolchain/sysroot*)\ $(wildcard $(BR2_DEPENDS_DIR)/br2/use/sjlj/exceptions*)\ $(wildcard $(BR2_DEPENDS_DIR)/br2/gcc/shared/libgcc*) -GCC_TARGET_PREREQ += $(GCC_COMMON_PREREQ) \ +GCC_TARGET_PREREQ+=$(GCC_COMMON_PREREQ) \ $(wildcard $(BR2_DEPENDS_DIR)/br2/extra/target/gcc/config/options*) -GCC_STAGING_PREREQ+= $(GCC_COMMON_PREREQ) \ +GCC_STAGING_PREREQ+=$(GCC_COMMON_PREREQ) \ $(wildcard $(BR2_DEPENDS_DIR)/br2/extra/gcc/config/options*)\ $(wildcard $(BR2_DEPENDS_DIR)/br2/gcc/cross/*) @@ -118,8 +118,8 @@ GCC_WITH_HOST_MPFR=--with-mpfr=$(MPFR_HOST_DIR) ifeq ($(BR2_INSTALL_FORTRAN),y) GCC_TARGET_LANGUAGES:=$(GCC_TARGET_LANGUAGES),fortran -#GCC_TARGET_PREREQ += $(TARGET_DIR)/usr/lib/libmpfr.so $(TARGET_DIR)/usr/lib/libgmp.so -#GCC_STAGING_PREREQ+= $(TOOL_BUILD_DIR)/mpfr/lib/libmpfr.so +#GCC_TARGET_PREREQ+=$(TARGET_DIR)/usr/lib/libmpfr.so $(TARGET_DIR)/usr/lib/libgmp.so +#GCC_STAGING_PREREQ+=$(TOOL_BUILD_DIR)/mpfr/lib/libmpfr.so GCC_WITH_TARGET_GMP=--with-gmp="$(GMP_TARGET_DIR)" GCC_WITH_TARGET_MPFR=--with-mpfr="$(MPFR_TARGET_DIR)" endif @@ -333,25 +333,29 @@ endif # # Ok... that's enough of that. # - -mkdir -p $(TARGET_DIR)/usr/lib $(TARGET_DIR)/usr/sbin + mkdir -p $(TARGET_DIR)/usr/lib $(TARGET_DIR)/usr/sbin touch $@ $(GCC_BUILD_DIR2)/.libs_installed: $(GCC_BUILD_DIR2)/.installed ifeq ($(BR2_GCC_SHARED_LIBGCC),y) # These are in /lib, so... rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so* - cp -dpf $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib/libgcc_s* $(TARGET_DIR)/lib/ + cp -dpf $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib/libgcc_s* \ + $(TARGET_DIR)/lib/ endif ifeq ($(BR2_INSTALL_LIBSTDCPP),y) - cp -dpf $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib/libstdc++.so* $(TARGET_DIR)/usr/lib/ + cp -dpf $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib/libstdc++.so* \ + $(TARGET_DIR)/usr/lib/ endif ifeq ($(BR2_INSTALL_LIBGCJ),y) cp -dpf $(STAGING_DIR)/lib/libgcj.so* $(TARGET_DIR)/lib/ cp -dpf $(STAGING_DIR)/lib/lib-org-w3c-dom.so* $(TARGET_DIR)/lib/ cp -dpf $(STAGING_DIR)/lib/lib-org-xml-sax.so* $(TARGET_DIR)/lib/ mkdir -p $(TARGET_DIR)/usr/lib/security - cp -dpf $(STAGING_DIR)/usr/lib/security/libgcj.security $(TARGET_DIR)/usr/lib/security/ - cp -dpf $(STAGING_DIR)/usr/lib/security/classpath.security $(TARGET_DIR)/usr/lib/security/ + cp -dpf $(STAGING_DIR)/usr/lib/security/libgcj.security \ + $(TARGET_DIR)/usr/lib/security/ + cp -dpf $(STAGING_DIR)/usr/lib/security/classpath.security \ + $(TARGET_DIR)/usr/lib/security/ endif touch $@ @@ -364,8 +368,8 @@ gcc-source: $(DL_DIR)/$(GCC_SOURCE) gcc-clean: rm -rf $(GCC_BUILD_DIR2) for prog in cpp gcc gcc-[0-9]* protoize unprotoize gcov gccbug cc; do \ - rm -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-$$prog \ - rm -f $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-$$prog; \ + rm -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-$$prog; \ + rm -f $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-$$prog; \ done gcc-dirclean: gcc_initial-dirclean @@ -465,7 +469,7 @@ endif # rm -f $(TARGET_DIR)/usr/lib/*.la* #rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ - # $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc + # $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc # Work around problem of missing syslimits.h if [ ! -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/include/syslimits.h ]; then \ echo "warning: working around missing syslimits.h"; \ diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index 60ee758b1..b87cf0b05 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -320,16 +320,19 @@ $(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.config RUNTIME_PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \ HOSTCC="$(HOSTCC)" \ pregen install_dev - # Install the kernel headers to the first stage gcc include dir if necessary + # Install the kernel headers to the first stage gcc include dir + # if necessary ifeq ($(LINUX_HEADERS_IS_KERNEL),y) - if [ ! -f $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/linux/version.h ]; \ - then \ - cp -pLR $(LINUX_HEADERS_DIR)/include/* $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/; \ + if [ ! -f $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/linux/version.h ]; then \ + cp -pLR $(LINUX_HEADERS_DIR)/include/* \ + $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/; \ fi else if [ ! -f $(STAGING_DIR)/usr/include/linux/version.h ]; then \ - cp -pLR $(LINUX_HEADERS_DIR)/include/asm $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/; \ - cp -pLR $(LINUX_HEADERS_DIR)/include/linux $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/; \ + cp -pLR $(LINUX_HEADERS_DIR)/include/asm \ + $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/; \ + cp -pLR $(LINUX_HEADERS_DIR)/include/linux \ + $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/; \ if [ -d $(LINUX_HEADERS_DIR)/include/asm-generic ]; then \ cp -pLR $(LINUX_HEADERS_DIR)/include/asm-generic \ $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/; \ @@ -375,13 +378,16 @@ endif # Install the kernel headers to the staging dir if necessary ifeq ($(LINUX_HEADERS_IS_KERNEL),y) if [ ! -f $(STAGING_DIR)/usr/include/linux/version.h ]; then \ - cp -pLR $(LINUX_HEADERS_DIR)/include/* $(STAGING_DIR)/usr/include/; \ + cp -pLR $(LINUX_HEADERS_DIR)/include/* \ + $(STAGING_DIR)/usr/include/; \ fi else if [ ! -f $(STAGING_DIR)/usr/include/linux/version.h ]; then \ - cp -pLR $(LINUX_HEADERS_DIR)/include/asm $(STAGING_DIR)/usr/include/; \ - cp -pLR $(LINUX_HEADERS_DIR)/include/linux $(STAGING_DIR)/usr/include/; \ + cp -pLR $(LINUX_HEADERS_DIR)/include/asm \ + $(STAGING_DIR)/usr/include/; \ + cp -pLR $(LINUX_HEADERS_DIR)/include/linux \ + $(STAGING_DIR)/usr/include/; \ if [ -d $(LINUX_HEADERS_DIR)/include/asm-generic ]; then \ cp -pLR $(LINUX_HEADERS_DIR)/include/asm-generic \ $(STAGING_DIR)/usr/include/; \ @@ -459,14 +465,16 @@ $(TARGET_DIR)/usr/lib/libc.a: $(STAGING_DIR)/usr/lib/libc.a install_dev # Install the kernel headers to the target dir if necessary ifeq ($(LINUX_HEADERS_IS_KERNEL),y) - if [ ! -f $(TARGET_DIR)/usr/include/linux/version.h ]; \ - then \ - cp -pLR $(LINUX_HEADERS_DIR)/include/* $(TARGET_DIR)/usr/include/; \ + if [ ! -f $(TARGET_DIR)/usr/include/linux/version.h ]; then \ + cp -pLR $(LINUX_HEADERS_DIR)/include/* \ + $(TARGET_DIR)/usr/include/; \ fi else if [ ! -f $(TARGET_DIR)/usr/include/linux/version.h ]; then \ - cp -pLR $(LINUX_HEADERS_DIR)/include/asm $(TARGET_DIR)/usr/include/; \ - cp -pLR $(LINUX_HEADERS_DIR)/include/linux $(TARGET_DIR)/usr/include/; \ + cp -pLR $(LINUX_HEADERS_DIR)/include/asm \ + $(TARGET_DIR)/usr/include/; \ + cp -pLR $(LINUX_HEADERS_DIR)/include/linux \ + $(TARGET_DIR)/usr/include/; \ if [ -d $(LINUX_HEADERS_DIR)/include/asm-generic ]; then \ cp -pLR $(LINUX_HEADERS_DIR)/include/asm-generic \ $(TARGET_DIR)/usr/include/; \ -- cgit v1.2.3