From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262539AbUKWC4R (ORCPT ); Mon, 22 Nov 2004 21:56:17 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262543AbUKWCzZ (ORCPT ); Mon, 22 Nov 2004 21:55:25 -0500 Received: from ns1.lanforge.com ([66.165.47.210]:60392 "EHLO www.lanforge.com") by vger.kernel.org with ESMTP id S262500AbUKWCxV (ORCPT ); Mon, 22 Nov 2004 21:53:21 -0500 Message-ID: <41A2A620.6030702@candelatech.com> Date: Mon, 22 Nov 2004 18:53:20 -0800 From: Ben Greear Organization: Candela Technologies User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.7.3) Gecko/20041020 X-Accept-Language: en-us, en MIME-Version: 1.0 To: linux-kernel Subject: [RFC] Allow 'make xconfig' to work on FC3 x86_64] Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 Candela Technologies Inc http://www.candelatech.com