[PATCH] xconfig: use pkgconfig to find moc

[PATCH] xconfig: use pkgconfig to find moc

[Yaakov (Cygwin/X)]

From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>

Various schemes exist to allow parallel installations of multiple major
versions of Qt (4.x with the previous 3.x and/or the upcoming 5.x).
QtCore.pc includes a moc_location variable which should be a more reliable
way to find moc.

Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
---
Also applies to all 3.x stable branches

 scripts/kconfig/Makefile |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 7966265..059b5ca 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -260,8 +260,7 @@ $(obj)/.tmp_qtcheck:
 	else \
 	  cflags="\$$(shell pkg-config QtCore QtGui Qt3Support --cflags)"; \
 	  libs="\$$(shell pkg-config QtCore QtGui Qt3Support --libs)"; \
-	  binpath="\$$(shell pkg-config QtCore --variable=prefix)"; \
-	  moc="$$binpath/bin/moc"; \
+	  moc="\$$(shell pkg-config QtCore --variable=moc_location)"; \
 	fi; \
 	echo "KC_QT_CFLAGS=$$cflags" > $@; \
 	echo "KC_QT_LIBS=$$libs" >> $@; \
-- 
1.7.9

Re: [PATCH] xconfig: use pkgconfig to find moc

[Michal Marek]

On Mon, Jun 11, 2012 at 05:56:08PM -0500, Yaakov (Cygwin/X) wrote:
> -	  binpath="\$$(shell pkg-config QtCore --variable=prefix)"; \
> -	  moc="$$binpath/bin/moc"; \
> +	  moc="\$$(shell pkg-config QtCore --variable=moc_location)"; \
>  	fi; \

Could you keep the $$binpath/bin/moc as a fallback, so that make xconfig
works even with old Qt4 releases. We support even Qt3, so let's continue
to be nice to users.

Michal

[PATCH] xconfig: use pkgconfig to find moc

[Yaakov (Cygwin/X)]

From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>

Various schemes exist to allow parallel installations of multiple major
versions of Qt (4.x with the previous 3.x and/or the upcoming 5.x).
QtCore.pc includes a moc_location variable which should be a more reliable
way to find moc.

Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
---
 scripts/kconfig/Makefile |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 7966265..5e2176c 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -260,8 +260,8 @@ $(obj)/.tmp_qtcheck:
 	else \
 	  cflags="\$$(shell pkg-config QtCore QtGui Qt3Support --cflags)"; \
 	  libs="\$$(shell pkg-config QtCore QtGui Qt3Support --libs)"; \
-	  binpath="\$$(shell pkg-config QtCore --variable=prefix)"; \
-	  moc="$$binpath/bin/moc"; \
+	  moc="\$$(shell pkg-config QtCore --variable=moc_location)"; \
+	  [ -n "$$moc" ] || moc="\$$(shell pkg-config QtCore --variable=prefix)/bin/moc"; \
 	fi; \
 	echo "KC_QT_CFLAGS=$$cflags" > $@; \
 	echo "KC_QT_LIBS=$$libs" >> $@; \
-- 
1.7.9

Re: [PATCH] xconfig: use pkgconfig to find moc

[Michal Marek]

On Wed, Jul 04, 2012 at 03:23:29PM -0500, Yaakov (Cygwin/X) wrote:
> From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
> 
> Various schemes exist to allow parallel installations of multiple major
> versions of Qt (4.x with the previous 3.x and/or the upcoming 5.x).
> QtCore.pc includes a moc_location variable which should be a more reliable
> way to find moc.
> 
> Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>

Thanks, applied to kbuild.git#kconfig.

Michal