git: 94bfefa08c26 - main - net/uvgrtp: pass down BUILD_SHARED_LIBS to fix the port's build
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 26 Dec 2025 13:56:16 UTC
The branch main has been updated by danfe:
URL: https://cgit.FreeBSD.org/ports/commit/?id=94bfefa08c261179447f9f3777a277fedffbf74c
commit 94bfefa08c261179447f9f3777a277fedffbf74c
Author: Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2025-12-26 13:54:48 +0000
Commit: Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2025-12-26 13:54:48 +0000
net/uvgrtp: pass down BUILD_SHARED_LIBS to fix the port's build
By specifying add_library(... SHARED) we were instructing CMake
to build all but one objects in PIC mode, in turn causing the
infamous "relocation R_X86_64_32S cannot be used against local
symbol" error upon linking the program. Mend this by using the
documented and cleaner BUILD_SHARED_LIBS approach. While here,
fix an IF block open/close arguments mismatch CMake warning.
Reported by: pkg-fallout
---
net/uvgrtp/Makefile | 4 ++--
net/uvgrtp/files/patch-CMakeLists.txt | 17 ++++++-----------
net/uvgrtp/files/patch-cmake_Versioning.cmake | 11 +++++++++++
3 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/net/uvgrtp/Makefile b/net/uvgrtp/Makefile
index aac8115be785..983355c3e2bf 100644
--- a/net/uvgrtp/Makefile
+++ b/net/uvgrtp/Makefile
@@ -1,6 +1,7 @@
PORTNAME= ${GH_PROJECT:tl}
PORTVERSION= 3.1.6
DISTVERSIONPREFIX= v
+PORTREVISION= 1
CATEGORIES= net
MAINTAINER= danfe@FreeBSD.org
@@ -13,8 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USES= cmake compiler:c++17-lang pkgconfig
CMAKE_ARGS= -DPKG_CONFIG_PATH:STRING=libdata/pkgconfig
CMAKE_ON= UVGRTP_DISABLE_EXAMPLES UVGRTP_DISABLE_TESTS \
- UVGRTP_RELEASE_COMMIT
-LDFLAGS_i386= -Wl,-znotext
+ UVGRTP_RELEASE_COMMIT BUILD_SHARED_LIBS
USE_LDCONFIG= yes
USE_GITHUB= yes
diff --git a/net/uvgrtp/files/patch-CMakeLists.txt b/net/uvgrtp/files/patch-CMakeLists.txt
index 8de1f8941968..6b263409e575 100644
--- a/net/uvgrtp/files/patch-CMakeLists.txt
+++ b/net/uvgrtp/files/patch-CMakeLists.txt
@@ -1,15 +1,6 @@
--- CMakeLists.txt.orig 2025-03-20 09:59:25 UTC
+++ CMakeLists.txt
-@@ -49,7 +49,7 @@ include(cmake/FindDependencies.cmake)
- include(cmake/Versioning.cmake)
-
-
--add_library(${PROJECT_NAME})
-+add_library(${PROJECT_NAME} SHARED)
- set_target_properties(${PROJECT_NAME} PROPERTIES
- SOVERSION "${PROJECT_VERSION_MAJOR}"
- VERSION "${LIBRARY_VERSION}"
-@@ -239,7 +239,7 @@ if (UNIX)
+@@ -239,10 +239,10 @@ if (UNIX)
list(APPEND UVGRTP_LINKER_FLAGS "-lpthread")
endif()
# Check PKG_CONFIG_PATH, if not defined, use lib/pkgconfig
@@ -17,4 +8,8 @@
+ if(NOT DEFINED PKG_CONFIG_PATH)
set(PKG_CONFIG_PATH "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
message("PKG_CONFIG_PATH is not set. Setting it to ${PKG_CONFIG_PATH}")
- endif(NOT DEFINED ENV{PKG_CONFIG_PATH})
+- endif(NOT DEFINED ENV{PKG_CONFIG_PATH})
++ endif()
+
+ # Find crypto++
+ if(NOT UVGRTP_DISABLE_CRYPTO)
diff --git a/net/uvgrtp/files/patch-cmake_Versioning.cmake b/net/uvgrtp/files/patch-cmake_Versioning.cmake
new file mode 100644
index 000000000000..5597aca17efd
--- /dev/null
+++ b/net/uvgrtp/files/patch-cmake_Versioning.cmake
@@ -0,0 +1,11 @@
+--- cmake/Versioning.cmake.orig 2025-03-20 09:59:25 UTC
++++ cmake/Versioning.cmake
+@@ -31,6 +31,8 @@ configure_file(cmake/version.cc.in version.cc
+ )
+ add_library(${PROJECT_NAME}_version OBJECT
+ ${CMAKE_CURRENT_BINARY_DIR}/version.cc)
++set_target_properties(${PROJECT_NAME}_version PROPERTIES
++ POSITION_INDEPENDENT_CODE ${BUILD_SHARED_LIBS})
+ target_include_directories(${PROJECT_NAME}_version
+ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
+ )