[RFC] Allow 'make xconfig' to work on FC3 x86_64]

[Ben Greear]

The makefile out-clevers itself and chooses the wrong LIBPATH, causing
the compile of the xconfig tool to fail.  The added check for the lib64
directory and the logic to back out the '../lib64' addition to LIBPATH
makes it work for me...

From talking with HPA, this can break other architectures, like ppc64.

So, I'm hoping that this patch will help someone come up with the
right way to do it, but I do not propose that this *is* the right
way to do it.

In case anyone wants it:
Signed-off-by:  Ben Greear <greearb@xxxxxxxxxxxxxxx>


--- linux-2.6.9/scripts/kconfig/Makefile	2004-10-18 14:55:29.000000000 -0700
+++ linux-2.6.9.p4s/scripts/kconfig/Makefile	2004-11-22 17:43:28.395781962 -0800
@@ -112,7 +112,7 @@

 # QT needs some extra effort...
 $(obj)/.tmp_qtcheck:
-	@set -e; for d in $$QTDIR /usr/share/qt* /usr/lib/qt*; do \
+	@set -e; for d in $$QTDIR /usr/share/qt* /usr/lib64/qt* /usr/lib/qt*; do \
 	  if [ -f $$d/include/qconfig.h ]; then DIR=$$d; break; fi; \
 	done; \
 	if [ -z "$$DIR" ]; then \
@@ -126,6 +126,7 @@
 	LIBPATH=$$DIR/lib; LIB=qt; \
 	$(HOSTCXX) -print-multi-os-directory > /dev/null 2>&1 && \
 	  LIBPATH=$$DIR/lib/$$($(HOSTCXX) -print-multi-os-directory); \
+	if [ ! -d $$LIBPATH ]; then LIBPATH=$$DIR/lib; fi; \
 	if [ -f $$LIBPATH/libqt-mt.so ]; then LIB=qt-mt; fi; \
 	echo "QTDIR=$$DIR" > $@; echo "QTLIBPATH=$$LIBPATH" >> $@; \
 	echo "QTLIB=$$LIB" >> $@; \

--
Ben Greear <greearb@xxxxxxxxxxxxxxx>
Candela Technologies Inc  http://www.candelatech.com

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/