Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
d812b753 by David Fuhrmann at 2024-06-08T09:08:49+00:00
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".
- - - - -
2 changed files:
- contrib/src/sidplay2/rules.mak
- + contrib/src/sidplay2/sidplay2-cxxtest.patch
Changes:
=====================================
contrib/src/sidplay2/rules.mak
=====================================
@@ -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
=====================================
contrib/src/sidplay2/sidplay2-cxxtest.patch
=====================================
@@ -0,0 +1,11 @@
+--- 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([],
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/d812b75331506a99b4a7a807037097752f2a78be
--
This project does not include diff previews in email notifications.
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/d812b75331506a99b4a7a807037097752f2a78be
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
