Skip to content
Snippets Groups Projects
Commit d812b753 authored by David's avatar David Committed by Steve Lhomme
Browse files

contrib: sidplay: Do not overwrite CXXFLAGS in configure.in

resid configure has a bug which overwrites CXXFLAGS unconditionally,
causing build failures when preset CXXFLAGS are needed.

Reason: In newer autoconf, ac_test_CXXFLAGS does not use "set"
anymore, but "y".
parent 98cb3ad1
No related branches found
No related tags found
1 merge request!5536contrib: sidplay: Do not overwrite CXXFLAGS in configure.in
Pipeline #478649 passed with warnings with stage
in 40 minutes and 4 seconds
......@@ -27,6 +27,7 @@ sidplay-libs: sidplay-libs-$(SID_VERSION).tar.gz .sum-sidplay2
$(APPLY) $(SRC)/sidplay2/sidplay2-resid-dependency.patch
$(APPLY) $(SRC)/sidplay2/sidplay2-char-cast.patch
$(APPLY) $(SRC)/sidplay2/sidplay2-fix-overflow.patch
$(APPLY) $(SRC)/sidplay2/sidplay2-cxxtest.patch
$(MOVE)
.sidplay2: sidplay-libs
......
--- sidplay-libs/resid/configure.in.old 2024-06-06 09:31:47.000000000 +0200
+++ sidplay-libs/resid/configure.in 2024-06-06 09:32:10.000000000 +0200
@@ -28,7 +28,7 @@
dnl Set CXXFLAGS for g++. Use -fno-exceptions if supported.
if test "$GXX" = yes; then
- if test "$ac_test_CXXFLAGS" != set; then
+ if test "$ac_test_CXXFLAGS" != set -a "$ac_test_CXXFLAGS" != y; then
CXXFLAGS="-g -Wall -O2 -funroll-loops -fomit-frame-pointer -fno-exceptions"
AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works])
AC_TRY_COMPILE([],
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment