pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/devel/cmake
Module Name: pkgsrc
Committed By: adam
Date: Wed Aug 2 15:25:21 UTC 2023
Modified Files:
pkgsrc/devel/cmake: Makefile
Log Message:
cmake: use pkgsrc-provided shell for Makefile; this fixes DYLD_LIBRARY_PATH problem on Darwin
To generate a diff of this commit:
cvs rdiff -u -r1.209 -r1.210 pkgsrc/devel/cmake/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/devel/cmake/Makefile
diff -u pkgsrc/devel/cmake/Makefile:1.209 pkgsrc/devel/cmake/Makefile:1.210
--- pkgsrc/devel/cmake/Makefile:1.209 Wed Jul 26 10:54:51 2023
+++ pkgsrc/devel/cmake/Makefile Wed Aug 2 15:25:21 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.209 2023/07/26 10:54:51 adam Exp $
+# $NetBSD: Makefile,v 1.210 2023/08/02 15:25:21 adam Exp $
.include "Makefile.common"
@@ -55,6 +55,16 @@ SUBST_FILES.cmake+= Modules/FindX11.cmak
SUBST_FILES.cmake+= Modules/Platform/UnixPaths.cmake
SUBST_VARS.cmake= LOCALBASE X11BASE
+# Use custom shell for Makefiles. For most platforms this is a no-op.
+# On Darwin, system /bin/sh is restricted, so DYLD_LIBRARY_PATH can't be used.
+# This is needed for packages that execute binaries linked with not-yet
+# installed shared libraries, like qt6-qtbase.
+SUBST_CLASSES+= shell
+SUBST_STAGE.shell= pre-configure
+SUBST_MESSAGE.shell= Set custom SHELL in generated Makefiles.
+SUBST_FILES.shell+= Source/cmLocalUnixMakefileGenerator3.cxx
+SUBST_SED.shell= -e 's,/bin/sh,${SH},g'
+
pre-configure:
${CP} ${FILESDIR}/Source_Checks_cm_cxx_cbegin.cxx ${WRKSRC}/Source/Checks/cm_cxx_cbegin.cxx
${CP} ${FILESDIR}/Source_Checks_cm_cxx_cend.cxx ${WRKSRC}/Source/Checks/cm_cxx_cend.cxx
Home |
Main Index |
Thread Index |
Old Index