Sat Nov 11 10:34:33 2023 UTC ()
qt6-qtbase: fix library name on Darwin


(adam)
diff -r1.20 -r1.21 pkgsrc/x11/qt6-qtbase/Makefile
diff -r1.37 -r1.38 pkgsrc/x11/qt6-qtbase/Makefile.common
cvs diff -r1.20 -r1.21 pkgsrc/x11/qt6-qtbase/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt6-qtbase/Makefile 2023/11/08 13:21:40 1.20
+++ pkgsrc/x11/qt6-qtbase/Makefile 2023/11/11 10:34:33 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.20 2023/11/08 13:21:40 wiz Exp $ 1# $NetBSD: Makefile,v 1.21 2023/11/11 10:34:33 adam Exp $
2 2
3DISTNAME= qtbase-everywhere-src-${QTVERSION} 3DISTNAME= qtbase-everywhere-src-${QTVERSION}
4PKGNAME= qt6-qtbase-${QTVERSION} 4PKGNAME= qt6-qtbase-${QTVERSION}
5PKGREVISION= 1 5PKGREVISION= 1
6COMMENT= C++ X GUI toolkit 6COMMENT= C++ X GUI toolkit
7CATEGORIES= x11 7CATEGORIES= x11
8 8
9LICENSE= gnu-lgpl-v3 OR gnu-gpl-v2 OR gnu-gpl-v3 9LICENSE= gnu-lgpl-v3 OR gnu-gpl-v2 OR gnu-gpl-v3
10 10
11.include "Makefile.common" 11.include "Makefile.common"
12 12
13HAS_CONFIGURE= yes 13HAS_CONFIGURE= yes
14CONFIGURE_ARGS+= -prefix "${QTPREFIX}" 14CONFIGURE_ARGS+= -prefix "${QTPREFIX}"
@@ -194,26 +194,28 @@ pre-configure: @@ -194,26 +194,28 @@ pre-configure:
194 done 194 done
195 ${RM} -f ${WRKSRC}/mkspecs/features/mac/default_pre.prf 195 ${RM} -f ${WRKSRC}/mkspecs/features/mac/default_pre.prf
196 ${RM} -f ${WRKSRC}/mkspecs/features/mac/default_post.prf 196 ${RM} -f ${WRKSRC}/mkspecs/features/mac/default_post.prf
197 197
198.include "options.mk" 198.include "options.mk"
199 199
200CMAKE_CONFIGURE_ARGS+= -DQT_DISABLE_RPATH:BOOL=ON 200CMAKE_CONFIGURE_ARGS+= -DQT_DISABLE_RPATH:BOOL=ON
201 201
202.include "../../devel/cmake/configure-settings.mk" 202.include "../../devel/cmake/configure-settings.mk"
203 203
204CONFIGURE_ARGS+= -- ${CMAKE_CONFIGURE_ARGS} 204CONFIGURE_ARGS+= -- ${CMAKE_CONFIGURE_ARGS}
205.if ${OPSYS} != "Darwin" 205.if ${OPSYS} != "Darwin"
206LDFLAGS+= ${COMPILER_RPATH_FLAG}${QTPREFIX}/lib 206LDFLAGS+= ${COMPILER_RPATH_FLAG}${QTPREFIX}/lib
 207.else
 208CMAKE_INSTALL_NAME_DIR= ${QTPREFIX}/lib
207.endif 209.endif
208 210
209TOOL_DEPENDS+= xmlstarlet-[0-9]*:../../textproc/xmlstarlet 211TOOL_DEPENDS+= xmlstarlet-[0-9]*:../../textproc/xmlstarlet
210 212
211PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Concurrent.pc 213PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Concurrent.pc
212PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Core.pc 214PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Core.pc
213PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Gui.pc 215PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Gui.pc
214PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Network.pc 216PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Network.pc
215PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6OpenGL.pc 217PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6OpenGL.pc
216PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6OpenGLWidgets.pc 218PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6OpenGLWidgets.pc
217PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6PrintSupport.pc 219PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6PrintSupport.pc
218PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Sql.pc 220PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Sql.pc
219PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Test.pc 221PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Test.pc
cvs diff -r1.37 -r1.38 pkgsrc/x11/qt6-qtbase/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/qt6-qtbase/Makefile.common 2023/11/08 09:01:20 1.37
+++ pkgsrc/x11/qt6-qtbase/Makefile.common 2023/11/11 10:34:33 1.38
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.37 2023/11/08 09:01:20 nros Exp $ 1# $NetBSD: Makefile.common,v 1.38 2023/11/11 10:34:33 adam Exp $
2# used by audio/qt6-qtspeech/Makefile 2# used by audio/qt6-qtspeech/Makefile
3# used by comms/qt6-qtconnectivity/Makefile 3# used by comms/qt6-qtconnectivity/Makefile
4# used by databases/qt6-odbc/Makefile 4# used by databases/qt6-odbc/Makefile
5# used by databases/qt6-psql/Makefile 5# used by databases/qt6-psql/Makefile
6# used by devel/qt6-qt5compat/Makefile 6# used by devel/qt6-qt5compat/Makefile
7# used by devel/qt6-qttools/Makefile 7# used by devel/qt6-qttools/Makefile
8# used by devel/qt6-qtwayland/Makefile 8# used by devel/qt6-qtwayland/Makefile
9# used by geography/qt6-qtlocation/Makefile 9# used by geography/qt6-qtlocation/Makefile
10# used by geography/qt6-qtpositioning/Makefile 10# used by geography/qt6-qtpositioning/Makefile
11# used by graphics/qt6-qt3d/Makefile 11# used by graphics/qt6-qt3d/Makefile
12# used by graphics/qt6-qtcharts/Makefile 12# used by graphics/qt6-qtcharts/Makefile
13# used by graphics/qt6-qtdatavis3d/Makefile 13# used by graphics/qt6-qtdatavis3d/Makefile
14# used by graphics/qt6-qtimageformats/Makefile 14# used by graphics/qt6-qtimageformats/Makefile
@@ -63,29 +63,30 @@ CXXFLAGS.SunOS+= -D_Noreturn="" @@ -63,29 +63,30 @@ CXXFLAGS.SunOS+= -D_Noreturn=""
63 63
64# for GL_GLEXT_LEGACY with GL/gl.h error, GL_ARB_shader_objects is not defined. 64# for GL_GLEXT_LEGACY with GL/gl.h error, GL_ARB_shader_objects is not defined.
65BUILDLINK_TRANSFORM+= rm:-Wundef 65BUILDLINK_TRANSFORM+= rm:-Wundef
66 66
67MAKE_ENV+= QTPREFIX=${QTPREFIX:Q} 67MAKE_ENV+= QTPREFIX=${QTPREFIX:Q}
68 68
69# pkgsrc does not set rpath during build 69# pkgsrc does not set rpath during build
70# but qdbuscpp2xml and qdbuscpp2xml are 70# but qdbuscpp2xml and qdbuscpp2xml are
71# executed during build, 71# executed during build,
72# some libs also link to libs in lib so 72# some libs also link to libs in lib so
73# this is needed by some ld:s to not 73# this is needed by some ld:s to not
74# cause linking errors. 74# cause linking errors.
75.if ${OPSYS} == "Darwin" 75.if ${OPSYS} == "Darwin"
76MAKE_ENV+= DYLD_LIBRARY_PATH=${WRKSRC}/lib 76CMAKE_INSTALL_NAME_DIR= ${QTPREFIX}/lib
 77MAKE_ENV+= DYLD_LIBRARY_PATH=${WRKSRC}/lib
77.else 78.else
78MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/lib 79MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/lib
79.endif 80.endif
80 81
81# avoid creating a .qt directory in the users home directory 82# avoid creating a .qt directory in the users home directory
82SCRIPTS_ENV+= HOME=${WRKDIR} 83SCRIPTS_ENV+= HOME=${WRKDIR}
83 84
84.if "${PKGPATH}" != "x11/qt6-qtbase" 85.if "${PKGPATH}" != "x11/qt6-qtbase"
85CMAKE_INSTALL_PREFIX= ${QTPREFIX} 86CMAKE_INSTALL_PREFIX= ${QTPREFIX}
86.include "../../devel/cmake/configure-settings.mk" 87.include "../../devel/cmake/configure-settings.mk"
87CONFIGURE_ARGS+= -- ${CMAKE_CONFIGURE_ARGS} 88CONFIGURE_ARGS+= -- ${CMAKE_CONFIGURE_ARGS}
88QTCONFDIR?= . 89QTCONFDIR?= .
89do-configure: 90do-configure:
90 cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QTPREFIX}/bin/qt-configure-module ${QTCONFDIR} ${CONFIGURE_ARGS} 91 cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QTPREFIX}/bin/qt-configure-module ${QTCONFDIR} ${CONFIGURE_ARGS}
91.endif 92.endif