CVS commit: pkgsrc/www/libwebsockets

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

Module Name:    pkgsrc
Committed By:   nros
Date:           Sat Nov 30 11:39:02 UTC 2024

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

Log Message:
www/libwebsockets: Remove PRIVATE from target_link_libraries to fix build
All target_link_libraries must either set PRIVATE or PUBLIC or all must
not set them. So remove PRIVATE to fix build where libdl exists.
dl is added to INTERFACE_LINK_LIBRARIES even if PRIVATE is set
since it is also added somewhere else in the build.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/libwebsockets/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    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.7 pkgsrc/www/libwebsockets/distinfo:1.8
--- pkgsrc/www/libwebsockets/distinfo:1.7       Mon Oct 14 17:19:24 2024
+++ pkgsrc/www/libwebsockets/distinfo   Sat Nov 30 11:39:02 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2024/10/14 17:19:24 nros Exp $
+$NetBSD: distinfo,v 1.8 2024/11/30 11:39:02 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
+SHA1 (patch-lib_CMakeLists.txt) = 480f32c147b6b59ef7ed881a4073a000017fe405

Index: pkgsrc/www/libwebsockets/patches/patch-lib_CMakeLists.txt
diff -u pkgsrc/www/libwebsockets/patches/patch-lib_CMakeLists.txt:1.1 pkgsrc/www/libwebsockets/patches/patch-lib_CMakeLists.txt:1.2
--- pkgsrc/www/libwebsockets/patches/patch-lib_CMakeLists.txt:1.1       Mon Oct 14 17:19:24 2024
+++ pkgsrc/www/libwebsockets/patches/patch-lib_CMakeLists.txt   Sat Nov 30 11:39:02 2024
@@ -1,8 +1,6 @@
-$NetBSD: patch-lib_CMakeLists.txt,v 1.1 2024/10/14 17:19:24 nros Exp $
+$NetBSD: patch-lib_CMakeLists.txt,v 1.2 2024/11/30 11:39:02 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
@@ -17,7 +15,7 @@ $NetBSD: patch-lib_CMakeLists.txt,v 1.1 
 -                              target_link_libraries(websockets_shared dl)
 -                      endif()
 +              if (LWS_WITH_SHARED)
-+                      target_link_libraries(websockets_shared PRIVATE ${CMAKE_DL_LIBS})
++                      target_link_libraries(websockets_shared ${CMAKE_DL_LIBS})
                endif()
        endif()