libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-18 18:30:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUILD: Save the PKG_CONFIG_LIBDIR environment variable across rebuilds

Browse Source
This commit is contained in:
Bastien Bouclet 2018-07-30 13:41:34 +02:00
parent f0d5f5d6e4
commit 667ac7341b
2 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -93,9 +93,10 @@ ifeq "$(findstring config.mk,$(MAKEFILE_LIST))" "config.mk"
AR="$(SAVED_AR)" AS="$(SAVED_AS)" ASFLAGS="$(SAVED_ASFLAGS)" \ AR="$(SAVED_AR)" AS="$(SAVED_AS)" ASFLAGS="$(SAVED_ASFLAGS)" \
CPPFLAGS="$(SAVED_CPPFLAGS)" CXX="$(SAVED_CXX)" \ CPPFLAGS="$(SAVED_CPPFLAGS)" CXX="$(SAVED_CXX)" \
CXXFLAGS="$(SAVED_CXXFLAGS)" LD="$(SAVED_LD)" \ CXXFLAGS="$(SAVED_CXXFLAGS)" LD="$(SAVED_LD)" \
LDFLAGS="$(SAVED_LDFLAGS)" RANLIB="$(SAVED_RANLIB)" \ LDFLAGS="$(SAVED_LDFLAGS)" PKG_CONFIG_LIBDIR="$(SAVED_PKG_CONFIG_LIBDIR)" \
SDL_CONFIG="$(SAVED_SDL_CONFIG)" STRIP="$(SAVED_STRIP)" \ RANLIB="$(SAVED_RANLIB)" SDL_CONFIG="$(SAVED_SDL_CONFIG)" \
WINDRES="$(SAVED_WINDRES)" WINDRESFLAGS="$(SAVED_WINDRESFLAGS)" \ STRIP="$(SAVED_STRIP)" WINDRES="$(SAVED_WINDRES)" \
WINDRESFLAGS="$(SAVED_WINDRESFLAGS)" \
$(srcdir)/configure $(SAVED_CONFIGFLAGS) $(srcdir)/configure $(SAVED_CONFIGFLAGS)
else else
$(error You need to run $(srcdir)/configure before you can run make. Check $(srcdir)/configure --help for a list of parameters) $(error You need to run $(srcdir)/configure before you can run make. Check $(srcdir)/configure --help for a list of parameters)

64
configure vendored
View File

@ -37,6 +37,7 @@ SAVED_CXX=$CXX
SAVED_CXXFLAGS=$CXXFLAGS SAVED_CXXFLAGS=$CXXFLAGS
SAVED_LD=$LD SAVED_LD=$LD
SAVED_LDFLAGS=$LDFLAGS SAVED_LDFLAGS=$LDFLAGS
SAVED_PKG_CONFIG_LIBDIR=$PKG_CONFIG_LIBDIR
SAVED_RANLIB=$RANLIB SAVED_RANLIB=$RANLIB
SAVED_SDL_CONFIG=$SDL_CONFIG SAVED_SDL_CONFIG=$SDL_CONFIG
SAVED_STRIP=$STRIP SAVED_STRIP=$STRIP
@ -1065,21 +1066,23 @@ Optional Libraries:
--disable-libcurl disable libcurl networking library [autodetect] --disable-libcurl disable libcurl networking library [autodetect]
Some influential environment variables: Some influential environment variables:
AR archiver command AR archiver command
AS assembler command AS assembler command
ASFLAGS assembler flags ASFLAGS assembler flags
CPPFLAGS C++ preprocessor flags, e.g. -I<include dir> if you have CPPFLAGS C++ preprocessor flags, e.g. -I<include dir> if you have
headers in a nonstandard directory <include dir> headers in a nonstandard directory <include dir>
CXX C++ compiler command CXX C++ compiler command
CXXFLAGS C++ compiler flags CXXFLAGS C++ compiler flags
LD linker command LD linker command
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir> nonstandard directory <lib dir>
RANLIB archive indexer command PKG_CONFIG_LIBDIR list of directories where pkg-config ‘.pc’ files are
SDL_CONFIG SDL configurer script name (not path) looked up
STRIP symbol stripper command RANLIB archive indexer command
WINDRES Windows resource compiler command SDL_CONFIG SDL configurer script name (not path)
WINDRESFLAGS Windows resource compiler flags STRIP symbol stripper command
WINDRES Windows resource compiler command
WINDRESFLAGS Windows resource compiler flags
EOF EOF
exit 0 exit 0
@ -1096,7 +1099,7 @@ cat >> $TMPLOG <<EOF
Invocation command line was: Invocation command line was:
$0 $@ $0 $@
Saved environment variables: Saved environment variables:
AR="$SAVED_AR" AS="$SAVED_AS" ASFLAGS="$SAVED_ASFLAGS" CPPFLAGS="$SAVED_CPPFLAGS" CXX="$SAVED_CXX" CXXFLAGS="$SAVED_CXXFLAGS" LD="$SAVED_LD" LDFLAGS="$SAVED_LDFLAGS" 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" LD="$SAVED_LD" LDFLAGS="$SAVED_LDFLAGS" 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 EOF
@ -5594,20 +5597,21 @@ $_mak_plugins
port_mk = $_port_mk port_mk = $_port_mk
SAVED_CONFIGFLAGS := $SAVED_CONFIGFLAGS SAVED_CONFIGFLAGS := $SAVED_CONFIGFLAGS
SAVED_AR := $SAVED_AR SAVED_AR := $SAVED_AR
SAVED_AS := $SAVED_AS SAVED_AS := $SAVED_AS
SAVED_ASFLAGS := $SAVED_ASFLAGS SAVED_ASFLAGS := $SAVED_ASFLAGS
SAVED_CPPFLAGS := $SAVED_CPPFLAGS SAVED_CPPFLAGS := $SAVED_CPPFLAGS
SAVED_CXX := $SAVED_CXX SAVED_CXX := $SAVED_CXX
SAVED_CXXFLAGS := $SAVED_CXXFLAGS SAVED_CXXFLAGS := $SAVED_CXXFLAGS
SAVED_LD := $SAVED_LD SAVED_LD := $SAVED_LD
SAVED_LDFLAGS := $SAVED_LDFLAGS SAVED_LDFLAGS := $SAVED_LDFLAGS
SAVED_RANLIB := $SAVED_RANLIB SAVED_PKG_CONFIG_LIBDIR := $SAVED_PKG_CONFIG_LIBDIR
SAVED_SDL_CONFIG := $SAVED_SDL_CONFIG SAVED_RANLIB := $SAVED_RANLIB
SAVED_STRIP := $SAVED_STRIP SAVED_SDL_CONFIG := $SAVED_SDL_CONFIG
SAVED_WINDRES := $SAVED_WINDRES SAVED_STRIP := $SAVED_STRIP
SAVED_WINDRESFLAGS := $SAVED_WINDRESFLAGS SAVED_WINDRES := $SAVED_WINDRES
SAVED_WINDRESFLAGS := $SAVED_WINDRESFLAGS
EOF EOF
# #