From patchwork Fri Sep 10 17:01:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Stein X-Patchwork-Id: 170292 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8AH11AL009468 for ; Fri, 10 Sep 2010 17:01:28 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755956Ab0IJRB2 (ORCPT ); Fri, 10 Sep 2010 13:01:28 -0400 Received: from jack.hrz.tu-chemnitz.de ([134.109.132.46]:36231 "EHLO jack.hrz.tu-chemnitz.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755492Ab0IJRB1 (ORCPT ); Fri, 10 Sep 2010 13:01:27 -0400 Received: from 77-64-132-120.dynamic.primacom.net ([77.64.132.120] helo=kongar.lan.local) by jack.hrz.tu-chemnitz.de with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1Ou6yb-0000jV-MN; Fri, 10 Sep 2010 19:01:26 +0200 From: Alexander Stein To: linux-kbuild@vger.kernel.org Cc: Randy Dunlap , Alexander Stein , Michal Marek Subject: [PATCH] Fix QT4 moc, cflags libs detection on dual QT3/Qt4 systems Date: Fri, 10 Sep 2010 19:01:14 +0200 Message-Id: <1284138074-7287-1-git-send-email-alexander.stein@informatik.tu-chemnitz.de> X-Mailer: git-send-email 1.7.2.2 X-Spam-Score: -0.9 (/) X-Spam-Report: --- Textanalyse SpamAssassin 3.3.1 (-0.9 Punkte) Fragen an/questions to: Postmaster TU Chemnitz * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP * 0.1 TVD_RCVD_IP TVD_RCVD_IP --- Ende Textanalyse X-Scan-Signature: 1eda448be3d4df409c597eaefe2c9e50 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 10 Sep 2010 17:01:29 +0000 (UTC) diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index cef3f75..996059e 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -273,12 +273,10 @@ $(obj)/.tmp_qtcheck: moc="/usr/bin/moc"; \ fi; \ else \ - headerpath="\$$(shell qmake -query QT_INSTALL_HEADERS)"; \ - libpath="\$$(shell qmake -query QT_INSTALL_LIBS)"; \ - binpath="\$$(shell qmake -query QT_INSTALL_BINS)"; \ - cflags="-I$$headerpath -I$$headerpath/QtCore -I$$headerpath/QtGui -I$$headerpath/Qt3Support -DQT3_SUPPORT"; \ - libs="-L$$libpath -Wl,-rpath,$$libpath -lQtCore -lQtGui -lQt3Support"; \ - moc="$$binpath/moc"; \ + cflags="\$$(shell pkg-config QtCore --cflags) \$$(shell pkg-config QtGui --cflags) \$$(shell pkg-config Qt3Support --cflags)"; \ + libs="\$$(shell pkg-config QtCore --libs) \$$(shell pkg-config QtGui --libs) \$$(shell pkg-config Qt3Support --libs)"; \ + binpath="\$$(shell pkg-config QtCore --variable=prefix)"; \ + moc="$$binpath/bin/moc"; \ fi; \ echo "KC_QT_CFLAGS=$$cflags" > $@; \ echo "KC_QT_LIBS=$$libs" >> $@; \