Since
commit de427857852e7194b9ae80571425ba0d2c29ef55
Author: Luis R. Rodriguez <mcg...@suse.com>
Date: Sun Sep 14 06:05:29 2014 -0700
backports: fix mconf compilation library assumptions
I can't compile mconf on my Ubuntu trusty machine.
This fixes that by making Luis's patch conditional.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumb...@intel.com>
---
backport/kconf/Makefile | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/backport/kconf/Makefile b/backport/kconf/Makefile
index dfd793a..8398f35 100644
--- a/backport/kconf/Makefile
+++ b/backport/kconf/Makefile
@@ -3,7 +3,15 @@ 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,--no-as-needed $(shell ./lxdialog/check-lxdialog.sh
-ldflags $(CC))
+
+RELEASE=$(shell lsb_release -si)
+ifeq ($(RELEASE), Ubuntu)
+ AS_NEEDED=--no-as-needed
+else
+ AS_NEEDED=--add-needed
+endif
+mconf: LDFLAGS = -Wl,$(AS_NEEDED) $(shell ./lxdialog/check-lxdialog.sh
-ldflags $(CC))
+
mconf: CFLAGS += -DCURSES_LOC="<ncurses.h>" -DLOCALE
mconf: mconf.o zconf.tab.o $(LXDIALOG)
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
