[vlc-commits] [Git][videolan/vlc][3.0.x] contrib: sidplay: Do not overwrite CXXFLAGS in configure.in
David (@dfuhrmann)
gitlab at videolan.org
Thu Jun 6 07:44:21 UTC 2024
David pushed to branch 3.0.x at VideoLAN / VLC
Commits:
86a582c9 by David Fuhrmann at 2024-06-06T09:43:50+02: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
=====================================
@@ -24,10 +24,12 @@ sidplay-libs: sidplay-libs-$(SID_VERSION).tar.gz .sum-sidplay2
$(APPLY) $(SRC)/sidplay2/sidplay2-noutils.patch
$(APPLY) $(SRC)/sidplay2/sidplay2-string.patch
$(APPLY) $(SRC)/sidplay2/sidplay2-fix-overflow.patch
+ $(APPLY) $(SRC)/sidplay2/sidplay2-cxxtest.patch
$(MOVE)
.sidplay2: sidplay-libs
$(REQUIRE_GPL)
+ #export ac_cv_sizeof_int=4
for d in . libsidplay builders resid builders/resid-builder \
builders/hardsid-builder libsidutils ; \
do \
=====================================
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/86a582c93eb1a442bd1d8641853bebf752225dbd
--
This project does not include diff previews in email notifications.
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/86a582c93eb1a442bd1d8641853bebf752225dbd
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list