diff options
| -rw-r--r-- | package/Makefile.in | 4 | ||||
| -rw-r--r-- | package/lzma/lzma.mk | 6 | ||||
| -rw-r--r-- | package/mkdosfs/mkdosfs.mk | 7 | ||||
| -rw-r--r-- | package/newt/newt.mk | 7 | ||||
| -rw-r--r-- | package/slang/slang.mk | 6 | ||||
| -rw-r--r-- | package/strace/strace.mk | 7 | ||||
| -rw-r--r-- | package/vsftpd/vsftpd.mk | 5 | ||||
| -rw-r--r-- | package/zlib/zlib.mk | 6 |
8 files changed, 11 insertions, 37 deletions
diff --git a/package/Makefile.in b/package/Makefile.in index 86df3f2e6..431ca8e78 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -80,6 +80,10 @@ ifeq ($(findstring yy,$(BR2_mips)$(BR2_MIPS_ABI64)),yy) TARGET_CFLAGS+=-fno-pic -mno-abicalls endif +ifeq ($(BR2_LARGEFILE),y) +TARGET_CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +endif + TARGET_CXXFLAGS=$(TARGET_CFLAGS) # else it's an external toolchain diff --git a/package/lzma/lzma.mk b/package/lzma/lzma.mk index ccbe56bd6..9b0f3883e 100644 --- a/package/lzma/lzma.mk +++ b/package/lzma/lzma.mk @@ -9,10 +9,6 @@ LZMA_CAT:=$(ZCAT) LZMA_SITE:=http://tukaani.org/lzma/ LZMA_HOST_DIR:=$(TOOL_BUILD_DIR)/lzma-$(LZMA_VERSION) LZMA_TARGET_DIR:=$(BUILD_DIR)/lzma-$(LZMA_VERSION) -LZMA_CFLAGS:=$(TARGET_CFLAGS) -ifeq ($(BR2_LARGEFILE),y) -LZMA_CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -endif LZMA_TARGET_BINARY:=bin/lzma # lzma binary for use on the host @@ -92,7 +88,7 @@ $(LZMA_TARGET_DIR)/.configured: $(LZMA_TARGET_DIR)/.unpacked (cd $(LZMA_TARGET_DIR); rm -f config.cache;\ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ - CFLAGS="$(TARGET_CFLAGS) $(LZMA_CFLAGS)" \ + CFLAGS="$(TARGET_CFLAGS)" \ ac_cv_func_malloc_0_nonnull=yes \ ./configure \ --target=$(GNU_TARGET_NAME) \ diff --git a/package/mkdosfs/mkdosfs.mk b/package/mkdosfs/mkdosfs.mk index 399cecae1..6904b5665 100644 --- a/package/mkdosfs/mkdosfs.mk +++ b/package/mkdosfs/mkdosfs.mk @@ -11,11 +11,6 @@ MKDOSFS_CAT:=$(ZCAT) MKDOSFS_BINARY:=mkdosfs/mkdosfs MKDOSFS_TARGET_BINARY:=sbin/mkdosfs -MKDOSFS_CFLAGS=$(TARGET_CFLAGS) -ifeq ($(BR2_LARGEFILE),y) -MKDOSFS_CFLAGS+= -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -endif - $(DL_DIR)/$(MKDOSFS_SOURCE): $(WGET) -P $(DL_DIR) $(MKDOSFS_SITE)/$(MKDOSFS_SOURCE) @@ -26,7 +21,7 @@ $(MKDOSFS_DIR)/.unpacked: $(DL_DIR)/$(MKDOSFS_SOURCE) touch $(MKDOSFS_DIR)/.unpacked $(MKDOSFS_DIR)/$(MKDOSFS_BINARY): $(MKDOSFS_DIR)/.unpacked - $(MAKE) CFLAGS="$(MKDOSFS_CFLAGS)" CC="$(TARGET_CC)" -C $(MKDOSFS_DIR) + $(MAKE) CFLAGS="$(TARGET_CFLAGS)" CC="$(TARGET_CC)" -C $(MKDOSFS_DIR) $(STRIPCMD) $(MKDOSFS_DIR)/mkdosfs/mkdosfs touch -c $(MKDOSFS_DIR)/mkdosfs/mkdosfs diff --git a/package/newt/newt.mk b/package/newt/newt.mk index b88a32dcc..7613028b6 100644 --- a/package/newt/newt.mk +++ b/package/newt/newt.mk @@ -8,12 +8,7 @@ NEWT_CAT:=$(BZCAT) NEWT_SITE=http://www.uclibc.org/ NEWT_DIR=$(BUILD_DIR)/newt-0.51.0 NEWT_VERSION=0.51.0 -ifeq ($(BR2_LARGEFILE),y) -NEWT_CFLAGS=-Os -g -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -else -NEWT_CFLAGS=-Os -g -endif -NEWT_CFLAGS+=-fPIC +NEWT_CFLAGS=-Os -g -fPIC $(DL_DIR)/$(NEWT_SOURCE): $(WGET) -P $(DL_DIR) $(NEWT_SITE)/$(NEWT_SOURCE) diff --git a/package/slang/slang.mk b/package/slang/slang.mk index e776b72db..e783acf3f 100644 --- a/package/slang/slang.mk +++ b/package/slang/slang.mk @@ -8,10 +8,6 @@ SLANG_SOURCE=slang-$(SLANG_VERSION)-mini.tar.bz2 SLANG_CAT:=$(BZCAT) SLANG_SITE:=http://www.uclibc.org/ SLANG_DIR=$(BUILD_DIR)/slang-$(SLANG_VERSION)-mini -ifeq ($(BR2_LARGEFILE),y) -SLANG_CFLAGS=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -endif -SLANG_CFLAGS+=-fPIC $(DL_DIR)/$(SLANG_SOURCE): $(WGET) -P $(DL_DIR) $(SLANG_SITE)/$(SLANG_SOURCE) @@ -20,7 +16,7 @@ $(SLANG_DIR): $(DL_DIR)/$(SLANG_SOURCE) $(SLANG_CAT) $(DL_DIR)/$(SLANG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - $(SLANG_DIR)/libslang.so: $(SLANG_DIR) - $(MAKE1) CFLAGS="-Os -g $(SLANG_CFLAGS)" CC=$(TARGET_CC) -C $(SLANG_DIR) + $(MAKE1) CFLAGS="-Os -g -fPIC $(TARGET_CFLAGS)" CC=$(TARGET_CC) -C $(SLANG_DIR) $(STAGING_DIR)/lib/libslang.so.1: $(SLANG_DIR)/libslang.so cp -dpf $(SLANG_DIR)/libslang.a $(STAGING_DIR)/usr/lib diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 8e4c2c6ca..2c93830cf 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -9,11 +9,6 @@ STRACE_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/str STRACE_CAT:=$(BZCAT) STRACE_DIR:=$(BUILD_DIR)/strace-$(STRACE_VERSION) -BR2_STRACE_CFLAGS:= -ifeq ($(BR2_LARGEFILE),) -BR2_STRACE_CFLAGS+=-U_LARGEFILE64_SOURCE -U__USE_LARGEFILE64 -U__USE_FILE_OFFSET64 -endif - $(DL_DIR)/$(STRACE_SOURCE): $(WGET) -P $(DL_DIR) $(STRACE_SITE)/$(STRACE_SOURCE) @@ -31,7 +26,7 @@ $(STRACE_DIR)/.configured: $(STRACE_DIR)/.unpacked $(if $(BR2_LARGEFILE),ac_cv_type_stat64=yes,ac_cv_type_stat64=no) \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ - CFLAGS="$(TARGET_CFLAGS) $(BR2_STRACE_CFLAGS)" \ + CFLAGS="$(TARGET_CFLAGS)" \ ac_cv_header_linux_if_packet_h=yes \ ac_cv_header_linux_netlink_h=yes \ ./configure \ diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk index ad23192e6..0bceca665 100644 --- a/package/vsftpd/vsftpd.mk +++ b/package/vsftpd/vsftpd.mk @@ -17,9 +17,6 @@ VSFTPD_LIBS:=-lcrypt -lssl else VSFTPD_LIBS:=-lcrypt endif -ifeq ($(BR2_LARGEFILE),) -#BR2_VSFTPD_CFLAGS:=-U_LARGEFILE64_SOURCE -U_FILE_OFFSET_BITS -endif $(DL_DIR)/$(VSFTPD_SOURCE): $(WGET) -P $(DL_DIR) $(VSFTPD_SITE)/$(VSFTPD_SOURCE) @@ -49,7 +46,7 @@ endif $(VSFTPD_DIR)/$(VSFTPD_BINARY): $(VSFTPF_PREREQ) $(VSFTPD_DIR)/.configured - $(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS) $(BR2_VSFTPD_CFLAGS)" LIBS="$(VSFTPD_LIBS)" -C $(VSFTPD_DIR) + $(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" LIBS="$(VSFTPD_LIBS)" -C $(VSFTPD_DIR) $(TARGET_DIR)/usr/sbin/$(VSFTPD_BINARY): $(VSFTPD_DIR)/$(VSFTPD_BINARY) cp -dpf $< $@ diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk index a9ff342b2..904c20b6a 100644 --- a/package/zlib/zlib.mk +++ b/package/zlib/zlib.mk @@ -8,10 +8,6 @@ ZLIB_SOURCE:=zlib-$(ZLIB_VERSION).tar.bz2 ZLIB_CAT:=$(BZCAT) ZLIB_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng ZLIB_DIR:=$(BUILD_DIR)/zlib-$(ZLIB_VERSION) -ZLIB_CFLAGS:=-fPIC -ifeq ($(BR2_LARGEFILE),y) -ZLIB_CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -endif $(DL_DIR)/$(ZLIB_SOURCE): $(WGET) -P $(DL_DIR) $(ZLIB_SITE)/$(ZLIB_SOURCE) @@ -26,7 +22,7 @@ $(ZLIB_DIR)/.configured: $(ZLIB_DIR)/.patched (cd $(ZLIB_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_ARGS) \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(ZLIB_CFLAGS)" \ + CFLAGS="$(TARGET_CFLAGS) -fPIC" \ ./configure \ --shared \ --prefix=/usr \ |