From aca50d04d966ac9ff02b9142b6d485cd79cba22a Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Fri, 14 Nov 2014 13:49:42 -0800 Subject: [PATCH] backports: fix mconf for old version of ubuntu This fix was originally provided by Johannes. This replaces the linker adhoc fix to match more with what we do upstream without requiring the use of HOSTLOADLIBES. Signed-off-by: Luis R. Rodriguez --- backport/kconf/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/backport/kconf/Makefile b/backport/kconf/Makefile index b307c6570fd0..9edd957af089 100644 --- a/backport/kconf/Makefile +++ b/backport/kconf/Makefile @@ -3,9 +3,12 @@ CFLAGS=-Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer LXDIALOG := lxdialog/checklist.o lxdialog/inputbox.o lxdialog/menubox.o lxdialog/textbox.o lxdialog/util.o lxdialog/yesno.o conf: conf.o zconf.tab.o -mconf: LDFLAGS = -Wl,--add-needed $(shell ./lxdialog/check-lxdialog.sh -ldflags $(CC)) -mconf: CFLAGS += -DCURSES_LOC="" -DLOCALE +mconf_CFLAGS := $(shell ./lxdialog/check-lxdialog.sh -ccflags) -DLOCALE +mconf_LDFLAGS := $(shell ./lxdialog/check-lxdialog.sh -ldflags $(CC)) +mconf: CFLAGS += $(mconf_CFLAGS) + mconf: mconf.o zconf.tab.o $(LXDIALOG) + $(CC) -o mconf $^ $(mconf_LDFLAGS) .PHONY: clean clean: -- 2.30.2