[Scummvm-git-logs] scummvm branch-3-0 -> e13310fdc35ab54a84e8db8bbc24343a6e7e8961
lephilousophe
noreply at scummvm.org
Sun Dec 14 22:41:53 UTC 2025
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
881565c5c5 ATARI: Various packaging fixes
e13310fdc3 COMMON: Rename CPPFILT environment variable to CXXFILT
Commit: 881565c5c5594e63dc70444a275bb248ee5c3724
https://github.com/scummvm/scummvm/commit/881565c5c5594e63dc70444a275bb248ee5c3724
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2025-12-14T23:41:21+01:00
Commit Message:
ATARI: Various packaging fixes
Don't use cp -a when not needed: this may fail when preserving ownership
rights across filesystems.
Don't try to rename non-existent files (partial build).
Changed paths:
backends/platform/atari/atari.mk
diff --git a/backends/platform/atari/atari.mk b/backends/platform/atari/atari.mk
index 634035c0a9e..66d3346acca 100644
--- a/backends/platform/atari/atari.mk
+++ b/backends/platform/atari/atari.mk
@@ -24,23 +24,23 @@ atarilitedist: $(EXECUTABLE)
$(RM_REC) ${LITE_DIR}
$(MKDIR) ${LITE_DIR}
- $(CP) -a $(EXECUTABLE) ${LITE_DIR}
+ $(CP) $(EXECUTABLE) ${LITE_DIR}
$(NM) -C ${LITE_DIR}/$(EXECUTABLE) | grep -vF ' .L' | grep ' [TtWV] ' | $(CPPFILT) | sort -u > ${LITE_DIR}/scummvm.sym
$(STRIP) -s ${LITE_DIR}/$(EXECUTABLE)
$(MKDIR) ${LITE_DOCS}
- $(CP) -a $(DIST_FILES_DOCS) ${LITE_DOCS}
+ $(CP) $(DIST_FILES_DOCS) ${LITE_DOCS}
$(MKDIR) ${LITE_DATA}
- $(CP) -a $(DIST_FILES_ENGINEDATA) $(DIST_FILES_ENGINEDATA_BIG) ${LITE_DATA}
+ $(CP) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_ENGINEDATA_BIG) ${LITE_DATA}
# remove unused files
$(RM) ${LITE_DATA}/helpdialog.zip
$(RM) $(addsuffix .dat, $(addprefix ${LITE_DATA}/, achievements classicmacfonts encoding macgui))
# rename remaining files still not fitting into the 8+3 limit (this has to be supported by the backend, too)
- mv ${LITE_DATA}/supernova.dat ${LITE_DATA}/supernov.dat
- mv ${LITE_DATA}/teenagent.dat ${LITE_DATA}/teenagen.dat
+ ! [ -f ${LITE_DATA}/supernova.dat ] || mv ${LITE_DATA}/supernova.dat ${LITE_DATA}/supernov.dat
+ ! [ -f ${LITE_DATA}/teenagent.dat ] || mv ${LITE_DATA}/teenagent.dat ${LITE_DATA}/teenagen.dat
# readme.txt
$(CP) -r $(DIST_FILES_PLATFORM) ${LITE_DIR}
@@ -55,28 +55,28 @@ atarifulldist: $(EXECUTABLE)
$(RM_REC) ${FULL_DIR}
$(MKDIR) ${FULL_DIR}
- $(CP) -a $(EXECUTABLE) ${FULL_DIR}
+ $(CP) $(EXECUTABLE) ${FULL_DIR}
$(NM) -C ${FULL_DIR}/$(EXECUTABLE) | grep -vF ' .L' | grep ' [TtWV] ' | $(CPPFILT) | sort -u > ${FULL_DIR}/scummvm.sym
$(STRIP) -s ${FULL_DIR}/$(EXECUTABLE)
$(MKDIR) ${FULL_DOCS}
- $(CP) -a $(DIST_FILES_DOCS) ${FULL_DOCS}
+ $(CP) $(DIST_FILES_DOCS) ${FULL_DOCS}
$(MKDIR) ${FULL_DATA}
- $(CP) -a $(DIST_FILES_ENGINEDATA) $(DIST_FILES_ENGINEDATA_BIG) ${FULL_DATA}
+ $(CP) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_ENGINEDATA_BIG) ${FULL_DATA}
# remove unused files
$(RM) ${FULL_DATA}/helpdialog.zip
$(RM) $(addsuffix .dat, $(addprefix ${FULL_DATA}/, achievements classicmacfonts encoding hadesch_translations macgui prince_translation))
# rename remaining files still not fitting into the 8+3 limit (this has to be supported by the backend, too)
- mv ${FULL_DATA}/cryomni3d.dat ${FULL_DATA}/cryomni3.dat
- mv ${FULL_DATA}/neverhood.dat ${FULL_DATA}/neverhoo.dat
- mv ${FULL_DATA}/supernova.dat ${FULL_DATA}/supernov.dat
- mv ${FULL_DATA}/teenagent.dat ${FULL_DATA}/teenagen.dat
+ ! [ -f ${FULL_DATA}/cryomni3d.dat ] || mv ${FULL_DATA}/cryomni3d.dat ${FULL_DATA}/cryomni3.dat
+ ! [ -f ${FULL_DATA}/neverhood.dat ] || mv ${FULL_DATA}/neverhood.dat ${FULL_DATA}/neverhoo.dat
+ ! [ -f ${LITE_DATA}/supernova.dat ] || mv ${LITE_DATA}/supernova.dat ${LITE_DATA}/supernov.dat
+ ! [ -f ${LITE_DATA}/teenagent.dat ] || mv ${LITE_DATA}/teenagent.dat ${LITE_DATA}/teenagen.dat
$(MKDIR) ${FULL_THEMES}
- $(CP) -a $(DIST_FILES_THEMES) ${FULL_THEMES}
+ $(CP) $(DIST_FILES_THEMES) ${FULL_THEMES}
# remove unused files; absent gui-icons.dat massively speeds up startup time (it is used for the grid mode only)
$(RM) ${FULL_THEMES}/gui-icons.dat ${FULL_THEMES}/shaders.dat
@@ -101,21 +101,21 @@ fbdist: $(EXECUTABLE)
$(RM_REC) ${FB_DIR}
$(MKDIR) ${FB_DIR}
- $(CP) -a $(EXECUTABLE) ${FB_DIR}
+ $(CP) $(EXECUTABLE) ${FB_DIR}
$(STRIP) -s ${FB_DIR}/$(EXECUTABLE)
$(MKDIR) ${FB_DOCS}
- $(CP) -a $(DIST_FILES_DOCS) ${FB_DOCS}
+ $(CP) $(DIST_FILES_DOCS) ${FB_DOCS}
$(MKDIR) ${FB_DATA}
- $(CP) -a $(DIST_FILES_ENGINEDATA) $(DIST_FILES_ENGINEDATA_BIG) ${FB_DATA}
+ $(CP) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_ENGINEDATA_BIG) ${FB_DATA}
# remove unused files
$(RM) ${FB_DATA}/helpdialog.zip
$(RM) $(addsuffix .dat, $(addprefix ${FB_DATA}/, achievements classicmacfonts encoding hadesch_translations macgui prince_translation))
$(MKDIR) ${FB_THEMES}
- $(CP) -a $(DIST_FILES_THEMES) ${FB_THEMES}
+ $(CP) $(DIST_FILES_THEMES) ${FB_THEMES}
# remove unused files
$(RM) ${FB_THEMES}/shaders.dat
Commit: e13310fdc35ab54a84e8db8bbc24343a6e7e8961
https://github.com/scummvm/scummvm/commit/e13310fdc35ab54a84e8db8bbc24343a6e7e8961
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2025-12-14T23:41:26+01:00
Commit Message:
COMMON: Rename CPPFILT environment variable to CXXFILT
This matches common use of x for + and was also used in dockerized-bb
Changed paths:
Makefile
backends/platform/atari/atari.mk
configure
diff --git a/Makefile b/Makefile
index 8cbe36b3356..b4af9763ed4 100644
--- a/Makefile
+++ b/Makefile
@@ -97,7 +97,7 @@ include $(srcdir)/Makefile.common
ENGINE_SUBDIRS_CONFIGURE := $(wildcard $(srcdir)/engines/*/configure.engine)
config.h:
-SAVED_ENV_VARS = AR AS ASFLAGS CPPFILT CPPFLAGS CXX CXXFLAGS LD LDFLAGS NM RANLIB SDL_CONFIG STRIP WINDRES WINDRESFLAGS
+SAVED_ENV_VARS = AR AS ASFLAGS CPPFLAGS CXX CXXFILT CXXFLAGS LD LDFLAGS NM RANLIB SDL_CONFIG STRIP WINDRES WINDRESFLAGS
# The environment variable PKG_CONFIG_LIBDIR has a different meaning
# for pkg-config when it is empty and when it is not defined.
diff --git a/backends/platform/atari/atari.mk b/backends/platform/atari/atari.mk
index 66d3346acca..aa9c0eedaa3 100644
--- a/backends/platform/atari/atari.mk
+++ b/backends/platform/atari/atari.mk
@@ -25,7 +25,7 @@ atarilitedist: $(EXECUTABLE)
$(MKDIR) ${LITE_DIR}
$(CP) $(EXECUTABLE) ${LITE_DIR}
- $(NM) -C ${LITE_DIR}/$(EXECUTABLE) | grep -vF ' .L' | grep ' [TtWV] ' | $(CPPFILT) | sort -u > ${LITE_DIR}/scummvm.sym
+ $(NM) -C ${LITE_DIR}/$(EXECUTABLE) | grep -vF ' .L' | grep ' [TtWV] ' | $(CXXFILT) | sort -u > ${LITE_DIR}/scummvm.sym
$(STRIP) -s ${LITE_DIR}/$(EXECUTABLE)
$(MKDIR) ${LITE_DOCS}
@@ -56,7 +56,7 @@ atarifulldist: $(EXECUTABLE)
$(MKDIR) ${FULL_DIR}
$(CP) $(EXECUTABLE) ${FULL_DIR}
- $(NM) -C ${FULL_DIR}/$(EXECUTABLE) | grep -vF ' .L' | grep ' [TtWV] ' | $(CPPFILT) | sort -u > ${FULL_DIR}/scummvm.sym
+ $(NM) -C ${FULL_DIR}/$(EXECUTABLE) | grep -vF ' .L' | grep ' [TtWV] ' | $(CXXFILT) | sort -u > ${FULL_DIR}/scummvm.sym
$(STRIP) -s ${FULL_DIR}/$(EXECUTABLE)
$(MKDIR) ${FULL_DOCS}
diff --git a/configure b/configure
index ad1534245db..e199432a228 100755
--- a/configure
+++ b/configure
@@ -33,10 +33,10 @@ SAVED_CONFIGFLAGS=$@
SAVED_AR=$AR
SAVED_AS=$AS
SAVED_ASFLAGS=$ASFLAGS
-SAVED_CPPFILT=$CPPFILT
SAVED_CPPFLAGS=$CPPFLAGS
SAVED_CXX=$CXX
SAVED_CXXFLAGS=$CXXFLAGS
+SAVED_CXXFILT=$CXXFILT
SAVED_DWP=$DWP
SAVED_LD=$LD
SAVED_LDFLAGS=$LDFLAGS
@@ -251,7 +251,7 @@ _ext_neon=auto
# Default commands
_ar="ar cr"
_as="as"
-_cppfilt="c++filt"
+_cxxfilt="c++filt"
_ranlib="ranlib"
_nm="nm"
_strip="strip"
@@ -1198,11 +1198,11 @@ Some influential environment variables:
AS assembler command
ASFLAGS assembler flags
CONFIGURE_NO_HOST Ignore the cross-compile target set by the --host= option
- CPPFILT demangle C++ symbols command
CPPFLAGS C++ preprocessor flags, e.g. -I<include dir> if you have
headers in a nonstandard directory <include dir>
CXX C++ compiler command
CXXFLAGS C++ compiler flags
+ CXXFILT demangle C++ symbols command
DWP DWARF packing utility command
LD linker command
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
@@ -1231,7 +1231,7 @@ cat >> $TMPLOG <<EOF
Invocation command line was:
$0 $@
Saved environment variables:
-AR="$SAVED_AR" AS="$SAVED_AS" ASFLAGS="$SAVED_ASFLAGS" CPPFILT="$SAVED_CPPFILT" CPPFLAGS="$SAVED_CPPFLAGS" CXX="$SAVED_CXX" CXXFLAGS="$SAVED_CXXFLAGS" DWP="$SAVED_DWP" LD="$SAVED_LD" LDFLAGS="$SAVED_LDFLAGS" NM="$SAVED_NM" PKG_CONFIG_LIBDIR="$SAVED_PKG_CONFIG_LIBDIR" RANLIB="$SAVED_RANLIB" SDL_CONFIG="$SAVED_SDL_CONFIG" STRIP="$SAVED_STRIP" WINDRES="$SAVED_WINDRES" WINDRESFLAGS="$SAVED_WINDRESFLAGS"
+AR="$SAVED_AR" AS="$SAVED_AS" ASFLAGS="$SAVED_ASFLAGS" CPPFLAGS="$SAVED_CPPFLAGS" CXX="$SAVED_CXX" CXXFLAGS="$SAVED_CXXFLAGS" CXXFILT="$SAVED_CXXFILT" DWP="$SAVED_DWP" LD="$SAVED_LD" LDFLAGS="$SAVED_LDFLAGS" NM="$SAVED_NM" PKG_CONFIG_LIBDIR="$SAVED_PKG_CONFIG_LIBDIR" RANLIB="$SAVED_RANLIB" SDL_CONFIG="$SAVED_SDL_CONFIG" STRIP="$SAVED_STRIP" WINDRES="$SAVED_WINDRES" WINDRESFLAGS="$SAVED_WINDRESFLAGS"
EOF
JPEG_LIBS=-ljpeg
@@ -1988,7 +1988,7 @@ else
# if _host_alias was set, default to the standard GNU tools
_ar="$_host_alias-ar cr"
_as=$_host_alias-as
- _cppfilt=$_host_alias-c++filt
+ _cxxfilt=$_host_alias-c++filt
_nm=$_host_alias-nm
_ranlib=$_host_alias-ranlib
_strip=$_host_alias-strip
@@ -2316,8 +2316,8 @@ if test -n "$AS"; then
_as=$AS
fi
-if test -n "$CPPFILT"; then
- _cppfilt=$CPPFILT
+if test -n "$CXXFILT"; then
+ _cxxfilt=$CXXFILT
fi
if test -n "$NM"; then
@@ -7781,10 +7781,10 @@ SAVED_CONFIGFLAGS := $SAVED_CONFIGFLAGS
SAVED_AR := $SAVED_AR
SAVED_AS := $SAVED_AS
SAVED_ASFLAGS := $SAVED_ASFLAGS
-SAVED_CPPFILT := $SAVED_CPPFILT
SAVED_CPPFLAGS := $SAVED_CPPFLAGS
SAVED_CXX := $SAVED_CXX
SAVED_CXXFLAGS := $SAVED_CXXFLAGS
+SAVED_CXXFILT := $SAVED_CXXFILT
SAVED_DWP := $SAVED_DWP
SAVED_LD := $SAVED_LD
SAVED_LDFLAGS := $SAVED_LDFLAGS
@@ -7799,9 +7799,9 @@ SAVED_WINDRESFLAGS := $SAVED_WINDRESFLAGS
AR := $_ar
AS := $_as
ASFLAGS := $ASFLAGS
-CPPFILT := $_cppfilt
CXX := $CXX
CXXFLAGS := $CXXFLAGS
+CXXFILT := $_cxxfilt
LD := $LD
LIBS += $LIBS
NM := $_nm
More information about the Scummvm-git-logs
mailing list