From patchwork Sun Feb 5 22:38:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 724299 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vGls22dGkz9s2Q for ; Mon, 6 Feb 2017 09:39:18 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="I1voeZVi"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CE5D989962; Sun, 5 Feb 2017 22:39:13 +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 Y-04ANQisJvD; Sun, 5 Feb 2017 22:39:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 51759897F9; Sun, 5 Feb 2017 22:39:11 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 0A1521C03CF for ; Sun, 5 Feb 2017 22:39:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 066EF2E5FC for ; Sun, 5 Feb 2017 22:39:09 +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 afcB9eF5kyO4 for ; Sun, 5 Feb 2017 22:39:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by silver.osuosl.org (Postfix) with ESMTPS id 750732EDF8 for ; Sun, 5 Feb 2017 22:39:07 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id v77so18436656wmv.0 for ; Sun, 05 Feb 2017 14:39:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=ufBG/GvZcs/MqS7OsGPNpCSGteRIBf1zkzdYudT+3nQ=; b=I1voeZVioacbcBF9OonJgktD4M7i253/8xhB0zwqSnYfmDeFzuEgtMSWzM7T67la7J +w2U9lv/FGeFfDpqU7SU9cIILc9flX+R1VJOOgS/isJ2eHge8qq3zHA7Aywc3UFxLwZ2 6GnTDZl5HfDCmlrnMHZU1YpeWe68noLNHY1/lCOZCcpaMvgR90B4aYec9dQ9Tn7BGxWn NON0CtXeFxkZCjYUjB7nmnTkZN+R31W7vgrrXQq2yBDjuIFky0ZSvrpe8WhbJ1AxJdi4 QKS37oPujf/Lio8or8lL/E84Eq7JJNtFb0/BfijPJWdeu1WvAB1vKQ7mpNz6Hi803kwB 0ynQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=ufBG/GvZcs/MqS7OsGPNpCSGteRIBf1zkzdYudT+3nQ=; b=Q6OU5e1pqeNGnshK/pVkL1DTf+bgv9szbjQZNQcOvi2upYMyUxlAvPCRXaXaKhwVKG OszqdqCR+NlVWvQhPGbLstV0+Tgiw2VJldufapzIf/5tE1AaBqVXdq8SbjYlIARb+XKb cQcUgU2UdvkD3DjDpxGl1YRFzA9w89GMZ/obXXGDtvtB6aL0PiPqugR1pXfCBb5VYzqA /gN2HuWChwqrFS7GOfNgqlTLixXi+rrrTs08n+Wr95+70Qlg4dmBWLDXbBGRPTOTuwX4 60PnkhYHD+5fudM9qpWifaM0p81TvGx/f9wmRGYie1EEMDxnKAi1+6KglJrk58yMXpgs c03g== X-Gm-Message-State: AMke39l2lmEtTDs2Juf8fqaKis1fVNOQ28cc2NHdsE9Jj+Ot6JyzhhKZR8boew7dQtOqxA== X-Received: by 10.28.179.7 with SMTP id c7mr5855437wmf.128.1486334345589; Sun, 05 Feb 2017 14:39:05 -0800 (PST) Received: from gourin.lan ([2a02:a03f:140d:bb00:c1d9:71bd:6274:56e2]) by smtp.gmail.com with ESMTPSA id y97sm9454791wmh.24.2017.02.05.14.39.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 05 Feb 2017 14:39:04 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sun, 5 Feb 2017 23:38:52 +0100 Message-Id: <1486334332-6520-1-git-send-email-yann.morin.1998@free.fr> X-Mailer: git-send-email 2.7.4 Cc: Bernd Kuhls , "Yann E . MORIN" Subject: [Buildroot] [PATCHv2] 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" From: Bernd Kuhls Replaced patch with better one. Updated license info after https://github.com/Pulse-Eight/platform/commit/a1e5905874d5cdbce110344558d21a2810dead9c Signed-off-by: Bernd Kuhls [Samuel, Yann: fix the 0001 patch] Signed-off-by: Samuel Martin Signed-off-by: Yann E. MORIN --- Changes v1 -> v2: - use the proper methods to find headers and libs (thanks Samuel!) --- .../libplatform/0001-fix-p8-platform-config.patch | 29 ++++++++++++++++ ...nfig.cmake-fix-paths-for-cross-compilatio.patch | 40 ---------------------- package/libplatform/libplatform.hash | 2 +- package/libplatform/libplatform.mk | 8 ++--- 4 files changed, 34 insertions(+), 45 deletions(-) create mode 100644 package/libplatform/0001-fix-p8-platform-config.patch delete mode 100644 package/libplatform/0001-platform-config.cmake-fix-paths-for-cross-compilatio.patch diff --git a/package/libplatform/0001-fix-p8-platform-config.patch b/package/libplatform/0001-fix-p8-platform-config.patch new file mode 100644 index 0000000..ae616fb --- /dev/null +++ b/package/libplatform/0001-fix-p8-platform-config.patch @@ -0,0 +1,29 @@ +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" + + +diff -durN libplatform-2.1.0.orig/p8-platform-config.cmake.in libplatform-2.1.0/p8-platform-config.cmake.in +--- libplatform-2.1.0.orig/p8-platform-config.cmake.in 2016-10-24 11:56:25.000000000 +0200 ++++ libplatform-2.1.0/p8-platform-config.cmake.in 2017-02-05 23:28:36.472697979 +0100 +@@ -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 @@ + 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) 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 89f35bd..0000000 --- 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 8975dfd..e3d5ed5 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 6d54915..d9cd582 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 = GPLv2+, PHP license v3.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 = GPLv2+ +LIBPLATFORM_LICENSE_FILES = src/os.h LIBPLATFORM_INSTALL_STAGING = YES $(eval $(cmake-package))