Parcourir la source

Update tar version. Minor fix for gcc includes when NOT
building a bootstrapping toolchain.

Eric Andersen il y a 22 ans
Parent
commit
d9d8e42cb9
2 fichiers modifiés avec 5 ajouts et 3 suppressions
  1. 2 0
      make/gcc_target.mk
  2. 3 3
      make/tar.mk

+ 2 - 0
make/gcc_target.mk

@@ -385,9 +385,11 @@ $(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR3)/.compiled
 	rm -f $(TARGET_DIR)/usr/lib/*.la*
 	# gcc "fixincludes" step is totally broken and takes unwanted
 	# stuff from the host system.  Fix that here.
+ifeq ($(USE_UCLIBC_TOOLCHAIN),true)
 	rm -rf $(TARGET_DIR)/usr/lib/gcc-lib/$(GNU_TARGET_NAME)/*/include/*
 	-cp -a $(STAGING_DIR)/usr/lib/gcc-lib/$(GNU_TARGET_NAME)/*/include/* \
 		$(TARGET_DIR)/usr/lib/gcc-lib/$(GNU_TARGET_NAME)/*/include/
+endif
 	touch -c $(TARGET_DIR)/usr/bin/gcc
 
 gcc_target: uclibc_target binutils_target $(TARGET_DIR)/usr/bin/gcc

+ 3 - 3
make/tar.mk

@@ -3,9 +3,9 @@
 # tar
 #
 #############################################################
-GNUTAR_SOURCE:=tar-1.13.tar.gz
-GNUTAR_SITE:=ftp://ftp.gnu.org/gnu/tar
-GNUTAR_DIR:=$(BUILD_DIR)/tar-1.13
+GNUTAR_SOURCE:=tar-1.13.25.tar.gz
+GNUTAR_SITE:=ftp://alpha.gnu.org/gnu/tar
+GNUTAR_DIR:=$(BUILD_DIR)/tar-1.13.25
 GNUTAR_CAT:=zcat
 GNUTAR_BINARY:=src/tar
 GNUTAR_TARGET_BINARY:=bin/tar