--- make/coreutils.mk (revision 4058) +++ make/coreutils.mk (working copy) @@ -20,7 +20,7 @@ # You should change all these variables to suit your package. # COREUTILS_SITE=http://ftp.gnu.org/pub/gnu/coreutils -COREUTILS_VERSION=5.2.1 +COREUTILS_VERSION=5.97 COREUTILS_SOURCE=coreutils-$(COREUTILS_VERSION).tar.gz COREUTILS_DIR=coreutils-$(COREUTILS_VERSION) COREUTILS_UNZIP=zcat @@ -34,14 +34,15 @@ # # COREUTILS_IPK_VERSION should be incremented when the ipk changes. # -COREUTILS_IPK_VERSION=9 +COREUTILS_IPK_VERSION=1 # # COREUTILS_PATCHES should list any patches, in the the order in # which they should be applied to the source code. # -COREUTILS_PATCHES=$(COREUTILS_SOURCE_DIR)/Makefile.in.patch - +#COREUTILS_PATCHES=$(COREUTILS_SOURCE_DIR)/Makefile.in.patch +COREUTILS_PATCHES= +COREUTILS_AC_CACHE=$(COREUTILS_SOURCE_DIR)/config.cache # # If the compilation of the package requires additional # compilation or linking flags, then list them here. @@ -92,17 +93,19 @@ # If the compilation of the package requires other packages to be staged # first, then do that first (e.g. "$(MAKE) -stage -stage"). # -$(COREUTILS_BUILD_DIR)/.configured: $(DL_DIR)/$(COREUTILS_SOURCE) $(COREUTILS_PATCHES) +$(COREUTILS_BUILD_DIR)/.configured: $(DL_DIR)/$(COREUTILS_SOURCE) $(COREUTILS_PATCHES) $(COREUTILS_AC_CACHE) # $(MAKE) -stage -stage rm -rf $(BUILD_DIR)/$(COREUTILS_DIR) $(COREUTILS_BUILD_DIR) $(COREUTILS_UNZIP) $(DL_DIR)/$(COREUTILS_SOURCE) | tar -C $(BUILD_DIR) -xvf - - cat $(COREUTILS_PATCHES) | patch -d $(BUILD_DIR)/$(COREUTILS_DIR) -p1 +# cat $(COREUTILS_PATCHES) | patch -d $(BUILD_DIR)/$(COREUTILS_DIR) -p1 mv $(BUILD_DIR)/$(COREUTILS_DIR) $(COREUTILS_BUILD_DIR) + cp $(COREUTILS_AC_CACHE) $(COREUTILS_BUILD_DIR)/config.cache (cd $(COREUTILS_BUILD_DIR); \ $(TARGET_CONFIGURE_OPTS) \ CPPFLAGS="$(STAGING_CPPFLAGS) $(COREUTILS_CPPFLAGS)" \ LDFLAGS="$(STAGING_LDFLAGS) $(COREUTILS_LDFLAGS)" \ ./configure \ + --cache-file=config.cache \ --build=$(GNU_HOST_NAME) \ --host=$(GNU_TARGET_NAME) \ --target=$(GNU_TARGET_NAME) \ @@ -176,6 +179,8 @@ # Install binaries install -d $(COREUTILS_IPK_DIR)/opt/bin $(MAKE) -C $(COREUTILS_BUILD_DIR) DESTDIR=$(COREUTILS_IPK_DIR) install-exec + # copy su - can't install it as install only works for root + cp -p $(COREUTILS_BUILD_DIR)/src/su $(COREUTILS_IPK_DIR)/opt/bin/su # Install makefiles install -d $(COREUTILS_IPK_DIR)/opt/man/man1 $(MAKE) -C $(COREUTILS_BUILD_DIR)/man DESTDIR=$(COREUTILS_IPK_DIR) install @@ -183,7 +188,7 @@ rm $(COREUTILS_IPK_DIR)/opt/bin/groups # Remove /opt/bin/hostname (conflicts with net-tools) rm $(COREUTILS_IPK_DIR)/opt/bin/hostname - rm $(COREUTILS_IPK_DIR)/opt/man/man1/hostname.1 + rm $(COREUTILS_IPK_DIR)/opt/share/man/man1/hostname.1 $(STRIP_COMMAND) $(COREUTILS_IPK_DIR)/opt/bin/* cp $(COREUTILS_BUILD_DIR)/src/groups $(COREUTILS_IPK_DIR)/opt/bin mv $(COREUTILS_IPK_DIR)/opt/bin/kill $(COREUTILS_IPK_DIR)/opt/bin/coreutils-kill cat sources/coreutils/config.cache # This test should be true on all Linux systems fu_cv_sys_stat_statfs2_bsize=${fu_cv_sys_stat_statfs2_bsize=yes}