[uClibc] buildroot facelift

Thomas Lundquist lists at zelow.no
Sun Oct 10 08:56:09 UTC 2004


On Sat, Oct 09, 2004 at 04:26:20PM -0400, Mike Frysinger wrote:
> 
> On Saturday 09 October 2004 03:51 pm, Thomas Lundquist wrote:
> > did you look at the patches?
> 
> i imported the ones that dont involve quoting ...

Thanks. I can see that some of the patches are in.

The bunzip2 patch was not a quoting issue but a s/ifeq/ifneq/ which
makes the commenting inside right. BR2_LARGEFILE should not remove the
BIGFILES settings in the Makefile, so please add this too.

The util-linux patch is also for building without largefile support. It
removes a FILE_OFFSET_BITS CFLAG.

(both DISABLE_NLS and DISABLE_LARGEFILE does not do anything in the
configure part of util-linux.mk but since DISABLE_NLS was there already
I also added DISABLE_LAGREFILE)

> in the future, use the unified patch format (-u) ... context is so hard to 
> read/understand

sorry, had to disable my .cvsrc and forgot to diff correctly.

I've attached new, unified, bzip and util-linux patches.

I also hope the new makefiles is of interest aswell.


Thomas.
-------------- next part --------------
Index: bzip2.mk
===================================================================
RCS file: /var/cvs/buildroot/package/bzip2/bzip2.mk,v
retrieving revision 1.3
diff -u -r1.3 bzip2.mk
--- bzip2.mk	9 Oct 2004 21:18:49 -0000	1.3
+++ bzip2.mk	10 Oct 2004 08:50:41 -0000
@@ -20,7 +20,7 @@
 	$(SED) "s,ln \$$(,ln -sf \$$(,g" $(BZIP2_DIR)/Makefile
 	$(SED) "s,ln -s (lib.*),ln -sf \$$1 ; ln -sf libbz2.so.1.0.2 libbz2.so,g" \
 	    $(BZIP2_DIR)/Makefile-libbz2_so
-ifeq ($(BR2_LARGEFILE),y)
+ifneq ($(BR2_LARGEFILE),y)
 	$(SED) "s,^BIGFILES,#BIGFILES,g" $(BZIP2_DIR)/Makefile
 	$(SED) "s,^BIGFILES,#BIGFILES,g" $(BZIP2_DIR)/Makefile-libbz2_so
 endif
-------------- next part --------------
Index: util-linux.mk
===================================================================
RCS file: /var/cvs/buildroot/package/util-linux/util-linux.mk,v
retrieving revision 1.4
diff -u -r1.4 util-linux.mk
--- util-linux.mk	9 Oct 2004 21:19:38 -0000	1.4
+++ util-linux.mk	10 Oct 2004 08:48:43 -0000
@@ -21,6 +21,10 @@
 	$(UTIL-LINUX_CAT) $(DL_DIR)/$(UTIL-LINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	$(UTIL-LINUX_CAT) $(DL_DIR)/$(UTIL-LINUX_PATCH) | patch -p1 -d $(UTIL-LINUX_DIR)
 	toolchain/patch-kernel.sh $(UTIL-LINUX_DIR) package/util-linux/ util-linux*.patch
+ifneq ($(BR2_LARGEFILE),y)
+	$(SED) "/D_FILE_OFFSET_BITS/ d" $(UTIL-LINUX_DIR)/MCONFIG
+endif
+
 	touch $(UTIL-LINUX_DIR)/.unpacked
 
 $(UTIL-LINUX_DIR)/.configured: $(UTIL-LINUX_DIR)/.unpacked
@@ -40,6 +44,7 @@
 		--mandir=/usr/man \
 		--infodir=/usr/info \
 		$(DISABLE_NLS) \
+		$(DISABLE_LARGEFILE) \
 		ARCH=$(ARCH) \
 	);
 	$(SED) "s,^INSTALLSUID=.*,INSTALLSUID=\\$$\(INSTALL\) -m \\$$\(BINMODE\)," \


More information about the uClibc mailing list