pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
wxGTK32: remove buildlink-transform workaround with proper fix
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By: wiz
Date: Wed Jul 20 01:01:38 2022 +0200
Changeset: 481426115c08f08eb400e3156277916b33316fe9
Modified Files:
wxGTK32/Makefile
wxGTK32/distinfo
Added Files:
wxGTK32/patches/patch-build_cmake_lib_base_CMakeLists.txt
Log Message:
wxGTK32: remove buildlink-transform workaround with proper fix
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=481426115c08f08eb400e3156277916b33316fe9
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
wxGTK32/Makefile | 3 ---
wxGTK32/distinfo | 1 +
wxGTK32/patches/patch-build_cmake_lib_base_CMakeLists.txt | 14 ++++++++++++++
3 files changed, 15 insertions(+), 3 deletions(-)
diffs:
diff --git a/wxGTK32/Makefile b/wxGTK32/Makefile
index b80b8b676a..3feed16d25 100644
--- a/wxGTK32/Makefile
+++ b/wxGTK32/Makefile
@@ -19,9 +19,6 @@ USE_CMAKE= yes
USE_LANGUAGES= c c++
CMAKE_ARGS+= -DCMAKE_DISABLE_PRECOMPILE_HEADERS:BOOL=ON
-# didn't find all places hardcoding libdl, so force them away
-BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q}
-
TO_UNWRAP= ${WRKSRC}/lib/wx/config/gtk3-unicode-3.2
# Installation rules in cmake are not using DESTDIR properly, do it manually
diff --git a/wxGTK32/distinfo b/wxGTK32/distinfo
index 21d13a82f5..245b09fc85 100644
--- a/wxGTK32/distinfo
+++ b/wxGTK32/distinfo
@@ -4,5 +4,6 @@ BLAKE2s (wxWidgets-3.2.0.tar.bz2) = 4029147a8e77a22e0379eeda11bc26f8fee998862aaa
SHA512 (wxWidgets-3.2.0.tar.bz2) = e55e7c5ac7abcacf2ecff7c22e367db17ff5a077d3d5d2aa7589e8ba7cc6695cfa48c0f00bcfdffeda8dc4f974f97a857fb61b4b300a724f7687d710fbb23967
Size (wxWidgets-3.2.0.tar.bz2) = 25296814 bytes
SHA1 (patch-build_cmake_init.cmake) = 5b203660ee4c1376b2d8083be73fdcd0c1d09833
+SHA1 (patch-build_cmake_lib_base_CMakeLists.txt) = bec7be2f64bb4629a60d2b4f169e8feb215408e3
SHA1 (patch-build_cmake_setup.cmake) = a3d99b0363a17ac80083126e1ccb1b8a9d29d679
SHA1 (patch-src_unix_dialup.cpp) = 1c62d37508e45a0095ef062f7d450529e9b557e7
diff --git a/wxGTK32/patches/patch-build_cmake_lib_base_CMakeLists.txt b/wxGTK32/patches/patch-build_cmake_lib_base_CMakeLists.txt
new file mode 100644
index 0000000000..7d75129f2a
--- /dev/null
+++ b/wxGTK32/patches/patch-build_cmake_lib_base_CMakeLists.txt
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Use proper variable for dlopen() library.
+https://github.com/wxWidgets/wxWidgets/pull/22644
+
+--- build/cmake/lib/base/CMakeLists.txt.orig 2022-07-06 14:19:50.000000000 +0000
++++ build/cmake/lib/base/CMakeLists.txt
+@@ -65,5 +65,5 @@ if(APPLE)
+ )
+ endif()
+ elseif(UNIX)
+- wx_lib_link_libraries(wxbase PRIVATE dl)
++ wx_lib_link_libraries(wxbase PRIVATE ${CMAKE_DL_LIBS})
+ endif()
Home |
Main Index |
Thread Index |
Old Index