Commit dfc78642 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] kconfig: fix xconfig on /lib64 properly

From: Roman Zippel <zippel@linux-m68k.org>

The correct link path is needed at config time to find the correct library,
so let's ask gcc for the real path.
parent 10f0bf6b
...@@ -8,7 +8,7 @@ xconfig: $(obj)/qconf ...@@ -8,7 +8,7 @@ xconfig: $(obj)/qconf
$< arch/$(ARCH)/Kconfig $< arch/$(ARCH)/Kconfig
gconfig: $(obj)/gconf gconfig: $(obj)/gconf
./$< arch/$(ARCH)/Kconfig $< arch/$(ARCH)/Kconfig
menuconfig: $(obj)/mconf menuconfig: $(obj)/mconf
$(Q)$(MAKE) $(build)=scripts/lxdialog $(Q)$(MAKE) $(build)=scripts/lxdialog
...@@ -95,7 +95,7 @@ clean-files := libkconfig.so lkc_defs.h qconf.moc .tmp_qtcheck \ ...@@ -95,7 +95,7 @@ clean-files := libkconfig.so lkc_defs.h qconf.moc .tmp_qtcheck \
HOSTCFLAGS_lex.zconf.o := -I$(src) HOSTCFLAGS_lex.zconf.o := -I$(src)
HOSTCFLAGS_zconf.tab.o := -I$(src) HOSTCFLAGS_zconf.tab.o := -I$(src)
HOSTLOADLIBES_qconf = -L$(QTDIR)/lib -L$(QTDIR)/lib64 -Wl,-rpath,$(QTDIR)/lib -l$(QTLIB) -ldl HOSTLOADLIBES_qconf = -L$(QTLIBPATH) -Wl,-rpath,$(QTLIBPATH) -l$(QTLIB) -ldl
HOSTCXXFLAGS_qconf.o = -I$(QTDIR)/include HOSTCXXFLAGS_qconf.o = -I$(QTDIR)/include
HOSTLOADLIBES_gconf = `pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --libs` HOSTLOADLIBES_gconf = `pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --libs`
...@@ -107,6 +107,7 @@ $(obj)/qconf.o: $(obj)/.tmp_qtcheck ...@@ -107,6 +107,7 @@ $(obj)/qconf.o: $(obj)/.tmp_qtcheck
ifeq ($(qconf-target),1) ifeq ($(qconf-target),1)
MOC = $(QTDIR)/bin/moc MOC = $(QTDIR)/bin/moc
QTLIBPATH = $(QTDIR)/lib
-include $(obj)/.tmp_qtcheck -include $(obj)/.tmp_qtcheck
# QT needs some extra effort... # QT needs some extra effort...
...@@ -122,9 +123,12 @@ $(obj)/.tmp_qtcheck: ...@@ -122,9 +123,12 @@ $(obj)/.tmp_qtcheck:
echo "*"; \ echo "*"; \
false; \ false; \
fi; \ fi; \
LIB=qt; \ LIBPATH=$$DIR/lib; LIB=qt; \
if [ -f $$DIR/lib/libqt-mt.so ]; then LIB=qt-mt; fi; \ $(HOSTCXX) -print-multi-os-directory > /dev/null 2>&1 && \
echo "QTDIR=$$DIR" > $@; echo "QTLIB=$$LIB" >> $@; \ LIBPATH=$$DIR/lib/$$($(HOSTCXX) -print-multi-os-directory); \
if [ -f $$LIBPATH/libqt-mt.so ]; then LIB=qt-mt; fi; \
echo "QTDIR=$$DIR" > $@; echo "QTLIBPATH=$$LIBPATH" >> $@; \
echo "QTLIB=$$LIB" >> $@; \
if [ ! -x $$DIR/bin/moc -a -x /usr/bin/moc ]; then \ if [ ! -x $$DIR/bin/moc -a -x /usr/bin/moc ]; then \
echo "*"; \ echo "*"; \
echo "* Unable to find $$DIR/bin/moc, using /usr/bin/moc instead."; \ echo "* Unable to find $$DIR/bin/moc, using /usr/bin/moc instead."; \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment