From patchwork Sun Nov 9 23:38:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zoltan Gyarmati X-Patchwork-Id: 408628 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 48E001400EA for ; Mon, 10 Nov 2014 10:38:17 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id AF84E33096; Sun, 9 Nov 2014 23:38:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OKOMizF+gSjW; Sun, 9 Nov 2014 23:38:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id D333B2FDF0; Sun, 9 Nov 2014 23:38:14 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id B27601C259F for ; Sun, 9 Nov 2014 23:38:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AB98491820 for ; Sun, 9 Nov 2014 23:38:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id f-rJGAkztZzG for ; Sun, 9 Nov 2014 23:38:12 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f41.google.com (mail-wg0-f41.google.com [74.125.82.41]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7154F91818 for ; Sun, 9 Nov 2014 23:38:12 +0000 (UTC) Received: by mail-wg0-f41.google.com with SMTP id k14so7557873wgh.0 for ; Sun, 09 Nov 2014 15:38:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=HDEHQ4DhvPzA7RT4UJZE43nFWKFMe7E5A3MMtIUi0Wg=; b=rYFNzazGmxvPDU2yFpVSgCykcdSh6nmVXAU1H7SzOErw3woSlo2B/y7Y979I0fzij8 NxhCW8RsgiJ53TI8E7/ob6OzUzSvgWIRaV36W+zoNJRrbE95dX6w5LfRXy9+bNaD1EfD hL1I01rxNIu2bRCXEFSdQaTMJw9rATdXUvSvMzApmSTTlJpDFIlNWBsECzsDpblXKyPu lyUtBikOOqUVhSAJGN6QQX8Qm92guMBk0CrNhirQzUt4yw6obYcB5nnEf4N7TKIsHJye JkmRddi5OA43yA4PwuSU+V+8p2mYfq7qAiIhTz4P/rCUQYZvmWeVmLzOh/z0WyzOGccZ JxTw== X-Received: by 10.194.205.132 with SMTP id lg4mr36555165wjc.84.1415576290912; Sun, 09 Nov 2014 15:38:10 -0800 (PST) Received: from localhost.localdomain (g229139119.adsl.alicedsl.de. [92.229.139.119]) by mx.google.com with ESMTPSA id fq1sm11174439wib.12.2014.11.09.15.38.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 09 Nov 2014 15:38:10 -0800 (PST) From: Zoltan Gyarmati To: buildroot@buildroot.org Date: Mon, 10 Nov 2014 00:38:04 +0100 Message-Id: <1415576284-18846-1-git-send-email-mr.zoltan.gyarmati@gmail.com> X-Mailer: git-send-email 2.1.0 Subject: [Buildroot] [PATCH 1/1] grantlee: version bump and allow building with qt5 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Zoltan Gyarmati --- package/grantlee/Config.in | 14 ++++---- .../grantlee-0.2.0-fix-lphread-link-error.patch | 42 ---------------------- package/grantlee/grantlee.mk | 15 ++++++-- 3 files changed, 20 insertions(+), 51 deletions(-) delete mode 100644 package/grantlee/grantlee-0.2.0-fix-lphread-link-error.patch diff --git a/package/grantlee/Config.in b/package/grantlee/Config.in index ce1342c..8f763f7 100644 --- a/package/grantlee/Config.in +++ b/package/grantlee/Config.in @@ -1,11 +1,13 @@ config BR2_PACKAGE_GRANTLEE bool "grantlee" - depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT - depends on BR2_PACKAGE_QT - select BR2_PACKAGE_QT_STL - select BR2_PACKAGE_QT_SCRIPT - select BR2_PACKAGE_QT_GUI_MODULE + depends on (BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT && BR2_PACKAGE_QT) || BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT_STL if BR2_PACKAGE_QT + select BR2_PACKAGE_QT_SCRIPT if BR2_PACKAGE_QT + select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT + select BR2_PACKAGE_QT5SCRIPT if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 help - Qt implemantation of the Django template framework + Qt implementation of the Django template framework http://www.grantlee.org + diff --git a/package/grantlee/grantlee-0.2.0-fix-lphread-link-error.patch b/package/grantlee/grantlee-0.2.0-fix-lphread-link-error.patch deleted file mode 100644 index 7964fd0..0000000 --- a/package/grantlee/grantlee-0.2.0-fix-lphread-link-error.patch +++ /dev/null @@ -1,42 +0,0 @@ -From d46475b6bb9d99a4c5c95489be6c14d0d219d5f8 Mon Sep 17 00:00:00 2001 -From: Zoltan Gyarmati -Date: Thu, 15 Nov 2012 17:00:39 +0100 -Subject: [PATCH] fix -lpthread build error - -Fixing linking time error with certain toolchains. The issue caused by a missing explicit linking to -libpthread. The failed buildlog: -Linking CXX executable testgenerictypes_exec -/home/buildroot12git/output/host/usr/lib/gcc/arm-buildroot-linux-uclibcgnueabi/4.6.3/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/buildroot12git/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libQtCore.so: undefined reference to symbol 'pthread_cancel' -/home/buildroot12git/output/host/usr/lib/gcc/arm-buildroot-linux-uclibcgnueabi/4.6.3/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: note: 'pthread_cancel' is defined in DSO /home/buildroot12git/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/lib/libpthread.so.0 so try adding it to the linker command line -/home/buildroot12git/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/lib/libpthread.so.0: could not read symbols: Invalid operation -collect2: ld returned 1 exit status -make[3]: *** [templates/tests/testgenerictypes_exec] Error 1 -make[3]: Leaving directory `/home/buildroot12git/output/build/grantlee-0.2.0' -make[2]: *** [templates/tests/CMakeFiles/testgenerictypes_exec.dir/all] Error 2 -make[2]: Leaving directory `/home/buildroot12git/output/build/grantlee-0.2.0' -make[1]: *** [all] Error 2 -make[1]: Leaving directory `/home/buildroot12git/output/build/grantlee-0.2.0' -make: *** [/home/buildroot12git/output/build/grantlee-0.2.0/.stamp_built] Error - -Signed-off-by: Zoltan Gyarmati ---- - templates/tests/CMakeLists.txt | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/templates/tests/CMakeLists.txt b/templates/tests/CMakeLists.txt -index caab003..f400622 100644 ---- a/templates/tests/CMakeLists.txt -+++ b/templates/tests/CMakeLists.txt -@@ -68,7 +68,8 @@ macro(GRANTLEE_TEMPLATES_UNIT_TESTS) - ${_testresource_rcc_src} - ) - add_test(${_testname} ${_testname}_exec ) -- target_link_libraries(${_testname}_exec ${QT_QTTEST_LIBRARY} grantlee_core ) -+ find_package (Threads) -+ target_link_libraries(${_testname}_exec ${QT_QTTEST_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} grantlee_core ) - - set_property(GLOBAL APPEND PROPERTY TEST_COVERAGE "${CMAKE_CURRENT_BINARY_DIR}/${_testname}_exec" ) - endforeach(_testname) --- -1.7.9.5 - diff --git a/package/grantlee/grantlee.mk b/package/grantlee/grantlee.mk index 539578b..a300106 100644 --- a/package/grantlee/grantlee.mk +++ b/package/grantlee/grantlee.mk @@ -3,12 +3,21 @@ # grantlee # ################################################################################ - -GRANTLEE_VERSION = 0.2.0 +# qt4 support dropped after 0.5.1, so we use the older version for qt4 +ifeq ($(BR2_PACKAGE_QT),y) +GRANTLEE_VERSION = 0.5.1 +else ifeq ($(BR2_PACKAGE_QT5),y) +GRANTLEE_VERSION = 5.0.0 +endif GRANTLEE_SITE = http://downloads.grantlee.org GRANTLEE_INSTALL_STAGING = YES -GRANTLEE_DEPENDENCIES = qt GRANTLEE_LICENSE = LGPLv2.1+ GRANTLEE_LICENSE_FILES = COPYING.LIB +ifeq ($(BR2_PACKAGE_QT),y) +GRANTLEE_DEPENDENCIES = qt +else ifeq ($(BR2_PACKAGE_QT5),y) +GRANTLEE_DEPENDENCIES += qt5base qt5script +endif + $(eval $(cmake-package))