From 075633e2ca00434f723afc49e1fece21b0676726 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Sat, 18 Jan 2003 22:39:31 +0000
Subject: [PATCH] A few cflags and comment fixups

---
 make/ext2root.mk | 3 ++-
 make/linux.mk    | 3 ++-
 make/mkdosfs.mk  | 2 +-
 make/newt.mk     | 5 +++--
 make/zlib.mk     | 5 +++--
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/make/ext2root.mk b/make/ext2root.mk
index ad0dd1db53..bcc7b6e464 100644
--- a/make/ext2root.mk
+++ b/make/ext2root.mk
@@ -17,7 +17,8 @@ $(GENEXT2_DIR): $(DL_DIR)/$(GENEXT2_SOURCE) $(GENEXT2_PATCH)
 	cat $(GENEXT2_PATCH) | patch -p1 -d $(GENEXT2_DIR)
 
 $(GENEXT2_DIR)/genext2fs: $(GENEXT2_DIR)
-	$(MAKE) CFLAGS="-Wall -O2 -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64" -C $(GENEXT2_DIR);
+	$(MAKE) CFLAGS="Wall -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE \
+		-D_FILE_OFFSET_BITS=64" -C $(GENEXT2_DIR);
 	touch -c $(GENEXT2_DIR)/genext2fs
 
 genext2fs: $(GENEXT2_DIR)/genext2fs
diff --git a/make/linux.mk b/make/linux.mk
index 9fe3e66db5..f2b2b3304c 100644
--- a/make/linux.mk
+++ b/make/linux.mk
@@ -2,7 +2,7 @@
 #
 # Linux kernel targets
 #
-# Note:  If you have any patched to apply, create the directory
+# Note:  If you have any patches to apply, create the directory
 # sources/kernel-patches and put your patches in there and number
 # them in the order you wish to apply them...  i.e.
 #
@@ -12,6 +12,7 @@
 #   sources/kernel-patches/030-lowlatency-mini.bz2
 #   sources/kernel-patches/031-lowlatency-fixes-5.bz2
 #   sources/kernel-patches/099-shutup.bz2
+#   etc...
 #
 # these patches will all be applied by the patch-kernel.sh
 # script (which will also abort the build if it finds rejects)
diff --git a/make/mkdosfs.mk b/make/mkdosfs.mk
index a3132686bd..8fba46e87b 100644
--- a/make/mkdosfs.mk
+++ b/make/mkdosfs.mk
@@ -10,7 +10,7 @@ MKDOSFS_CAT:=zcat
 MKDOSFS_BINARY:=mkdosfs/mkdosfs
 MKDOSFS_TARGET_BINARY:=sbin/mkdosfs
 ifeq ($(strip $(BUILD_WITH_LARGEFILE)),true)
-MKDOSFS_CFLAGS="-Os -g -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64"
+MKDOSFS_CFLAGS="-Os -g -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
 else
 MKDOSFS_CFLAGS="-Os -g"
 endif
diff --git a/make/newt.mk b/make/newt.mk
index 56fba9ea05..ac0c3a1cfd 100644
--- a/make/newt.mk
+++ b/make/newt.mk
@@ -8,10 +8,11 @@ NEWT_SITE=http://ftp.debian.org/debian/pool/main/n/newt
 NEWT_DIR=$(BUILD_DIR)/newt-0.50.17
 NEWT_PATCH=$(SOURCE_DIR)/newt.patch
 ifeq ($(strip $(BUILD_WITH_LARGEFILE)),true)
-NEWT_CFLAGS="-Os -g -fPIC -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64"
+NEWT_CFLAGS="-Os -g -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
 else
-NEWT_CFLAGS="-Os -g -fPIC"
+NEWT_CFLAGS="-Os -g"
 endif
+NEWT_CFLAGS+="-fPIC"
 
 $(DL_DIR)/$(NEWT_SOURCE):
 	$(WGET) -P $(DL_DIR) $(NEWT_SITE)/$(NEWT_SOURCE)
diff --git a/make/zlib.mk b/make/zlib.mk
index 8de9b5b4c8..74a7fb2dc3 100644
--- a/make/zlib.mk
+++ b/make/zlib.mk
@@ -7,10 +7,11 @@ ZLIB_SOURCE=zlib-1.1.4.tar.bz2
 ZLIB_SITE=http://telia.dl.sourceforge.net/sourceforge/libpng
 ZLIB_DIR=$(BUILD_DIR)/zlib-1.1.4
 ifeq ($(strip $(BUILD_WITH_LARGEFILE)),true)
-ZLIB_CFLAGS="-Os -g -fPIC -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64"
+ZLIB_CFLAGS="-Os -g -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
 else
-ZLIB_CFLAGS="-Os -g -fPIC"
+ZLIB_CFLAGS="-Os -g"
 endif
+ZLIB_CFLAGS+="-fPIC"
 
 $(DL_DIR)/$(ZLIB_SOURCE):
 	$(WGET) -P $(DL_DIR) $(ZLIB_SITE)/$(ZLIB_SOURCE)
-- 
2.30.2