Skip to contentSkip to conversation

lsof: stop overriding CFLAGS in build

PATCH New Peter Korsgaard 3 participants 5 messages Nov 4, 2010 – Nov 5, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lsof: stop overriding CFLAGS in build

commit: http://git.buildroot.net/buildroot/commit/?id=44b170e104a6acc527fbcaee19ce63e8e51ea279
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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.

---
 CHANGES                                 |    1 +
 package/lsof/lsof-override-cflags.patch |   13 +++++++++++++
 package/lsof/lsof.mk                    |    2 +-
 3 files changed, 15 insertions(+), 1 deletions(-)
 create mode 100644 package/lsof/lsof-override-cflags.patch
CHANGES +1 -0
index e436f87..6ca25bd 100644
@@ -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 new file +13 -0
new file mode 100644
index 0000000..fcb9292
@@ -0,0 +1,13 @@
+--- 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
index 8deff15..837a88c 100644
@@ -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
Signature · 1 line
1.7.1
#1 lore raw

PATCH 1/1 lsof: stop overriding CFLAGS in build

Quoted 4 lines · On Thu, 4 Nov 2010 17:15:18 +0100 Peter Korsgaard <[email protected]> wrote:

commit: http://git.buildroot.net/buildroot/commit/?id=44b170e104a6acc527fbcaee19ce63e8e51ea279
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Closes #2767

What about "[PATCH 02/10] lsof: convert to gentargets and bump to 4.84" ?

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#2 lore raw

PATCH 1/1 lsof: stop overriding CFLAGS in build

Quoted 3 lines · Thomas Petazzoni

What about "[PATCH 02/10] lsof: convert to gentargets and bump to 4.84" ?

I wasn't able to find the patch you reference, but I downloaded 4.84 and scanning over it quickly, I believe the patch just committed is still required. If you can point me to the patch bumping to 4.84, then I will do some testing, if you wish.

Cheers
Andy

#3 lore raw

PATCH 1/1 lsof: stop overriding CFLAGS in build

Quoted 4 lines · On Thu, 4 Nov 2010 18:09:59 +0100 Andy Gibbs <[email protected]> wrote:

I wasn't able to find the patch you reference, but I downloaded 4.84 and scanning over it quickly, I believe the patch just committed is still required. If you can point me to the patch bumping to 4.84, then I will do some testing, if you wish.

http://lists.busybox.net/pipermail/buildroot/2010-October/038111.html

If you can test and report, that would be great.

Thanks,

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#4 lore raw

PATCH 1/1 lsof: stop overriding CFLAGS in build

Quoted 10 lines · Thomas Petazzoni
Quoted 5 lines

I wasn't able to find the patch you reference, but I downloaded 4.84 and scanning over it quickly, I believe the patch just committed is still required. If you can point me to the patch bumping to 4.84, then I will do
some testing, if you wish.

http://lists.busybox.net/pipermail/buildroot/2010-October/038111.html

If you can test and report, that would be great.

Thomas,

I have tested this patch, but it does still need the LSOF_CFLAGS_OVERRIDE fix.

However, I also had a few additional minor problems running with Martin Banky's patch (even against the current git checkout), so I've done some additional modification on it also. The patch is still based on the work done by Martin, but I've re-enabled the use of the patch system inside GENTARGETS. I have therefore attached this revised patch to this email and full details of the modifications made are in the commit text.

As an additional point of note, Martin's patch removed the uclibc-related patch for lsof. I have kept its deletion in my patch, but I have not had the opportunity to test this particular change as I don't have a uclibc-toolchain/environment in which to test it. I have assumed that this change has been tested already by Martin.

Cheers
Andy

-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: patch.txt
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20101105/5b3a270b/attachment-0001.txt>