CVS commit: pkgsrc/www/libwebsockets

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Mon Oct 14 17:19:24 UTC 2024

Modified Files:
        pkgsrc/www/libwebsockets: distinfo
Added Files:
        pkgsrc/www/libwebsockets/patches: patch-lib_CMakeLists.txt

Log Message:
libwebsockets: don't hardcode linking to libdl
don't link to libdl directly use CMAKE_DL_LIBS instead
pointed out by greg troxel on tech-pkg


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/libwebsockets/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/libwebsockets/patches/patch-lib_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/libwebsockets/distinfo
diff -u pkgsrc/www/libwebsockets/distinfo:1.6 pkgsrc/www/libwebsockets/distinfo:1.7
--- pkgsrc/www/libwebsockets/distinfo:1.6       Sat Feb 10 11:01:38 2024
+++ pkgsrc/www/libwebsockets/distinfo   Mon Oct 14 17:19:24 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2024/02/10 11:01:38 adam Exp $
+$NetBSD: distinfo,v 1.7 2024/10/14 17:19:24 nros Exp $
 
 BLAKE2s (libwebsockets-4.3.3.tar.gz) = 2b78281dfe0dd11f0a4598bbb6d53859a484809a09e66a85c7f6f0a6a0b2febc
 SHA512 (libwebsockets-4.3.3.tar.gz) = 2ffd248ddf283369725097ca7410f947fe0389c360b329c76f0754afab4ba87c20a0687c5e7b8bd991b157f9d20c6faa3049757b3398e66d08662c3aa7ff9658
 Size (libwebsockets-4.3.3.tar.gz) = 15618186 bytes
+SHA1 (patch-lib_CMakeLists.txt) = 26bbb310897fb8c9b24f97e53964e7a7d772d9cf

Added files:

Index: pkgsrc/www/libwebsockets/patches/patch-lib_CMakeLists.txt
diff -u /dev/null pkgsrc/www/libwebsockets/patches/patch-lib_CMakeLists.txt:1.1
--- /dev/null   Mon Oct 14 17:19:24 2024
+++ pkgsrc/www/libwebsockets/patches/patch-lib_CMakeLists.txt   Mon Oct 14 17:19:24 2024
@@ -0,0 +1,23 @@
+$NetBSD: patch-lib_CMakeLists.txt,v 1.1 2024/10/14 17:19:24 nros Exp $
+
+* Don't hardcode -ldl use CMAKE_DL_LIBS for compatabiblity
+* Link to dl privtely so that it is not in the list of libs that
+  is linked to if linking to websockets_shared
+
+--- lib/CMakeLists.txt.orig    2023-11-20 06:27:02.000000000 +0000
++++ lib/CMakeLists.txt
+@@ -228,12 +228,8 @@ if (LWS_WITH_SHARED)
+ 
+       if (UNIX AND LWS_WITH_PLUGINS_API)
+               set (CMAKE_POSITION_INDEPENDENT_CODE ON)
+-              if (NOT((${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") OR
+-                 (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") OR
+-                 (${CMAKE_SYSTEM_NAME} MATCHES "QNX")))
+-                 if (LWS_WITH_SHARED)
+-                              target_link_libraries(websockets_shared dl)
+-                      endif()
++              if (LWS_WITH_SHARED)
++                      target_link_libraries(websockets_shared PRIVATE ${CMAKE_DL_LIBS})
+               endif()
+       endif()
+