浏览代码

Bump versions.

"Steven J. Hill" 18 年之前
父节点
当前提交
9a0f303cce
共有 2 个文件被更改,包括 2 次插入8 次删除
  1. 1 8
      package/coreutils/coreutils.mk
  2. 1 0
      package/file/file.mk

+ 1 - 8
package/coreutils/coreutils.mk

@@ -3,7 +3,7 @@
 # coreutils
 #
 #############################################################
-COREUTILS_VER:=5.96
+COREUTILS_VER:=6.9
 COREUTILS_SOURCE:=coreutils-$(COREUTILS_VER).tar.bz2
 #COREUTILS_SITE:=ftp://alpha.gnu.org/gnu/coreutils/
 COREUTILS_SITE:=http://ftp.gnu.org/pub/gnu/coreutils
@@ -102,13 +102,6 @@ $(COREUTILS_DIR)/.configured: $(COREUTILS_DIR)/.unpacked
 		--disable-rpath \
 		--disable-dependency-tracking \
 	);
-	#Fix up the max number of open files per process, which apparently 
-	# is not set when cross compiling
-	$(SED) 's,.*UTILS_OPEN_MAX.*,#define UTILS_OPEN_MAX 1019,g' \
-		$(COREUTILS_DIR)/config.h
-	# This is undefined when crosscompiling...
-	$(SED) 's,.*HAVE_PROC_UPTIME.*,#define HAVE_PROC_UPTIME 1,g' \
-		$(COREUTILS_DIR)/config.h
 	touch $@
 
 $(COREUTILS_DIR)/$(COREUTILS_BINARY): $(COREUTILS_DIR)/.configured

+ 1 - 0
package/file/file.mk

@@ -94,6 +94,7 @@ $(TARGET_DIR)/$(FILE_TARGET_BINARY): $(FILE_DIR2)/$(FILE_BINARY)
 		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
 	mv $(TARGET_DIR)/lib/libmagic.a $(STAGING_DIR)/lib
 	rm -f $(TARGET_DIR)/lib/libmagic.la
+	mkdir -p $(STAGING_DIR)/include
 	mv $(TARGET_DIR)/usr/include/magic.h $(STAGING_DIR)/include
 
 file: zlib uclibc $(TARGET_DIR)/$(FILE_TARGET_BINARY)