pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/geography/qgis



Module Name:    pkgsrc
Committed By:   gdt
Date:           Fri Jun 13 12:47:34 UTC 2025

Modified Files:
        pkgsrc/geography/qgis: Makefile

Log Message:
geography/qgis: Require gmake

When using CMAKE_GENERATOR=make, makefiles are generated such that
building with BSD make fails and building with GNU make succeeds.
According to cmake, this is a bug, as "any standard UNIX-style make"
should work:
  https://cmake.org/cmake/help/latest/generator/Unix%20Makefiles.html

Work around this by requiring gmake.

Arguably, gmake should only be required if CMAKE_GENERATOR=make, as
the ninja (culturally default, but not textually default) build works
without make at all.  Skip trying, because it adds risk to save a
quick install in bulk builds, and the theory that a non-negligible
number of systems building qgis won't have built gmake is not
credible.

Note to future self: It's not a good idea to test withdrawing
USE_TOOLS+=gmake when CMAKE_GENERATOR=ninja.  (In this case, it seems
t that the old woes are gone, and replaced by new woes.)


To generate a diff of this commit:
cvs rdiff -u -r1.245 -r1.246 pkgsrc/geography/qgis/Makefile

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

Modified files:

Index: pkgsrc/geography/qgis/Makefile
diff -u pkgsrc/geography/qgis/Makefile:1.245 pkgsrc/geography/qgis/Makefile:1.246
--- pkgsrc/geography/qgis/Makefile:1.245        Sun Jun  8 22:51:21 2025
+++ pkgsrc/geography/qgis/Makefile      Fri Jun 13 12:47:34 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.245 2025/06/08 22:51:21 gdt Exp $
+# $NetBSD: Makefile,v 1.246 2025/06/13 12:47:34 gdt Exp $
 
 # This is intentionally 3.40 Long Term Release.  Please do not update
 # to later branches, and instead discuss whether/how we want multiple
@@ -19,6 +19,9 @@ USE_LANGUAGES=                c c++ fortran77
 USE_CXX_FEATURES=      c++17
 USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes
+# 3.40.7 fails with BSD make. \todo File upstream.
+# \todo Only set this if CMAKE_GENERATOR=make.
+USE_TOOLS+=            gmake
 USE_TOOLS+=            bison flex perl pkg-config
 .include "../../devel/cmake/build.mk"
 



Home | Main Index | Thread Index | Old Index