Commit 44b170e1 authored by Andy Gibbs's avatar Andy Gibbs Committed by Peter Korsgaard
Browse files

lsof: stop overriding CFLAGS in build 



Closes #2767

lsof compile breaks if CFLAGS overridden in 'make' command line
which is the case since buildroot-2010.08.

lsof has a partial fix for this already in the form of the
'LSOF_CFLAGS_OVERRIDE=1' configure option; however this only
fixes the problem in the generation of the Makefile for liblsof.

This patch does two things: it extends the 'LSOF_CFLAGS_OVERRIDE=1'
configure option to also cover the main Makefile; it also patches
lsof.mk to make use of the LSOF_CFLAGS_OVERRIDE option.

Signed-off-by: default avatarAndy Gibbs <andyg1001@hotmail.co.uk>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 382ade52

CHANGES

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ 
	#2563: [PATCH] cairo: Expose the configure option to disable some...

	#2581: libmms: Update to 0.6, and patch to work on architectures...

	#2707: Can't compile linux kernel using buildroot + crosstool-ng

	#2767: Build for lsof broken in buildroot-2010.08



2010.08: Released August 31th, 2010:

package/lsof/lsof-override-cflags.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
--- lsof_4.81/lsof_4.81_src/Configure	2008-10-21 18:21:45.000000000 +0200

+++ lsof_4.81/lsof_4.81_src/Configure	2010-11-03 14:00:00.000000000 +0100

@@ -5206,6 +5206,10 @@

   cp $LSOF_MKFC ${LSOF_LIB}/$LSOF_LIBMKF

 fi	# }

 cat ./dialects/$LSOF_DIALECT_DIR/$LSOF_REST >> $LSOF_MKFC

+if test "X$LSOF_CFLAGS_OVERRIDE" != "X"	# {

+then

+  sed -i -e 's/^CFLAGS=/override CFLAGS=/' $LSOF_MKFC

+fi	# }

 if test "X$LSOF_LIB_NO" = "X"	# {

 then

package/lsof/lsof.mk

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ $(LSOF_DIR)/.unpacked: $(DL_DIR)/$(LSOF_SOURCE) 
	touch $(LSOF_DIR)/.unpacked



$(LSOF_DIR)/.configured: $(LSOF_DIR)/.unpacked

	(cd $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src; echo n | $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS) $(BR2_LSOF_CFLAGS)" LSOF_INCLUDE="$(LSOF_INCLUDE)" ./Configure linux)

	(cd $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src; echo n | $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS) $(BR2_LSOF_CFLAGS)" LSOF_INCLUDE="$(LSOF_INCLUDE)" LSOF_CFLAGS_OVERRIDE=1 ./Configure linux)

	touch $(LSOF_DIR)/.configured



$(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/$(LSOF_BINARY): $(LSOF_DIR)/.configured