pkgsrc-WIP-changes archive

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

qgis: merge c++17 and comment change commit from pkgsrc



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By:	wiz
Date:		Wed Nov 30 22:14:41 2022 +0100
Changeset:	b2252da6cea088a71d239a4a060e1b3a4848bcd3

Modified Files:
	qgis/Makefile

Log Message:
qgis: merge c++17 and comment change commit from pkgsrc

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b2252da6cea088a71d239a4a060e1b3a4848bcd3

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

diffstat:
 qgis/Makefile | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diffs:
diff --git a/qgis/Makefile b/qgis/Makefile
index 51521133cf..71ed2fae67 100644
--- a/qgis/Makefile
+++ b/qgis/Makefile
@@ -16,16 +16,15 @@ COMMENT=	Geographic Information System (GIS)
 LICENSE=	gnu-gpl-v2
 
 USE_CMAKE=		yes
-USE_LANGUAGES=		c c++11 fortran77
+USE_LANGUAGES=		c c++17 fortran77
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		cmake bison flex perl pkg-config
-# Due to gmake spaces in filenames, we must use gmake.  An example is
-# "resources/function_help/json/Date and Time".
-# Further, gmake expects files that contain a $ such as "$area" to
-# appear, unsurprisingly, as "$$area" on the RHS of dependency rules.
-# NetBSD make, expects "$$$$area".  While cmake 3.17 produced
-# "$$area", cmake 3.18 produces "$$$$area", perhaps only on NetBSD.
+# Building 3.28.1 fails with BSD make.  One issue seem to be a
+# difference of opinion about quoting of $, with gmake wanting
+# "$$area" vs bmake perhaps wanting "$$$$area".  Another is filenames
+# with spaces, which are \-quoted in Makefiles, but bmake sees them as
+# separate files.
 USE_TOOLS+=		gmake
 
 PLIST_SRC=		PLIST


Home | Main Index | Thread Index | Old Index