浏览代码

- use global DISABLE_LARGEFILE

Bernhard Reutner-Fischer 18 年之前
父节点
当前提交
ba7d905b54
共有 4 个文件被更改,包括 4 次插入19 次删除
  1. 1 6
      package/argus/argus.mk
  2. 1 5
      package/berkeleydb/berkeleydb.mk
  3. 1 5
      package/gzip/gzip.mk
  4. 1 3
      package/lzma/lzma.mk

+ 1 - 6
package/argus/argus.mk

@@ -12,11 +12,6 @@ ARGUS_CAT:=$(ZCAT)
 ARGUS_BINARY:=bin/argus
 ARGUS_BINARY:=bin/argus
 ARGUS_TARGET_BINARY:=usr/sbin/argus
 ARGUS_TARGET_BINARY:=usr/sbin/argus
 
 
-ARGUS_CONFIG_OPTS:=
-ifneq ($(strip $(BR2_LARGEFILE)),y)
-ARGUS_CONFIG_OPTS += --disable-largefile
-endif
-
 ARGUS_TRAP_CHECK=ac_cv_lbl_unaligned_fail=yes
 ARGUS_TRAP_CHECK=ac_cv_lbl_unaligned_fail=yes
 ifeq ($(BR2_i386),y)
 ifeq ($(BR2_i386),y)
 ARGUS_TRAP_CHECK=ac_cv_lbl_unaligned_fail=no
 ARGUS_TRAP_CHECK=ac_cv_lbl_unaligned_fail=no
@@ -63,7 +58,7 @@ $(ARGUS_DIR)/.configured: $(ARGUS_DIR)/.unpacked
 		--host=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
 		--build=$(GNU_HOST_NAME) \
 		--prefix=/usr \
 		--prefix=/usr \
-		$(ARGUS_CONFIG_OPTS) \
+		$(DISABLE_LARGEFILE) \
 	);
 	);
 	touch $(ARGUS_DIR)/.configured
 	touch $(ARGUS_DIR)/.configured
 
 

+ 1 - 5
package/berkeleydb/berkeleydb.mk

@@ -10,10 +10,6 @@ DB_SOURCE:=db-$(DB_VER).NC.tar.gz
 DB_DIR:=$(BUILD_DIR)/db-$(DB_VER).NC
 DB_DIR:=$(BUILD_DIR)/db-$(DB_VER).NC
 DB_SHARLIB:=libdb-$(DB_SO_VER).so
 DB_SHARLIB:=libdb-$(DB_SO_VER).so
 
 
-ifneq ($(BR2_LARGEFILE),y)
-DB_LARGEFILE="--disable-largefile"
-endif
-
 $(DL_DIR)/$(DB_SOURCE):
 $(DL_DIR)/$(DB_SOURCE):
 	$(WGET) -P $(DL_DIR) $(DB_SITE)/$(DB_SOURCE)
 	$(WGET) -P $(DL_DIR) $(DB_SITE)/$(DB_SOURCE)
 
 
@@ -48,7 +44,7 @@ $(DB_DIR)/.configured: $(DB_DIR)/.dist
 		--disable-tcl \
 		--disable-tcl \
 		--disable-compat185 \
 		--disable-compat185 \
 		--with-pic \
 		--with-pic \
-                $(DB_LARGEFILE) \
+                $(DISABLE_LARGEFILE) \
 	);
 	);
 	$(SED) 's/\.lo/.o/g' $(DB_DIR)/build_unix/Makefile
 	$(SED) 's/\.lo/.o/g' $(DB_DIR)/build_unix/Makefile
 	touch $(DB_DIR)/.configured
 	touch $(DB_DIR)/.configured

+ 1 - 5
package/gzip/gzip.mk

@@ -12,10 +12,6 @@ GZIP_CAT:=$(ZCAT)
 GZIP_BINARY:=$(GZIP_DIR)/gzip
 GZIP_BINARY:=$(GZIP_DIR)/gzip
 GZIP_TARGET_BINARY:=$(TARGET_DIR)/bin/zmore
 GZIP_TARGET_BINARY:=$(TARGET_DIR)/bin/zmore
 
 
-ifneq ($(BR2_LARGEFILE),y)
-GZIP_LARGEFILE="--disable-largefile"
-endif
-
 $(DL_DIR)/$(GZIP_SOURCE):
 $(DL_DIR)/$(GZIP_SOURCE):
 	 $(WGET) -P $(DL_DIR) $(GZIP_SITE)/$(GZIP_SOURCE)
 	 $(WGET) -P $(DL_DIR) $(GZIP_SITE)/$(GZIP_SOURCE)
 
 
@@ -44,7 +40,7 @@ $(GZIP_DIR)/.configured: $(GZIP_DIR)/.unpacked
 		--mandir=/usr/man \
 		--mandir=/usr/man \
 		--infodir=/usr/info \
 		--infodir=/usr/info \
 		$(DISABLE_NLS) \
 		$(DISABLE_NLS) \
-		$(GZIP_LARGEFILE) \
+		$(DISABLE_LARGEFILE) \
 	);
 	);
 	touch $(GZIP_DIR)/.configured
 	touch $(GZIP_DIR)/.configured
 
 

+ 1 - 3
package/lzma/lzma.mk

@@ -12,9 +12,7 @@ LZMA_TARGET_DIR:=$(BUILD_DIR)/lzma-$(LZMA_VER)
 LZMA_CFLAGS:=$(TARGET_CFLAGS)
 LZMA_CFLAGS:=$(TARGET_CFLAGS)
 ifeq ($(BR2_LARGEFILE),y)
 ifeq ($(BR2_LARGEFILE),y)
 LZMA_CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 LZMA_CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-LZMA_LARGEFILE="--enable-largefile"
 else
 else
-LZMA_LARGEFILE="--disable-largefile"
 endif
 endif
 
 
 $(DL_DIR)/$(LZMA_SOURCE):
 $(DL_DIR)/$(LZMA_SOURCE):
@@ -75,7 +73,7 @@ $(LZMA_TARGET_DIR)/.configured: $(LZMA_TARGET_DIR)/.source
 		--includedir=$(TARGET_DIR)/include \
 		--includedir=$(TARGET_DIR)/include \
 		--disable-debug \
 		--disable-debug \
 		$(DISABLE_NLS) \
 		$(DISABLE_NLS) \
-		$(LZMA_LARGEFILE) \
+		$(DISABLE_LARGEFILE) \
 	);
 	);
 	touch $(LZMA_TARGET_DIR)/.configured;
 	touch $(LZMA_TARGET_DIR)/.configured;