From patchwork Mon Apr 17 19:54:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 751490 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3w6Jrx4QThz9s2x for ; Tue, 18 Apr 2017 05:55:13 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 4795430933; Mon, 17 Apr 2017 19:55:10 +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 vt-vGNr36Rv1; Mon, 17 Apr 2017 19:55:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 90D0F30942; Mon, 17 Apr 2017 19:54:49 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id C874D1C2764 for ; Mon, 17 Apr 2017 19:54:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C42EB89DF1 for ; Mon, 17 Apr 2017 19:54:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id X7VNT7HEOm5a for ; Mon, 17 Apr 2017 19:54:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout02.t-online.de (mailout02.t-online.de [194.25.134.17]) by hemlock.osuosl.org (Postfix) with ESMTPS id E3B3189DF0 for ; Mon, 17 Apr 2017 19:54:40 +0000 (UTC) Received: from fwd27.aul.t-online.de (fwd27.aul.t-online.de [172.20.26.132]) by mailout02.t-online.de (Postfix) with SMTP id 6607541B7B30 for ; Mon, 17 Apr 2017 21:54:38 +0200 (CEST) Received: from fli4l.lan.fli4l (rAXyOYZc8hd5gnm50WBXhdvaYBvDaMbXzBljGDpr3d-SieNwLJa8UNIcn8vkrZCgL3@[79.222.106.186]) by fwd27.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1d0CjL-1Zq6tc0; Mon, 17 Apr 2017 21:54:35 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:34688 helo=kuhls.lan.fli4l) by fli4l.lan.fli4l with esmtp (Exim 4.89) (envelope-from ) id 1d0CjK-00062C-LR for buildroot@buildroot.org; Mon, 17 Apr 2017 21:54:35 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Mon, 17 Apr 2017 21:54:01 +0200 Message-Id: <20170417195433.26672-3-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170417195433.26672-1-bernd.kuhls@t-online.de> References: <20170417195433.26672-1-bernd.kuhls@t-online.de> X-ID: rAXyOYZc8hd5gnm50WBXhdvaYBvDaMbXzBljGDpr3d-SieNwLJa8UNIcn8vkrZCgL3 X-TOI-MSGID: 5aa93654-ff11-42ac-9acf-3ed55bf5e493 Subject: [Buildroot] [PATCH v5 02/34] package/libplatform: bump version to 2.1.0 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" Rebased patch 0001. Updated license info after https://github.com/Pulse-Eight/platform/commit/a1e5905874d5cdbce110344558d21a2810dead9c Signed-off-by: Bernd Kuhls Acked-by: "Yann E. MORIN" --- .../0001-p8-platform-config-fix-lookup-paths.patch | 38 ++++++++++++++++++++ ...nfig.cmake-fix-paths-for-cross-compilatio.patch | 40 ---------------------- package/libplatform/libplatform.hash | 2 +- package/libplatform/libplatform.mk | 8 ++--- 4 files changed, 43 insertions(+), 45 deletions(-) create mode 100644 package/libplatform/0001-p8-platform-config-fix-lookup-paths.patch delete mode 100644 package/libplatform/0001-platform-config.cmake-fix-paths-for-cross-compilatio.patch diff --git a/package/libplatform/0001-p8-platform-config-fix-lookup-paths.patch b/package/libplatform/0001-p8-platform-config-fix-lookup-paths.patch new file mode 100644 index 000000000..d487fd942 --- /dev/null +++ b/package/libplatform/0001-p8-platform-config-fix-lookup-paths.patch @@ -0,0 +1,38 @@ +From 01b5478638c705af29f09ad4ed70289f70a21dcf Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Mon, 6 Feb 2017 14:04:47 +0100 +Subject: [PATCH] p8-platform-config: fix lookup paths + +Use the proper methods to find the headers and the library. + +Signed-off-by: Samuel Martin +Signed-off-by: "Yann E. MORIN" +--- + p8-platform-config.cmake.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/p8-platform-config.cmake.in b/p8-platform-config.cmake.in +index 47f30f1..f59418d 100644 +--- a/p8-platform-config.cmake.in ++++ b/p8-platform-config.cmake.in +@@ -10,7 +10,7 @@ + # + # propagate these properties from one build system to the other + set (p8-platform_VERSION "@p8-platform_VERSION_MAJOR@.@p8-platform_VERSION_MINOR@") +-set (p8-platform_INCLUDE_DIRS @p8-platform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX@/include) ++find_path (p8-platform_INCLUDE_DIRS p8-platform/os.h) + set (p8-platform_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@") + set (p8-platform_LINKER_FLAGS "@p8-platform_LINKER_FLAGS@") + set (p8-platform_CONFIG_VARS "@p8-platform_CONFIG_VARS@") +@@ -19,7 +19,7 @@ set (p8-platform_CONFIG_VARS "@p8-platform_CONFIG_VARS@") + if(WIN32) + set (p8-platform_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/p8-platform.lib") + else(WIN32) +- set (p8-platform_LIBRARY "-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lp8-platform") ++ find_library (p8-platform_LIBRARY p8-platform) + endif(WIN32) + set (p8-platform_LIBRARIES ${p8-platform_LIBRARY} "@p8-platform_LIBRARIES@") + mark_as_advanced (p8-platform_LIBRARY) +-- +2.7.4 + diff --git a/package/libplatform/0001-platform-config.cmake-fix-paths-for-cross-compilatio.patch b/package/libplatform/0001-platform-config.cmake-fix-paths-for-cross-compilatio.patch deleted file mode 100644 index 89f35bdb3..000000000 --- a/package/libplatform/0001-platform-config.cmake-fix-paths-for-cross-compilatio.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 65ba437ed5514dd5762a796d349ed5db49e40fe7 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 29 Jul 2015 21:26:16 +0200 -Subject: [PATCH] platform-config.cmake: fix paths for cross-compilation - -Headers and library paths in platform-config.cmake must take into -account ${CMAKE_FIND_ROOT_PATH} to work in cross-compilation. - -Signed-off-by: Thomas Petazzoni ---- - platform-config.cmake.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/platform-config.cmake.in b/platform-config.cmake.in -index 7fe35fe..78b5085 100644 ---- a/platform-config.cmake.in -+++ b/platform-config.cmake.in -@@ -10,16 +10,16 @@ - # - # propagate these properties from one build system to the other - set (platform_VERSION "@platform_VERSION_MAJOR@.@platform_VERSION_MINOR@") --set (platform_INCLUDE_DIRS @platform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX@/include) -+set (platform_INCLUDE_DIRS ${CMAKE_FIND_ROOT_PATH}/@platform_INCLUDE_DIRS@ ${CMAKE_FIND_ROOT_PATH}/@CMAKE_INSTALL_PREFIX@/include) - set (platform_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@") - set (platform_LINKER_FLAGS "@platform_LINKER_FLAGS@") - set (platform_CONFIG_VARS "@platform_CONFIG_VARS@") - - # libraries come from the build tree where this file was generated - if(WIN32) -- set (platform_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/platform.lib") -+ set (platform_LIBRARY "${CMAKE_FIND_ROOT_PATH}/@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/platform.lib") - else(WIN32) -- set (platform_LIBRARY "-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lplatform") -+ set (platform_LIBRARY "-L${CMAKE_FIND_ROOT_PATH}/@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lplatform") - endif(WIN32) - set (platform_LIBRARIES ${platform_LIBRARY} "@platform_LIBRARIES@") - mark_as_advanced (platform_LIBRARY) --- -2.5.0 - diff --git a/package/libplatform/libplatform.hash b/package/libplatform/libplatform.hash index 8975dfd8a..e3d5ed5a9 100644 --- a/package/libplatform/libplatform.hash +++ b/package/libplatform/libplatform.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 3603ead8b16a48cb35b1e6dea330a693f10552b1a6ea036c5db9ec248cd8baf5 libplatform-feafe68e3e0b02c3261aefb3d711863ef6fadd38.tar.gz +sha256 88711f1b949285867538a0b2e4189532778e1515325dfa1851eae9d18b6affd9 libplatform-2.1.0.tar.gz diff --git a/package/libplatform/libplatform.mk b/package/libplatform/libplatform.mk index d0137994d..ce3609346 100644 --- a/package/libplatform/libplatform.mk +++ b/package/libplatform/libplatform.mk @@ -4,10 +4,10 @@ # ################################################################################ -LIBPLATFORM_VERSION = feafe68e3e0b02c3261aefb3d711863ef6fadd38 -LIBPLATFORM_SITE = $(call github,Pulse-Eight,platform,$(LIBPLATFORM_VERSION)) -LIBPLATFORM_LICENSE = GPL-2.0+, PHP-3.01 -LIBPLATFORM_LICENSE_FILES = src/os.h src/util/fstrcmp.c +LIBPLATFORM_VERSION = 2.1.0 +LIBPLATFORM_SITE = $(call github,Pulse-Eight,platform,p8-platform-$(LIBPLATFORM_VERSION)) +LIBPLATFORM_LICENSE = GPL-2.0+ +LIBPLATFORM_LICENSE_FILES = src/os.h LIBPLATFORM_INSTALL_STAGING = YES $(eval $(cmake-package))