From c3c450d1bb45b1100d1b0e27ba2d9404b3580a24 Mon Sep 17 00:00:00 2001 From: Helmut Kudrnovsky Date: Sat, 11 Mar 2023 00:22:26 +0100 Subject: [PATCH 1/2] winGRASS: exclude pdal as compilation dependency as seen in the compilation logs of daily winGRASS builds (https://wingrass.fsv.cvut.cz/grass83/logs/): pdal is not available in OSGeo4W due to Mingw64/MSVSC incompatibility see also gh CI build recipe (https://github.com/OSGeo/grass/blob/main/mswindows/osgeo4w/build_osgeo4w.sh#L67) --- mswindows/osgeo4w/package.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/mswindows/osgeo4w/package.sh b/mswindows/osgeo4w/package.sh index 2428924ef60..df777e4a310 100755 --- a/mswindows/osgeo4w/package.sh +++ b/mswindows/osgeo4w/package.sh @@ -195,6 +195,7 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then --with-cairo-ldflags="-L$PWD/mswindows/osgeo4w/lib -lcairo -lfontconfig" \ --with-bzlib \ --with-liblas=$PWD/mswindows/osgeo4w/liblas-config + --without-pdal touch mswindows/osgeo4w/configure-stamp fi From 19e39a98a1df88a7698e10a1c7a0ce13f685c9dd Mon Sep 17 00:00:00 2001 From: Martin Landa Date: Sat, 11 Mar 2023 19:43:22 +0100 Subject: [PATCH 2/2] Update mswindows/osgeo4w/package.sh Co-authored-by: Nicklas Larsson --- mswindows/osgeo4w/package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mswindows/osgeo4w/package.sh b/mswindows/osgeo4w/package.sh index df777e4a310..ab5724ac44a 100755 --- a/mswindows/osgeo4w/package.sh +++ b/mswindows/osgeo4w/package.sh @@ -194,7 +194,7 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then --with-cairo-includes=$OSGEO4W_ROOT_MSYS/include \ --with-cairo-ldflags="-L$PWD/mswindows/osgeo4w/lib -lcairo -lfontconfig" \ --with-bzlib \ - --with-liblas=$PWD/mswindows/osgeo4w/liblas-config + --with-liblas=$PWD/mswindows/osgeo4w/liblas-config \ --without-pdal touch mswindows/osgeo4w/configure-stamp