star-build

commit ad547ee22df2562ac413e36d0f9d4e278f6ccd83
parent 293be24c20e28adf3306cb204b7553a9f76198d2
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Tue,  3 Dec 2024 11:32:06 +0100

clipper2_1.1.1: fix compilation with GCC 14

A C++ warning is now considered an error in GCC 14.

Diffstat:
M
src/clipper2.mk.in
 | 
3
++-
M
src/clipper2_1.1.1.sh
 | 
3
+--
M
src/clipper2_1.4.sh
 | 
3
+--

3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/clipper2.mk.in b/src/clipper2.mk.in
@@ -14,7 +14,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 # Configuration macros
-CLIPPER2_TAG=@TAG@
+CLIPPER2_TAG=TAG
 CLIPPER2_URL_ONLINE = https://github.com/AngusJohnson/Clipper2
 CLIPPER2_URL_OFFLINE = $(MIRROR)/Clipper2
 CLIPPER2_URL = $(CLIPPER2_URL_$(NETWORK))
@@ -22,6 +22,7 @@ CLIPPER2_URL = $(CLIPPER2_URL_$(NETWORK))
 # Helper macros
 CLIPPER2_DIR=$(CACHE)/clipper2/$(CLIPPER2_TAG)
 CLIPPER2_CMAKE_OPTIONS =\
+ ifelse(TAG, Clipper2_1.1.1, -DCMAKE_CXX_FLAGS=-Wno-template-id-cdtor)\
  -DCMAKE_BUILD_TYPE=Release\
  -DCMAKE_INSTALL_LIBDIR="lib"\
  -DCLIPPER2_TESTS=0\
diff --git a/src/clipper2_1.1.1.sh b/src/clipper2_1.1.1.sh
@@ -21,8 +21,7 @@ set -e
 export CLIPPER2_SH=1
 
 tag="Clipper2_1.1.1"
-
-sed "s/@TAG@/${tag}/" "src/clipper2.mk.in"
+m4 -D TAG="${tag}" "src/clipper2.mk.in"
 
 # Add the template file as a prerequisite for the script invoked
 # i.e. the build file
diff --git a/src/clipper2_1.4.sh b/src/clipper2_1.4.sh
@@ -21,8 +21,7 @@ set -e
 export CLIPPER2_SH=1
 
 tag="Clipper2_1.4.0"
-
-sed "s/@TAG@/${tag}/" "src/clipper2.mk.in"
+m4 -D TAG="${tag}" "src/clipper2.mk.in"
 
 # Add the template file as a prerequisite for the script invoked
 # i.e. the build file