From 5d2c09c1608ff65332f22864ca0856461c616112 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 25 Aug 2017 21:17:34 +0200 Subject: [PATCH] double_conversion: bump version. --- ....recipe => double_conversion-3.0.0.recipe} | 9 +--- .../patches/double_conversion-sharedlib.patch | 42 ------------------- 2 files changed, 2 insertions(+), 49 deletions(-) rename dev-libs/double-conversion/{double_conversion-2.0.1.recipe => double_conversion-3.0.0.recipe} (87%) delete mode 100644 dev-libs/double-conversion/patches/double_conversion-sharedlib.patch diff --git a/dev-libs/double-conversion/double_conversion-2.0.1.recipe b/dev-libs/double-conversion/double_conversion-3.0.0.recipe similarity index 87% rename from dev-libs/double-conversion/double_conversion-2.0.1.recipe rename to dev-libs/double-conversion/double_conversion-3.0.0.recipe index d4ca20104..09d9f7c49 100644 --- a/dev-libs/double-conversion/double_conversion-2.0.1.recipe +++ b/dev-libs/double-conversion/double_conversion-3.0.0.recipe @@ -5,11 +5,10 @@ been extracted from the V8 JavaScript engine. The code has been refactored and\ HOMEPAGE="https://github.com/google/double-conversion/" COPYRIGHT="2006-2011 the V8 project authors" LICENSE="BSD (3-clause)" -REVISION="2" +REVISION="1" SOURCE_URI="$HOMEPAGE/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="ca9ec6974eaaa29827b916c90666fba3b0b6641030fe2ab34a81e280187acdef" +CHECKSUM_SHA256="152f15355242b6b1fbb4098fcd825bf08527eda0c65e8446939222a13f0b3915" SOURCE_DIR="double-conversion-$portVersion" -PATCHES="double_conversion-sharedlib.patch" ARCHITECTURES="?x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86 ?x86_gcc2" @@ -53,10 +52,6 @@ INSTALL() { make install - mkdir -p $(dirname $includeDir) - mv $libDir/lib/* $libDir - mv $prefix/lib/CMake $libDir/cmake - # prepare develop/lib prepareInstalledDevelLib libdouble-conversion diff --git a/dev-libs/double-conversion/patches/double_conversion-sharedlib.patch b/dev-libs/double-conversion/patches/double_conversion-sharedlib.patch deleted file mode 100644 index e39823fbc..000000000 --- a/dev-libs/double-conversion/patches/double_conversion-sharedlib.patch +++ /dev/null @@ -1,42 +0,0 @@ -commit c7734598e2ee084c17e1b8a41daa569fb021d593 -Author: Florian Loitsch -Date: Sat Mar 8 15:02:13 2014 +0100 - - Support shared libraries with Cmake. Improve README. - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5bf382e..7b09be0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2,8 +2,12 @@ cmake_minimum_required(VERSION 2.8) - project(double-conversion) - - # pick a version # --set(double-conversion_VERSION -- 1.1.1) -+set(double-conversion_VERSION 2.0.1) -+set(double-conversion_SOVERSION_MAJOR 1) -+set(double-conversion_SOVERSION_MINOR 0) -+set(double-conversion_SOVERSION_PATCH 0) -+set(double-conversion_SOVERSION -+ ${double-conversion_SOVERSION_MAJOR}.${double-conversion_SOVERSION_MINOR}.${double-conversion_SOVERSION_PATCH}) - - # set paths for install -- empty initially - # Offer the user the choice of overriding the installation directories -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 7f5c985..0da50b1 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -29,6 +29,12 @@ ${headers} - set_target_properties(double-conversion - PROPERTIES PUBLIC_HEADER "${headers}") - -+if (BUILD_SHARED_LIBS) -+ set_target_properties(double-conversion -+ PROPERTIES VERSION ${double-conversion_SOVERSION} -+ SOVERSION ${double-conversion_SOVERSION_MAJOR}) -+endif() -+ - # - # install command to set up library install - # given the above PUBLIC_HEADER property set, this