pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
*: use CMAKE_GENERATORS_INCOMPATIBLE
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Thu May 1 14:36:43 2025 +0200
Changeset: ff355c8e111a3eda9b53eb656594d6ef3bf35472
Modified Files:
ladybird-git/Makefile
ppsspp/Makefile
qt6-qtwebengine/Makefile
Log Message:
*: use CMAKE_GENERATORS_INCOMPATIBLE
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ff355c8e111a3eda9b53eb656594d6ef3bf35472
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
ladybird-git/Makefile | 2 +-
ppsspp/Makefile | 4 ++--
qt6-qtwebengine/Makefile | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diffs:
diff --git a/ladybird-git/Makefile b/ladybird-git/Makefile
index 86e97580a1..51379387e3 100644
--- a/ladybird-git/Makefile
+++ b/ladybird-git/Makefile
@@ -18,7 +18,7 @@ USE_TOOLS+= pkg-config
#CMAKE_CONFIGURE_ARGS+= -S Ladybird
# build broken with make
-#CMAKE_GENERATOR= ninja
+CMAKE_GENERATORS_INCOMPATIBLE= make
# TODO: this needs fixing
ALLOW_NETWORK_ACCESS= 1
diff --git a/ppsspp/Makefile b/ppsspp/Makefile
index 4b60900121..8b60050f8d 100644
--- a/ppsspp/Makefile
+++ b/ppsspp/Makefile
@@ -37,11 +37,11 @@ CMAKE_CONFIGURE_ARGS+= -DUSE_SYSTEM_ZSTD=ON
NOT_PAX_ASLR_SAFE+= bin/PPSSPPSDL
NOT_PAX_MPROTECT_SAFE+= bin/PPSSPPSDL
-.include "../../mk/bsd.prefs.mk"
# wiz 20240314:
# the ninja generator has problems in some environments:
# ninja: error: manifest 'build.ninja' still dirty after 100 tries, perhaps system time is not set
-CMAKE_GENERATOR= make
+CMAKE_GENERATORS_INCOMPATIBLE= ninja
+
.include "../../mk/compiler/clang.mk"
.include "../../devel/cmake/build.mk"
.include "../../lang/python/tool.mk"
diff --git a/qt6-qtwebengine/Makefile b/qt6-qtwebengine/Makefile
index 14418f4381..30fb2b9777 100644
--- a/qt6-qtwebengine/Makefile
+++ b/qt6-qtwebengine/Makefile
@@ -6,7 +6,7 @@ COMMENT= Qt6 webengine module
CATEGORIES= www
LICENSE= gnu-lgpl-v3 OR gnu-gpl-v2 OR gnu-gpl-v3
-CMAKE_GENERATOR= ninja
+CMAKE_GENERATORS_INCOMPATIBLE= make
.include "../../x11/qt6-qtbase/Makefile.common"
Home |
Main Index |
Thread Index |
Old Index