pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/qt5-qtwebkit qt5-qtwebkit: fix SunOS solib link is...
details: https://anonhg.NetBSD.org/pkgsrc/rev/685e0b2fd404
branches: trunk
changeset: 375878:685e0b2fd404
user: tnn <tnn%pkgsrc.org@localhost>
date: Mon Mar 28 23:10:44 2022 +0000
description:
qt5-qtwebkit: fix SunOS solib link issues
diffstat:
x11/qt5-qtwebkit/Makefile | 7 ++-
x11/qt5-qtwebkit/distinfo | 3 +-
x11/qt5-qtwebkit/patches/patch-Source_cmake_OptionsCommon.cmake | 21 ++++++++++
3 files changed, 29 insertions(+), 2 deletions(-)
diffs (61 lines):
diff -r ff3c2d81e83c -r 685e0b2fd404 x11/qt5-qtwebkit/Makefile
--- a/x11/qt5-qtwebkit/Makefile Mon Mar 28 21:57:36 2022 +0000
+++ b/x11/qt5-qtwebkit/Makefile Mon Mar 28 23:10:44 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2021/12/08 16:03:01 adam Exp $
+# $NetBSD: Makefile,v 1.95 2022/03/28 23:10:44 tnn Exp $
QTWKVERSION= 5.212.0-alpha4
DISTNAME= qtwebkit-${QTWKVERSION}
@@ -77,6 +77,11 @@
LDFLAGS+= -Wl,--no-keep-memory
.endif
+.if ${OPSYS} == "SunOS"
+CMAKE_ARGS+= -DUSE_LINKER_VERSION_SCRIPT=OFF
+LDFLAGS+= -lsocket -lnsl
+.endif
+
# JavaScriptCore requires at least MIPS32.
.if !empty(MACHINE_ARCH:Mmips64*)
CFLAGS+= -march=mips64
diff -r ff3c2d81e83c -r 685e0b2fd404 x11/qt5-qtwebkit/distinfo
--- a/x11/qt5-qtwebkit/distinfo Mon Mar 28 21:57:36 2022 +0000
+++ b/x11/qt5-qtwebkit/distinfo Mon Mar 28 23:10:44 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2022/03/28 14:38:50 tnn Exp $
+$NetBSD: distinfo,v 1.26 2022/03/28 23:10:44 tnn Exp $
BLAKE2s (qtwebkit-5.212.0-alpha4.tar.xz) = 20858db08c7d297037d3ced34e441d4b657325c406b475e4e76dd367dc9c500c
SHA512 (qtwebkit-5.212.0-alpha4.tar.xz) = 33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6
@@ -29,4 +29,5 @@
SHA1 (patch-Source_WebCore_platform_text_icu_UTextProviderLatin1.cpp) = 29b414e1ae18a0786f31d80143f665d6d68bcbe3
SHA1 (patch-Source_WebCore_platform_text_icu_UTextProviderUTF16.cpp) = b175e1973a2019d746fda174dfc5708a3ca57d9b
SHA1 (patch-Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp) = d18013d0e07d7ad7e9d84cb6ef2d418d9bba4c7e
+SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 8fb8d11c4aab36e913a560ac48acce930f074635
SHA1 (patch-Source_cmake_OptionsQt.cmake) = 35cc2b9904897cd2f1d540b473ce2905d95a0143
diff -r ff3c2d81e83c -r 685e0b2fd404 x11/qt5-qtwebkit/patches/patch-Source_cmake_OptionsCommon.cmake
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt5-qtwebkit/patches/patch-Source_cmake_OptionsCommon.cmake Mon Mar 28 23:10:44 2022 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-Source_cmake_OptionsCommon.cmake,v 1.1 2022/03/28 23:10:44 tnn Exp $
+
+Make ar(1) flags compatible with SunOS
+
+--- Source/cmake/OptionsCommon.cmake.orig 2020-03-04 17:16:37.000000000 +0000
++++ Source/cmake/OptionsCommon.cmake
+@@ -19,10 +19,10 @@ option(USE_THIN_ARCHIVES "Produce all st
+ if (USE_THIN_ARCHIVES)
+ execute_process(COMMAND ${CMAKE_AR} -V OUTPUT_VARIABLE AR_VERSION)
+ if ("${AR_VERSION}" MATCHES "^GNU ar")
+- set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> crT <TARGET> <LINK_FLAGS> <OBJECTS>")
+- set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> crT <TARGET> <LINK_FLAGS> <OBJECTS>")
+- set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> rT <TARGET> <LINK_FLAGS> <OBJECTS>")
+- set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> rT <TARGET> <LINK_FLAGS> <OBJECTS>")
++ set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> crs <TARGET> <LINK_FLAGS> <OBJECTS>")
++ set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> crs <TARGET> <LINK_FLAGS> <OBJECTS>")
++ set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> rs <TARGET> <LINK_FLAGS> <OBJECTS>")
++ set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> rs <TARGET> <LINK_FLAGS> <OBJECTS>")
+ endif ()
+ endif ()
+
Home |
Main Index |
Thread Index |
Old Index