CVS commit: pkgsrc/x11/qt6-qtbase

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Nov 11 10:34:33 UTC 2023

Modified Files:
        pkgsrc/x11/qt6-qtbase: Makefile Makefile.common

Log Message:
qt6-qtbase: fix library name on Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/qt6-qtbase/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/x11/qt6-qtbase/Makefile.common

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

Modified files:

Index: pkgsrc/x11/qt6-qtbase/Makefile
diff -u pkgsrc/x11/qt6-qtbase/Makefile:1.20 pkgsrc/x11/qt6-qtbase/Makefile:1.21
--- pkgsrc/x11/qt6-qtbase/Makefile:1.20 Wed Nov  8 13:21:40 2023
+++ pkgsrc/x11/qt6-qtbase/Makefile      Sat Nov 11 10:34:33 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2023/11/08 13:21:40 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2023/11/11 10:34:33 adam Exp $
 
 DISTNAME=      qtbase-everywhere-src-${QTVERSION}
 PKGNAME=       qt6-qtbase-${QTVERSION}
@@ -204,6 +204,8 @@ CMAKE_CONFIGURE_ARGS+=      -DQT_DISABLE_RPAT
 CONFIGURE_ARGS+=       -- ${CMAKE_CONFIGURE_ARGS}
 .if ${OPSYS} != "Darwin"
 LDFLAGS+=              ${COMPILER_RPATH_FLAG}${QTPREFIX}/lib
+.else
+CMAKE_INSTALL_NAME_DIR=        ${QTPREFIX}/lib
 .endif
 
 TOOL_DEPENDS+= xmlstarlet-[0-9]*:../../textproc/xmlstarlet

Index: pkgsrc/x11/qt6-qtbase/Makefile.common
diff -u pkgsrc/x11/qt6-qtbase/Makefile.common:1.37 pkgsrc/x11/qt6-qtbase/Makefile.common:1.38
--- pkgsrc/x11/qt6-qtbase/Makefile.common:1.37  Wed Nov  8 09:01:20 2023
+++ pkgsrc/x11/qt6-qtbase/Makefile.common       Sat Nov 11 10:34:33 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.37 2023/11/08 09:01:20 nros Exp $
+# $NetBSD: Makefile.common,v 1.38 2023/11/11 10:34:33 adam Exp $
 # used by audio/qt6-qtspeech/Makefile
 # used by comms/qt6-qtconnectivity/Makefile
 # used by databases/qt6-odbc/Makefile
@@ -73,9 +73,10 @@ MAKE_ENV+=           QTPREFIX=${QTPREFIX:Q}
 # this is needed by some ld:s to not
 # cause linking errors.
 .if ${OPSYS} == "Darwin"
-MAKE_ENV+=     DYLD_LIBRARY_PATH=${WRKSRC}/lib
+CMAKE_INSTALL_NAME_DIR=        ${QTPREFIX}/lib
+MAKE_ENV+=             DYLD_LIBRARY_PATH=${WRKSRC}/lib
 .else
-MAKE_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/lib
+MAKE_ENV+=             LD_LIBRARY_PATH=${WRKSRC}/lib
 .endif
 
 # avoid creating a .qt directory in the users home directory