haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

mbedtls: fix include and pkgconfig location

Browse Source
This commit is contained in:
Jérôme Duval
2025-01-26 18:51:14 +01:00
parent abf7b65894
commit bb4793f24d
2 changed files with 46 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
net-libs/mbedtls/mbedtls-2.28.9.recipe
View File

@@ -5,7 +5,7 @@ products, facilitating this functionality with a minimal coding footprint."
HOMEPAGE="https://tls.mbed.org/"
COPYRIGHT="2006-2018 ARM Limited"
LICENSE="Apache v2"
REVISION="1"
REVISION="2"
SOURCE_URI="https://github.com/ARMmbed/mbedtls/archive/mbedtls-$portVersion.tar.gz"
CHECKSUM_SHA256="53231b898f908dde38879bf27a29ddf670dee252dec37681f2c1f83588c0c40e"
SOURCE_DIR="mbedtls-mbedtls-$portVersion"
@@ -59,6 +59,8 @@ PROVIDES_tools="
cmd:key_app_writer = $portVersion
cmd:key_ladder_demo = $portVersion
cmd:key_ladder_demo.sh = $portVersion
cmd:load_roots = $portVersion
cmd:metatest = $portVersion
cmd:mini_client = $portVersion
cmd:mpi_demo = $portVersion
cmd:pem2der = $portVersion
@@ -124,9 +126,7 @@ BUILD()
{
export LDFLAGS="-lnetwork"
cmake -Bbuild -S. -G Ninja -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$prefix \
-DLIB_INSTALL_DIR=$libDir \
-DINCLUDE_INSTALL_DIR=$includeDir \
$cmakeDirArgs \
-DUSE_SHARED_MBEDTLS_LIBRARY=ON \
-DUSE_STATIC_MBEDTLS_LIBRARY=OFF \
-DENABLE_ZLIB_SUPPORT=ON \
@@ -143,6 +143,7 @@ INSTALL()
rm -r $prefix/bin/hello
prepareInstalledDevelLibs libmbedcrypto libmbedtls libmbedx509
fixPkgconfig
packageEntries devel \
"$developDir"

41
net-libs/mbedtls/patches/mbedtls-2.28.9.patchset
View File

@@ -25,3 +25,44 @@ index 11b417b..f501b1e 100644
--
2.45.2
From 64348f202f0545c194bee166c339b0fd1dc7438a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
Date: Sun, 26 Jan 2025 18:50:08 +0100
Subject: use CMAKE_INSTALL_ variables
diff --git a/3rdparty/everest/CMakeLists.txt b/3rdparty/everest/CMakeLists.txt
index d81d995..dcc1442 100644
--- a/3rdparty/everest/CMakeLists.txt
+++ b/3rdparty/everest/CMakeLists.txt
@@ -15,7 +15,7 @@ list(APPEND everest_inc ${CMAKE_CURRENT_SOURCE_DIR}/include/everest ${CMAKE_CURR
if(INSTALL_MBEDTLS_HEADERS)
install(DIRECTORY include/everest
- DESTINATION include
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
FILES_MATCHING PATTERN "*.h")
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index f501b1e..d3ef8f3 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -6,11 +6,11 @@ if(INSTALL_MBEDTLS_HEADERS)
file(GLOB psa_headers "psa/*.h")
install(FILES ${headers}
- DESTINATION ${INCLUDE_INSTALL_DIR}/mbedtls
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mbedtls
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
install(FILES ${psa_headers}
- DESTINATION ${INCLUDE_INSTALL_DIR}/psa
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/psa
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
endif(INSTALL_MBEDTLS_HEADERS)
--
2.45.2