git: 39cdd7802dab - main - devel/libiec61850: Improve port
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 18 Feb 2024 23:01:06 UTC
The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=39cdd7802dabb0e4b675cd03a4f76c81d427ea7e commit 39cdd7802dabb0e4b675cd03a4f76c81d427ea7e Author: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> AuthorDate: 2024-02-18 22:52:45 +0000 Commit: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> CommitDate: 2024-02-18 22:52:45 +0000 devel/libiec61850: Improve port - Remove LDFLAGS and GH_PROJECT - Add some CMAKE options for avoid compile EXAMPLES files and doxigen detection - Fix build of libhal_shared. Now it is build like shared library - Fix .pc file installation path Reported by: diizzy --- devel/libiec61850/Makefile | 7 ++++--- devel/libiec61850/files/patch-hal_CMakeLists.txt | 11 +++++++++++ devel/libiec61850/files/patch-src_CMakeLists.txt | 11 +++++++++++ devel/libiec61850/pkg-plist | 4 ++-- 4 files changed, 28 insertions(+), 5 deletions(-) diff --git a/devel/libiec61850/Makefile b/devel/libiec61850/Makefile index 445dbbb2cd71..88897bf95a76 100644 --- a/devel/libiec61850/Makefile +++ b/devel/libiec61850/Makefile @@ -1,6 +1,7 @@ PORTNAME= libiec61850 DISTVERSIONPREFIX= v DISTVERSION= 1.5.3 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= acm@FreeBSD.org @@ -10,11 +11,11 @@ WWW= http://libiec61850.com/libiec61850 LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake compiler:c++11-lang +USES= cmake compiler:c++11-lang dos2unix USE_GITHUB= yes GH_ACCOUNT= mz-automation -GH_PROJECT= libiec61850 -LDFLAGS= -lm +CMAKE_OFF= BUILD_EXAMPLES +CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_Doxygen .include <bsd.port.mk> diff --git a/devel/libiec61850/files/patch-hal_CMakeLists.txt b/devel/libiec61850/files/patch-hal_CMakeLists.txt new file mode 100644 index 000000000000..9a431f3391c8 --- /dev/null +++ b/devel/libiec61850/files/patch-hal_CMakeLists.txt @@ -0,0 +1,11 @@ +--- hal/CMakeLists.txt.orig 2024-02-18 21:09:38 UTC ++++ hal/CMakeLists.txt +@@ -149,7 +149,7 @@ endif(WITH_MBEDTLS) + + add_library (hal STATIC ${libhal_SRCS}) + +-add_library (hal-shared STATIC ${libhal_SRCS}) ++add_library (hal-shared SHARED ${libhal_SRCS}) + + target_compile_definitions(hal-shared PRIVATE EXPORT_FUNCTIONS_FOR_DLL) + diff --git a/devel/libiec61850/files/patch-src_CMakeLists.txt b/devel/libiec61850/files/patch-src_CMakeLists.txt new file mode 100644 index 000000000000..4c94826a3e52 --- /dev/null +++ b/devel/libiec61850/files/patch-src_CMakeLists.txt @@ -0,0 +1,11 @@ +--- src/CMakeLists.txt.orig 2024-02-18 21:10:14 UTC ++++ src/CMakeLists.txt +@@ -367,7 +367,7 @@ if(UNIX) + ${CMAKE_CURRENT_LIST_DIR}/libiec61850.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/libiec61850.pc @ONLY + ) +- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libiec61850.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/pkgconfig") ++ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libiec61850.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig") + endif() + + install (TARGETS iec61850 iec61850-shared diff --git a/devel/libiec61850/pkg-plist b/devel/libiec61850/pkg-plist index b47853360231..074d9b750140 100644 --- a/devel/libiec61850/pkg-plist +++ b/devel/libiec61850/pkg-plist @@ -27,9 +27,9 @@ include/libiec61850/mms_value.h include/libiec61850/sv_publisher.h include/libiec61850/sv_subscriber.h include/libiec61850/tls_config.h -lib/libhal-shared.a +lib/libhal-shared.so lib/libhal.a lib/libiec61850.a lib/libiec61850.so lib/libiec61850.so.1.5.3 -share/pkgconfig/libiec61850.pc +libdata/pkgconfig/libiec61850.pc