[SCM] Qt 4 packaging branch, experimental, updated. debian/4.7.3-1-13-g5e0f7ab

Fathi Boudra fabo at alioth.debian.org
Sun Jun 12 17:48:25 UTC 2011


The following commit has been merged in the experimental branch:
commit 5e0f7ab84dc7eca46092d56ec8a12d69b2ff32fe
Author: Fathi Boudra <fabo at debian.org>
Date:   Sun Jun 12 20:47:11 2011 +0300

    use explicit variable: gles2_architectures
---
 debian/rules |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index 29dd59e..2886134 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,11 +38,12 @@ ifeq ($(DEB_HOST_ARCH),armhf)
 	extra_configure_opts += -arch armv6
 endif
 
-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), armel armhf))
+gles2_architectures := armel armhf
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
 	extra_configure_opts += -opengl es2
 else
-	extra_configure_opts += -opengl desktop
-	extra_configure_opts += -no-egl
+	extra_configure_opts += -opengl desktop \
+	                        -no-egl
 endif
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list