Commit 60b5eee7 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

package: global largefile CFLAGS handling

parent 02a623dd

package/Makefile.in

+4 −0
Original line number Diff line number Diff line
@@ -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

package/lzma/lzma.mk

+1 −5
Original line number Diff line number Diff line
@@ -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) \

package/mkdosfs/mkdosfs.mk

+1 −6
Original line number Diff line number Diff line
@@ -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

package/newt/newt.mk

+1 −6
Original line number Diff line number Diff line
@@ -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)

package/slang/slang.mk

+1 −5
Original line number Diff line number Diff line
@@ -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