mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
polarssl: bump version.
* hack soname versioning: 1.3.9 compat > 7 can't work. Use 7.3.9 instead.
This commit is contained in:
Jerome Duval
@@ -1,80 +0,0 @@
|
||||
From ec9957b03a66ec7a8656c75bb47f2937f62ff98b Mon Sep 17 00:00:00 2001
|
||||
From: Alexander von Gluck IV <kallisti5@unixzen.com>
|
||||
Date: Sat, 21 Jun 2014 22:37:56 +0000
|
||||
Subject: [PATCH 1/2] library: Link in libnetwork on Haiku
|
||||
|
||||
---
|
||||
library/CMakeLists.txt | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
|
||||
index 86ccee1..1aaa421 100644
|
||||
--- a/library/CMakeLists.txt
|
||||
+++ b/library/CMakeLists.txt
|
||||
@@ -75,6 +75,10 @@ if(WIN32)
|
||||
set(libs ws2_32)
|
||||
endif(WIN32)
|
||||
|
||||
+if(HAIKU)
|
||||
+set(libs network)
|
||||
+endif(HAIKU)
|
||||
+
|
||||
if(CMAKE_COMPILER_IS_GNUCC)
|
||||
set(CMAKE_C_FLAGS_CHECK "${CMAKE_C_FLAGS_CHECK} -Wmissing-declarations -Wmissing-prototypes")
|
||||
set(CMAKE_C_FLAGS_CHECKFULL "${CMAKE_C_FLAGS_CHECK} -Wcast-qual")
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
From cef46eb4f9ac1eec70439bb2069c32884649ba02 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander von Gluck IV <kallisti5@unixzen.com>
|
||||
Date: Sun, 22 Jun 2014 01:17:39 +0000
|
||||
Subject: [PATCH 2/2] cmake: Detect old gcc and adjust flags
|
||||
|
||||
---
|
||||
CMakeLists.txt | 9 ++++++++-
|
||||
tests/CMakeLists.txt | 9 +++++++--
|
||||
2 files changed, 15 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index af268e7..1df9002 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -4,7 +4,14 @@ project(POLARSSL C)
|
||||
string(REGEX MATCH "Clang" CMAKE_COMPILER_IS_CLANG "${CMAKE_C_COMPILER_ID}")
|
||||
|
||||
if(CMAKE_COMPILER_IS_GNUCC)
|
||||
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -W -Wdeclaration-after-statement")
|
||||
+ execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
|
||||
+ OUTPUT_VARIABLE GCC_VERSION)
|
||||
+ if(GCC_VERSION VERSION_GREATER 3.0)
|
||||
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -W -Wdeclaration-after-statement")
|
||||
+ else()
|
||||
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W")
|
||||
+ endif()
|
||||
+
|
||||
set(CMAKE_C_FLAGS_RELEASE "-O2")
|
||||
set(CMAKE_C_FLAGS_DEBUG "-g3 -O0")
|
||||
set(CMAKE_C_FLAGS_COVERAGE "-g3 -O0 --coverage")
|
||||
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
|
||||
index 0460c63..bac1f74 100644
|
||||
--- a/tests/CMakeLists.txt
|
||||
+++ b/tests/CMakeLists.txt
|
||||
@@ -29,8 +29,13 @@ function(add_test_suite suite_name)
|
||||
add_test(${data_name}-suite test_suite_${data_name})
|
||||
endfunction(add_test_suite)
|
||||
|
||||
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function -Wno-unused-value")
|
||||
-set(CMAKE_C_FLAGS_CHECK "${CMAKE_C_FLAGS_CHECK} -Wno-unused-function -Wno-unused-value")
|
||||
+execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
|
||||
+ OUTPUT_VARIABLE GCC_VERSION)
|
||||
+if(GCC_VERSION VERSION_GREATER 3.0)
|
||||
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function -Wno-unused-value")
|
||||
+ set(CMAKE_C_FLAGS_CHECK "${CMAKE_C_FLAGS_CHECK} -Wno-unused-function -Wno-unused-value")
|
||||
+endif()
|
||||
+
|
||||
if(CMAKE_COMPILER_IS_CLANG)
|
||||
set(CMAKE_C_FLAGS_CHECK "${CMAKE_C_FLAGS_CHECK} -Wno-unreachable-code")
|
||||
endif(CMAKE_COMPILER_IS_CLANG)
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
@@ -1,74 +0,0 @@
|
||||
From c2f45c3ce538e84287436cabf461b8fcef130cbe Mon Sep 17 00:00:00 2001
|
||||
From: Alexander von Gluck IV <kallisti5@unixzen.com>
|
||||
Date: Sat, 21 Jun 2014 22:37:56 +0000
|
||||
Subject: library: Link in libnetwork on Haiku
|
||||
|
||||
|
||||
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
|
||||
index bc986ee..5812e35 100644
|
||||
--- a/library/CMakeLists.txt
|
||||
+++ b/library/CMakeLists.txt
|
||||
@@ -77,6 +77,10 @@ if(WIN32)
|
||||
set(libs ws2_32)
|
||||
endif(WIN32)
|
||||
|
||||
+if(HAIKU)
|
||||
+set(libs network)
|
||||
+endif(HAIKU)
|
||||
+
|
||||
if(CMAKE_COMPILER_IS_GNUCC)
|
||||
set(CMAKE_C_FLAGS_CHECK "${CMAKE_C_FLAGS_CHECK} -Wmissing-declarations -Wmissing-prototypes")
|
||||
set(CMAKE_C_FLAGS_CHECKFULL "${CMAKE_C_FLAGS_CHECK} -Wcast-qual")
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
|
||||
From 876ce21944ebe3944ab1bb5d5bfecd7de3ec5738 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander von Gluck IV <kallisti5@unixzen.com>
|
||||
Date: Sun, 22 Jun 2014 01:17:39 +0000
|
||||
Subject: cmake: Detect old gcc and adjust flags
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 86439ad..8778ad4 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -4,7 +4,14 @@ project(POLARSSL C)
|
||||
string(REGEX MATCH "Clang" CMAKE_COMPILER_IS_CLANG "${CMAKE_C_COMPILER_ID}")
|
||||
|
||||
if(CMAKE_COMPILER_IS_GNUCC)
|
||||
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -W -Wdeclaration-after-statement")
|
||||
+ execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
|
||||
+ OUTPUT_VARIABLE GCC_VERSION)
|
||||
+ if(GCC_VERSION VERSION_GREATER 3.0)
|
||||
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -W -Wdeclaration-after-statement")
|
||||
+ else()
|
||||
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W")
|
||||
+ endif()
|
||||
+
|
||||
set(CMAKE_C_FLAGS_RELEASE "-O2")
|
||||
set(CMAKE_C_FLAGS_DEBUG "-g3 -O0")
|
||||
set(CMAKE_C_FLAGS_COVERAGE "-g3 -O0 --coverage")
|
||||
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
|
||||
index b8a125c..9586320 100644
|
||||
--- a/tests/CMakeLists.txt
|
||||
+++ b/tests/CMakeLists.txt
|
||||
@@ -29,8 +29,13 @@ function(add_test_suite suite_name)
|
||||
add_test(${data_name}-suite test_suite_${data_name})
|
||||
endfunction(add_test_suite)
|
||||
|
||||
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function -Wno-unused-value")
|
||||
-set(CMAKE_C_FLAGS_CHECK "${CMAKE_C_FLAGS_CHECK} -Wno-unused-function -Wno-unused-value")
|
||||
+execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
|
||||
+ OUTPUT_VARIABLE GCC_VERSION)
|
||||
+if(GCC_VERSION VERSION_GREATER 3.0)
|
||||
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function -Wno-unused-value")
|
||||
+ set(CMAKE_C_FLAGS_CHECK "${CMAKE_C_FLAGS_CHECK} -Wno-unused-function -Wno-unused-value")
|
||||
+endif()
|
||||
+
|
||||
if(CMAKE_COMPILER_IS_CLANG)
|
||||
set(CMAKE_C_FLAGS_CHECK "${CMAKE_C_FLAGS_CHECK} -Wno-unreachable-code")
|
||||
endif(CMAKE_COMPILER_IS_CLANG)
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
53
dev-libs/polarssl/patches/polarssl-1.3.9.patchset
Normal file
53
dev-libs/polarssl/patches/polarssl-1.3.9.patchset
Normal file
@@ -0,0 +1,53 @@
|
||||
From 2b80e6b0452d7e8ecd6236f2a9d41fa4284d782b Mon Sep 17 00:00:00 2001
|
||||
From: Alexander von Gluck IV <kallisti5@unixzen.com>
|
||||
Date: Sat, 21 Jun 2014 22:37:56 +0000
|
||||
Subject: library: Link in libnetwork on Haiku
|
||||
|
||||
|
||||
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
|
||||
index 33d96b4..ae7f039 100644
|
||||
--- a/library/CMakeLists.txt
|
||||
+++ b/library/CMakeLists.txt
|
||||
@@ -77,6 +77,10 @@ if(WIN32)
|
||||
set(libs ws2_32)
|
||||
endif(WIN32)
|
||||
|
||||
+if(HAIKU)
|
||||
+set(libs network)
|
||||
+endif(HAIKU)
|
||||
+
|
||||
if(CMAKE_COMPILER_IS_GNUCC)
|
||||
set(CMAKE_C_FLAGS_CHECK "${CMAKE_C_FLAGS_CHECK} -Wmissing-declarations -Wmissing-prototypes")
|
||||
set(CMAKE_C_FLAGS_CHECKFULL "${CMAKE_C_FLAGS_CHECK} -Wcast-qual")
|
||||
--
|
||||
2.2.2
|
||||
|
||||
|
||||
From 1a7c1af8548622a8099168aa19292a2f361ada99 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander von Gluck IV <kallisti5@unixzen.com>
|
||||
Date: Sun, 22 Jun 2014 01:17:39 +0000
|
||||
Subject: cmake: Detect old gcc and adjust flags
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 9e1158c..2772a10 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -4,7 +4,13 @@ project(POLARSSL C)
|
||||
string(REGEX MATCH "Clang" CMAKE_COMPILER_IS_CLANG "${CMAKE_C_COMPILER_ID}")
|
||||
|
||||
if(CMAKE_COMPILER_IS_GNUCC)
|
||||
- set(CMAKE_C_FLAGS "-Wall -Wextra -W -Wdeclaration-after-statement -Wlogical-op -Wwrite-strings")
|
||||
+ execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
|
||||
+ OUTPUT_VARIABLE GCC_VERSION)
|
||||
+ if(GCC_VERSION VERSION_GREATER 3.0)
|
||||
+ set(CMAKE_C_FLAGS "-Wall -Wextra -W -Wdeclaration-after-statement -Wlogical-op -Wwrite-strings")
|
||||
+ else()
|
||||
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W")
|
||||
+ endif()
|
||||
set(CMAKE_C_FLAGS_RELEASE "-O2")
|
||||
set(CMAKE_C_FLAGS_DEBUG "-g3 -O0")
|
||||
set(CMAKE_C_FLAGS_COVERAGE "-g3 -O0 --coverage")
|
||||
--
|
||||
2.2.2
|
||||
|
||||
@@ -1,83 +0,0 @@
|
||||
SUMMARY="An easy to understand, use, integrate, and expand SSL library"
|
||||
DESCRIPTION="
|
||||
PolarSSL is a official continuation fork of the XySSL SSL library. \
|
||||
XySSL was created by the french white hat hacker Christophe Devine \
|
||||
and was first released on November 1, 2006 under the GPL and BSD \
|
||||
licenses. The core SSL library is written in C without external \
|
||||
dependencies.
|
||||
"
|
||||
HOMEPAGE="https://www.polarssl.org"
|
||||
SOURCE_URI="https://polarssl.org/download/polarssl-${portVersion}-gpl.tgz"
|
||||
CHECKSUM_SHA256="318171db41335cacbb5b0047c94f1faf91442ab70a223b5223436703c9406ff1"
|
||||
LICENSE="GNU GPL v2"
|
||||
COPYRIGHT="
|
||||
2008-2014 Offspark B.V.
|
||||
"
|
||||
REVISION="1"
|
||||
ARCHITECTURES="?x86_gcc2 x86 x86_64 arm"
|
||||
SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
|
||||
|
||||
PATCHES="polarssl-$portVersion.patchset"
|
||||
|
||||
PROVIDES="
|
||||
polarssl$secondaryArchSuffix = $portVersion compat >= 6
|
||||
lib:libpolarssl$secondaryArchSuffix = $portVersion compat >= 6
|
||||
"
|
||||
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix >= 1.2.3
|
||||
"
|
||||
BUILD_REQUIRES="
|
||||
devel:libz$secondaryArchSuffix >= 1.2.3
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
cmd:gcc${secondaryArchSuffix}
|
||||
cmd:ld${secondaryArchSuffix}
|
||||
cmd:cmake
|
||||
cmd:make
|
||||
cmd:perl >= 5
|
||||
cmd:sed
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
# enable static and shared PolarSSL libraries
|
||||
cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix -DENABLE_PROGRAMS=0 \
|
||||
-DUSE_SHARED_POLARSSL_LIBRARY=1 -DUSE_STATIC_POLARSSL_LIBRARY=1 .
|
||||
|
||||
make ${jobArgs}
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
# move include dir to correct location
|
||||
mkdir -p $(dirname $includeDir)
|
||||
mv $prefix/include $includeDir
|
||||
|
||||
# prepare develop/lib
|
||||
prepareInstalledDevelLibs libpolarssl
|
||||
fixPkgconfig
|
||||
|
||||
# devel package
|
||||
packageEntries devel \
|
||||
$developDir
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
make test
|
||||
}
|
||||
|
||||
# ----- devel package -------------------------------------------------------
|
||||
|
||||
PROVIDES_devel="
|
||||
polarssl${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libpolarssl${secondaryArchSuffix} = $portVersion compat >= 6
|
||||
"
|
||||
REQUIRES_devel="
|
||||
polarssl${secondaryArchSuffix} == $portVersion base
|
||||
"
|
||||
@@ -8,7 +8,7 @@ dependencies.
|
||||
"
|
||||
HOMEPAGE="https://www.polarssl.org"
|
||||
SOURCE_URI="https://polarssl.org/download/polarssl-${portVersion}-gpl.tgz"
|
||||
CHECKSUM_SHA256="6beef0281160bf07fefefd6b412dd1ce4c39261cf5300835aef442253f0400e5"
|
||||
CHECKSUM_SHA256="d3605afc28ed4b7d1d9e3142d72e42855e4a23c07c951bbb0299556b02d36755"
|
||||
LICENSE="GNU GPL v2"
|
||||
COPYRIGHT="
|
||||
2008-2014 Offspark B.V.
|
||||
@@ -20,8 +20,8 @@ SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
|
||||
PATCHES="polarssl-$portVersion.patchset"
|
||||
|
||||
PROVIDES="
|
||||
polarssl$secondaryArchSuffix = $portVersion compat >= 6
|
||||
lib:libpolarssl$secondaryArchSuffix = $portVersion compat >= 6
|
||||
polarssl$secondaryArchSuffix = $portVersion compat >= 1
|
||||
lib:libpolarssl$secondaryArchSuffix = 7.3.9 compat >= 7
|
||||
"
|
||||
|
||||
REQUIRES="
|
||||
@@ -76,7 +76,7 @@ TEST()
|
||||
|
||||
PROVIDES_devel="
|
||||
polarssl${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libpolarssl${secondaryArchSuffix} = $portVersion compat >= 6
|
||||
devel:libpolarssl${secondaryArchSuffix} = 7.3.9 compat >= 7
|
||||
"
|
||||
REQUIRES_devel="
|
||||
polarssl${secondaryArchSuffix} == $portVersion base
|
||||
Reference in New Issue
Block a user