security/libhydrogen: Update to 0.0.0.g20241103

Changes:	https://github.com/jedisct1/libhydrogen/commits/master
This commit is contained in:
Po-Chuan Hsieh 2024-12-26 02:46:42 +08:00
parent 6c714345cb
commit 4ff18d3a41
No known key found for this signature in database
GPG key ID: 9A4BD10F002DD04B
4 changed files with 9 additions and 58 deletions

View file

@ -1,6 +1,5 @@
PORTNAME= libhydrogen
PORTVERSION= 0.0.0.g20240509
PORTREVISION= 1
PORTVERSION= 0.0.0.g20241103
CATEGORIES= security
MAINTAINER= sunpoet@FreeBSD.org
@ -10,10 +9,12 @@ WWW= https://github.com/jedisct1/libhydrogen
LICENSE= ISCL
LICENSE_FILE= ${WRKSRC}/LICENSE
USES= cmake
USES= meson
MESON_ARGS= --default-library=both
USE_GITHUB= yes
GH_ACCOUNT= jedisct1
GH_TAGNAME= c18e510
GH_TAGNAME= 576a38b
.include <bsd.port.mk>

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1726080915
SHA256 (jedisct1-libhydrogen-0.0.0.g20240509-c18e510_GH0.tar.gz) = 44e155d56a45cea83e7d838ad2b0c7757d83bcddff3d80663c510d77e365fc17
SIZE (jedisct1-libhydrogen-0.0.0.g20240509-c18e510_GH0.tar.gz) = 45819
TIMESTAMP = 1734888070
SHA256 (jedisct1-libhydrogen-0.0.0.g20241103-576a38b_GH0.tar.gz) = f9081648972f9c41f6eccb5052fb4f007e3a38b42d7fbcdc46934f00a7b00daa
SIZE (jedisct1-libhydrogen-0.0.0.g20241103-576a38b_GH0.tar.gz) = 45785

View file

@ -1,48 +0,0 @@
--- CMakeLists.txt.orig 2024-05-09 19:42:48 UTC
+++ CMakeLists.txt
@@ -39,11 +39,6 @@ set(arduino_files "library.properties")
# Compile options
-get_setting(target_arch STRING "Target system architecture (fed to the compiler's -march=XXX).")
-if(NOT target_arch AND NOT CMAKE_CROSSCOMPILING)
- set(target_arch native)
-endif()
-
get_setting(target_device STRING "Target device identifier (defines HYDRO_TARGET_DEVICE_XXX).")
set(compile_options
@@ -89,8 +84,9 @@ set(compile_options
# Main library
-add_library("${PROJECT_NAME}")
+add_library("${PROJECT_NAME}" SHARED)
add_library("${PROJECT_NAME}::${PROJECT_NAME}" ALIAS "${PROJECT_NAME}")
+add_library("${PROJECT_NAME}_static" STATIC)
target_sources("${PROJECT_NAME}" PRIVATE ${source_files})
@@ -100,11 +96,21 @@ target_compile_options("${PROJECT_NAME}" PRIVATE ${com
target_compile_options("${PROJECT_NAME}" PRIVATE ${compile_options})
+target_sources("${PROJECT_NAME}_static" PRIVATE ${source_files})
+
+target_include_directories("${PROJECT_NAME}_static"
+ PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+
+target_compile_options("${PROJECT_NAME}_static" PRIVATE ${compile_options})
+
+set_target_properties("${PROJECT_NAME}_static" PROPERTIES OUTPUT_NAME "${PROJECT_NAME}")
+
# Installation
set(targets_export_name "${PROJECT_NAME}-targets")
-install(TARGETS "${PROJECT_NAME}"
+install(TARGETS "${PROJECT_NAME}" "${PROJECT_NAME}_static"
EXPORT "${targets_export_name}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")

View file

@ -1,6 +1,4 @@
include/hydrogen.h
lib/libhydrogen.a
lib/libhydrogen.so
share/cmake/hydrogen/hydrogen-config.cmake
share/cmake/hydrogen/hydrogen-targets-%%CMAKE_BUILD_TYPE%%.cmake
share/cmake/hydrogen/hydrogen-targets.cmake
libdata/pkgconfig/libhydrogen.pc