From 50e1da8698f484cfcf6793136ea268c3f997d6ea Mon Sep 17 00:00:00 2001 From: Manuel Novoa III Date: Mon, 17 Nov 2003 01:31:38 +0000 Subject: [PATCH] Fix most things when large file support is not configured. Mostly submitted by Thomas Lundquist . --- make/bash.mk | 1 + make/busybox.mk | 4 +++- make/coreutils.mk | 1 + make/diffutils.mk | 1 + make/file.mk | 1 + make/findutils.mk | 1 + make/flex.mk | 1 + make/gawk.mk | 1 + make/grep.mk | 1 + make/hostap.mk | 10 +++++----- make/iproute2.mk | 2 +- make/kernel-headers.mk | 2 +- make/links.mk | 4 ++-- make/make.mk | 1 + make/openssh.mk | 4 +++- make/patch.mk | 1 + make/sed.mk | 4 ++++ make/strace.mk | 1 + make/tar.mk | 1 + make/uclibc.mk | 8 +++++++- make/wtools.mk | 3 ++- 21 files changed, 40 insertions(+), 13 deletions(-) diff --git a/make/bash.mk b/make/bash.mk index 1b30dfc568..aca345232e 100644 --- a/make/bash.mk +++ b/make/bash.mk @@ -43,6 +43,7 @@ $(BASH_DIR)/.configured: $(BASH_DIR)/.unpacked --mandir=/usr/man \ --infodir=/usr/info \ $(DISABLE_NLS) \ + $(DISABLE_LARGEFILE) \ --with-curses \ --enable-alias \ ); diff --git a/make/busybox.mk b/make/busybox.mk index 38c32035bf..fcd6e234a0 100644 --- a/make/busybox.mk +++ b/make/busybox.mk @@ -31,7 +31,9 @@ ifeq ($(USE_BUSYBOX_SNAPSHOT),true) sed -ie "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\ PREFIX=$(TARGET_DIR),;" $(BUSYBOX_DIR)/Rules.mak ifeq ($(strip $(BUILD_WITH_LARGEFILE)),true) - sed -ie "s/^.*DOLFS.*/DOLFS=y/;" $(BUSYBOX_DIR)/.config + sed -ie "s/^.*CONFIG_LFS.*/CONFIG_LFS=y/;" $(BUSYBOX_DIR)/.config +else + sed -ie "s/^.*CONFIG_LFS.*/CONFIG_LFS=n/;" $(BUSYBOX_DIR)/.config endif $(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_DIR) oldconfig else # Not using snapshot diff --git a/make/coreutils.mk b/make/coreutils.mk index 1a4f1c2985..cc5c6cc773 100644 --- a/make/coreutils.mk +++ b/make/coreutils.mk @@ -40,6 +40,7 @@ $(COREUTILS_DIR)/.configured: $(COREUTILS_DIR)/.unpacked --mandir=/usr/man \ --infodir=/usr/info \ $(DISABLE_NLS) \ + $(DISABLE_LARGEFILE) \ --disable-rpath \ --disable-dependency-tracking \ ); diff --git a/make/diffutils.mk b/make/diffutils.mk index 823de91b3e..0019bd8d44 100644 --- a/make/diffutils.mk +++ b/make/diffutils.mk @@ -38,6 +38,7 @@ $(DIFFUTILS_DIR)/.configured: $(DIFFUTILS_DIR)/.unpacked --mandir=/usr/man \ --infodir=/usr/info \ $(DISABLE_NLS) \ + $(DISABLE_LARGEFILE) \ ); touch $(DIFFUTILS_DIR)/.configured diff --git a/make/file.mk b/make/file.mk index 471d92d718..09044ea2d5 100644 --- a/make/file.mk +++ b/make/file.mk @@ -39,6 +39,7 @@ $(FILE_DIR)/.configured: $(FILE_DIR)/.unpacked --mandir=/usr/man \ --infodir=/usr/info \ $(DISABLE_NLS) \ + $(DISABLE_LARGEFILE) \ --disable-fsect-man5 \ ); touch $(FILE_DIR)/.configured diff --git a/make/findutils.mk b/make/findutils.mk index b7716b2c78..aaac14eaaa 100644 --- a/make/findutils.mk +++ b/make/findutils.mk @@ -40,6 +40,7 @@ $(FINDUTILS_DIR)/.configured: $(FINDUTILS_DIR)/.unpacked --mandir=/usr/man \ --infodir=/usr/info \ $(DISABLE_NLS) \ + $(DISABLE_LARGEFILE) \ ); touch $(FINDUTILS_DIR)/.configured diff --git a/make/flex.mk b/make/flex.mk index 31ed8161f2..a29fa5875e 100644 --- a/make/flex.mk +++ b/make/flex.mk @@ -43,6 +43,7 @@ $(FLEX_DIR)/.configured: $(FLEX_DIR)/.unpacked --mandir=/usr/man \ --infodir=/usr/info \ $(DISABLE_NLS) \ + $(DISABLE_LARGEFILE) \ ); touch $(FLEX_DIR)/.configured diff --git a/make/gawk.mk b/make/gawk.mk index f3a1a1d8e9..523b0479bb 100644 --- a/make/gawk.mk +++ b/make/gawk.mk @@ -39,6 +39,7 @@ $(GAWK_DIR)/.configured: $(GAWK_DIR)/.unpacked --mandir=/usr/man \ --infodir=/usr/info \ $(DISABLE_NLS) \ + $(DISABLE_LARGEFILE) \ ); touch $(GAWK_DIR)/.configured diff --git a/make/grep.mk b/make/grep.mk index bca1984e24..8fccf5be04 100644 --- a/make/grep.mk +++ b/make/grep.mk @@ -38,6 +38,7 @@ $(GNUGREP_DIR)/.configured: $(GNUGREP_DIR)/.unpacked --mandir=/usr/man \ --infodir=/usr/info \ $(DISABLE_NLS) \ + $(DISABLE_LARGEFILE) \ --disable-perl-regexp \ --without-included-regex \ ); diff --git a/make/hostap.mk b/make/hostap.mk index 3edcf9a354..e2c49f7d95 100644 --- a/make/hostap.mk +++ b/make/hostap.mk @@ -24,11 +24,11 @@ $(HOSTAP_DIR)/.configured: $(HOSTAP_DIR)/.unpacked touch $(HOSTAP_DIR)/.configured $(HOSTAP_DIR)/driver/modules/hostap.o: $(HOSTAP_DIR)/.configured - $(MAKE) -C $(HOSTAP_DIR) pccard KERNEL_PATH=$(LINUX_SOURCE_DIR) CC=$(TARGET_CC) - $(MAKE) -C $(HOSTAP_DIR) pci KERNEL_PATH=$(LINUX_SOURCE_DIR) CC=$(TARGET_CC) - $(MAKE) -C $(HOSTAP_DIR) plx KERNEL_PATH=$(LINUX_SOURCE_DIR) CC=$(TARGET_CC) - $(MAKE) -C $(HOSTAP_DIR)/utils CC=$(TARGET_CC) - $(MAKE) -C $(HOSTAP_DIR)/hostapd CC=$(TARGET_CC) + $(MAKE) -C $(HOSTAP_DIR) pccard KERNEL_PATH=$(LINUX_SOURCE_DIR) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" + $(MAKE) -C $(HOSTAP_DIR) pci KERNEL_PATH=$(LINUX_SOURCE_DIR) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" + $(MAKE) -C $(HOSTAP_DIR) plx KERNEL_PATH=$(LINUX_SOURCE_DIR) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" + $(MAKE) -C $(HOSTAP_DIR)/utils CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" + $(MAKE) -C $(HOSTAP_DIR)/hostapd CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" touch -c $(HOSTAP_DIR)/driver/modules/hostap.o $(HOSTAP_TARGET_MODULE_DIR)/hostap.o: $(HOSTAP_DIR)/driver/modules/hostap.o diff --git a/make/iproute2.mk b/make/iproute2.mk index ba49864b79..a048393b62 100644 --- a/make/iproute2.mk +++ b/make/iproute2.mk @@ -40,7 +40,7 @@ $(IPROUTE2_DIR)/.configured: $(IPROUTE2_DIR)/.unpacked touch $(IPROUTE2_DIR)/.configured $(IPROUTE2_DIR)/tc/tc: $(IPROUTE2_DIR)/.configured - $(MAKE) -C $(IPROUTE2_DIR) KERNEL_INCLUDE=$(LINUX_SOURCE_DIR)/include CC=$(TARGET_CC) + $(MAKE) -C $(IPROUTE2_DIR) KERNEL_INCLUDE=$(LINUX_SOURCE_DIR)/include CC=$(TARGET_CC) AR=$(TARGET_AR) $(TARGET_DIR)/usr/sbin/tc: $(IPROUTE2_DIR)/tc/tc # Copy The tc binary diff --git a/make/kernel-headers.mk b/make/kernel-headers.mk index 183823e478..e2630e1168 100644 --- a/make/kernel-headers.mk +++ b/make/kernel-headers.mk @@ -9,7 +9,7 @@ ifneq ($(filter $(TARGETS),kernel-headers),) LINUX_SITE:=http://www.uclibc.org/downloads/toolchain -LINUX_SOURCE:=kernel-headers-2.4.21.tar.bz2 +LINUX_SOURCE:=kernel-headers-2.2.12.tar.bz2 LINUX_DIR:=$(BUILD_DIR)/linux # Used by pcmcia-cs and others diff --git a/make/links.mk b/make/links.mk index 732fd83396..28c5a9cc40 100644 --- a/make/links.mk +++ b/make/links.mk @@ -4,8 +4,8 @@ # ############################################################# LINKS_SITE:=http://artax.karlin.mff.cuni.cz/~mikulas/vyplody/links/download/no-ssl -LINKS_SOURCE:=links-0.97pre9-no-ssl.tar.gz -LINKS_DIR:=$(BUILD_DIR)/links-0.97pre9-no-ssl +LINKS_SOURCE:=links-0.99pre9-no-ssl.tar.gz +LINKS_DIR:=$(BUILD_DIR)/links-0.99pre9-no-ssl $(DL_DIR)/$(LINKS_SOURCE): $(WGET) -P $(DL_DIR) $(LINKS_SITE)/$(LINKS_SOURCE) diff --git a/make/make.mk b/make/make.mk index 07edd1ea90..ec508fed3b 100644 --- a/make/make.mk +++ b/make/make.mk @@ -38,6 +38,7 @@ $(GNUMAKE_DIR)/.configured: $(GNUMAKE_DIR)/.unpacked --mandir=/usr/man \ --infodir=/usr/info \ $(DISABLE_NLS) \ + $(DISABLE_LARGEFILE) \ ); touch $(GNUMAKE_DIR)/.configured diff --git a/make/openssh.mk b/make/openssh.mk index 98ba9d280e..97fcd161e8 100644 --- a/make/openssh.mk +++ b/make/openssh.mk @@ -39,7 +39,9 @@ $(OPENSSH_DIR)/.configured: $(OPENSSH_DIR)/.unpacked --includedir=$(STAGING_DIR)/include \ --disable-lastlog --disable-utmp \ --disable-utmpx --disable-wtmp --disable-wtmpx \ - --without-x $(DISABLE_NLS) \ + --without-x \ + $(DISABLE_NLS) \ + $(DISABLE_LARGEFILE) \ ); touch $(OPENSSH_DIR)/.configured diff --git a/make/patch.mk b/make/patch.mk index dd5383f30c..a206c9ceb7 100644 --- a/make/patch.mk +++ b/make/patch.mk @@ -38,6 +38,7 @@ $(GNUPATCH_DIR)/.configured: $(GNUPATCH_DIR)/.unpacked --mandir=/usr/man \ --infodir=/usr/info \ $(DISABLE_NLS) \ + $(DISABLE_LARGEFILE) \ ); touch $(GNUPATCH_DIR)/.configured diff --git a/make/sed.mk b/make/sed.mk index 58f3221c4e..c643f5b174 100644 --- a/make/sed.mk +++ b/make/sed.mk @@ -9,6 +9,9 @@ SED_CAT:=zcat SED_DIR:=$(BUILD_DIR)/sed-3.02 SED_BINARY:=sed/sed SED_TARGET_BINARY:=bin/sed +ifeq ($(strip $(BUILD_WITH_LARGEFILE)),true) +SED_CPPFLAGS=-D_FILE_OFFSET_BITS=64 +endif $(DL_DIR)/$(SED_SOURCE): $(WGET) -P $(DL_DIR) $(SED_SITE)/$(SED_SOURCE) @@ -23,6 +26,7 @@ $(SED_DIR)/.configured: $(SED_DIR)/.unpacked (cd $(SED_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ + CPPFLAGS="$(SED_CFLAGS)" \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ diff --git a/make/strace.mk b/make/strace.mk index 833366bfed..196068629d 100644 --- a/make/strace.mk +++ b/make/strace.mk @@ -37,6 +37,7 @@ $(STRACE_DIR)/.configured: $(STRACE_DIR)/.unpacked --mandir=/usr/man \ --infodir=/usr/info \ $(DISABLE_NLS) \ + $(DISABLE_LARGEFILE) \ ); touch $(STRACE_DIR)/.configured diff --git a/make/tar.mk b/make/tar.mk index 5e61a6b66a..c777b58ad2 100644 --- a/make/tar.mk +++ b/make/tar.mk @@ -38,6 +38,7 @@ $(GNUTAR_DIR)/.configured: $(GNUTAR_DIR)/.unpacked --mandir=/usr/man \ --infodir=/usr/info \ $(DISABLE_NLS) \ + $(DISABLE_LARGEFILE) \ ); touch $(GNUTAR_DIR)/.configured diff --git a/make/uclibc.mk b/make/uclibc.mk index 5c0952b109..4c4bc855c2 100644 --- a/make/uclibc.mk +++ b/make/uclibc.mk @@ -54,8 +54,14 @@ endif $(UCLIBC_DIR)/.config sed -ie 's,^SHARED_LIB_LOADER_PREFIX=.*,SHARED_LIB_LOADER_PREFIX=\"/lib\",g' \ $(UCLIBC_DIR)/.config - sed -ie 's,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y\nUCLIBC_HAS_LOCALE=n,g' \ +ifeq ($(strip $(BUILD_WITH_LARGEFILE)),true) + sed -ie "s/^.*UCLIBC_HAS_LFS.*/UCLIBC_HAS_LFS=y/;" \ $(UCLIBC_DIR)/.config +else + sed -ie "s/^.*UCLIBC_HAS_LFS.*/UCLIBC_HAS_LFS=n/;" \ + $(UCLIBC_DIR)/.config +endif + sed -ie 's,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g' $(UCLIBC_DIR)/.config if [ -n "$(strip $(TARGET_SOFT_FLOAT))" ] ; then \ sed -ie 's,.*HAS_FPU.*,HAS_FPU=n\nUCLIBC_HAS_FLOATS=y\nUCLIBC_HAS_SOFT_FLOAT=y,g' \ $(UCLIBC_DIR)/.config; \ diff --git a/make/wtools.mk b/make/wtools.mk index 4289c962c4..4050b1dafa 100644 --- a/make/wtools.mk +++ b/make/wtools.mk @@ -19,7 +19,8 @@ $(WTOOLS_BUILD_DIR)/.configured: $(WTOOLS_BUILD_DIR)/.unpacked touch $(WTOOLS_BUILD_DIR)/.configured $(WTOOLS_BUILD_DIR)/iwconfig: $(WTOOLS_BUILD_DIR)/.configured - $(MAKE) -C $(WTOOLS_BUILD_DIR) KERNEL_SRC=$(BUILD_DIR)/linux CC=$(TARGET_CC) + $(MAKE) -C $(WTOOLS_BUILD_DIR) KERNEL_SRC=$(BUILD_DIR)/linux \ + CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" $(TARGET_DIR)/sbin/iwconfig: $(WTOOLS_BUILD_DIR)/iwconfig # Copy The Wireless Tools -- 2.30.2