diff options
| author | Andy Gibbs <andyg1001@hotmail.co.uk> | 2010-11-03 15:09:24 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-11-04 17:15:18 +0100 |
| commit | 44b170e104a6acc527fbcaee19ce63e8e51ea279 (patch) | |
| tree | 56f8c325c286dc01433d7588c02336c5cc7b56cf /package/lsof | |
| parent | 382ade52a5275c1e84882afc46f2aa2e8259bc19 (diff) | |
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: Andy Gibbs <andyg1001@hotmail.co.uk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/lsof')
| -rw-r--r-- | package/lsof/lsof-override-cflags.patch | 13 | ||||
| -rw-r--r-- | package/lsof/lsof.mk | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/package/lsof/lsof-override-cflags.patch b/package/lsof/lsof-override-cflags.patch new file mode 100644 index 000000000..fcb929262 --- /dev/null +++ b/package/lsof/lsof-override-cflags.patch @@ -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 + diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk index 8deff15f1..837a88c2e 100644 --- a/package/lsof/lsof.mk +++ b/package/lsof/lsof.mk @@ -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 |