pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
qt6-qtbase: some cleanup
Module Name: pkgsrc-wip
Committed By: Niclas Rosenvik <nros%NetBSD.org@localhost>
Pushed By: nros
Date: Sun Mar 28 18:44:44 2021 +0000
Changeset: d8b6112bb5c6281a5ba4b40c0113846b59b0b142
Modified Files:
qt6-qtbase/Makefile.common
qt6-qtbase/options.mk
Log Message:
qt6-qtbase: some cleanup
Remove reference to QtDbus.pc
Remove rpath-link fix for solaris the problem is gone in the CMake
build
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d8b6112bb5c6281a5ba4b40c0113846b59b0b142
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
qt6-qtbase/Makefile.common | 4 ----
qt6-qtbase/options.mk | 1 -
2 files changed, 5 deletions(-)
diffs:
diff --git a/qt6-qtbase/Makefile.common b/qt6-qtbase/Makefile.common
index 82a4d5afc1..630cea8327 100644
--- a/qt6-qtbase/Makefile.common
+++ b/qt6-qtbase/Makefile.common
@@ -38,10 +38,6 @@ CXXFLAGS.SunOS+= -D_Noreturn=""
# for GL_GLEXT_LEGACY with GL/gl.h error, GL_ARB_shader_objects is not defined.
BUILDLINK_TRANSFORM+= rm:-Wundef
-# SunOS ld doesn't support -rpath-link
-BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-rpath-link,${PREFIX}/qt6/lib
-BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-rpath-link,${WRKSRC}/lib
-
MAKE_ENV+= QTPREFIX=${QTPREFIX:Q}
PLIST_VARS+= notdarwin
.if ${OPSYS} != "Darwin"
diff --git a/qt6-qtbase/options.mk b/qt6-qtbase/options.mk
index 7f3117feef..42663393ff 100644
--- a/qt6-qtbase/options.mk
+++ b/qt6-qtbase/options.mk
@@ -17,7 +17,6 @@ CONFIGURE_ARGS+= -no-cups
PLIST_VARS+= dbus
.if !empty(PKG_OPTIONS:Mdbus)
-PC_FILES+= Qt5DBus.pc
# Use lib/dbus-1.0/include/dbus/dbus-arch-deps.h from sysutils/dbus
USE_DBUS-ARCH-DEPS_H= yes
.include "../../sysutils/dbus/buildlink3.mk"
Home |
Main Index |
Thread Index |
Old Index