diff options
| author | Bastien Bouclet | 2018-07-30 13:41:34 +0200 |
|---|---|---|
| committer | Bastien Bouclet | 2018-08-04 07:55:23 +0200 |
| commit | 172cdab90f5168b7ede6a4359d4b6d96173391aa (patch) | |
| tree | 89b49131a036724d61f0c1ce5922c5ca8bbde0ce | |
| parent | df613af817c97b300555355848c4469f16302122 (diff) | |
| download | scummvm-rg350-172cdab90f5168b7ede6a4359d4b6d96173391aa.tar.gz scummvm-rg350-172cdab90f5168b7ede6a4359d4b6d96173391aa.tar.bz2 scummvm-rg350-172cdab90f5168b7ede6a4359d4b6d96173391aa.zip | |
BUILD: Save the PKG_CONFIG_LIBDIR environment variable across rebuilds
| -rw-r--r-- | Makefile | 7 | ||||
| -rwxr-xr-x | configure | 64 |
2 files changed, 38 insertions, 33 deletions
@@ -91,9 +91,10 @@ ifeq "$(findstring config.mk,$(MAKEFILE_LIST))" "config.mk" 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)" \ + 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)" \ $(srcdir)/configure $(SAVED_CONFIGFLAGS) else $(error You need to run $(srcdir)/configure before you can run make. Check $(srcdir)/configure --help for a list of parameters) @@ -37,6 +37,7 @@ SAVED_CXX=$CXX SAVED_CXXFLAGS=$CXXFLAGS SAVED_LD=$LD SAVED_LDFLAGS=$LDFLAGS +SAVED_PKG_CONFIG_LIBDIR=$PKG_CONFIG_LIBDIR SAVED_RANLIB=$RANLIB SAVED_SDL_CONFIG=$SDL_CONFIG SAVED_STRIP=$STRIP @@ -1096,21 +1097,23 @@ Optional Libraries: --disable-libcurl disable libcurl networking library [autodetect] Some influential environment variables: - AR archiver command - AS assembler command - ASFLAGS assembler flags - 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 - LD linker command - LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a - nonstandard directory <lib dir> - RANLIB archive indexer command - SDL_CONFIG SDL configurer script name (not path) - STRIP symbol stripper command - WINDRES Windows resource compiler command - WINDRESFLAGS Windows resource compiler flags + AR archiver command + AS assembler command + ASFLAGS assembler flags + 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 + LD linker command + LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a + nonstandard directory <lib dir> + PKG_CONFIG_LIBDIR list of directories where pkg-config ‘.pc’ files are + looked up + RANLIB archive indexer command + SDL_CONFIG SDL configurer script name (not path) + STRIP symbol stripper command + WINDRES Windows resource compiler command + WINDRESFLAGS Windows resource compiler flags EOF exit 0 @@ -1127,7 +1130,7 @@ cat >> $TMPLOG <<EOF Invocation command line was: $0 $@ 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 @@ -5462,20 +5465,21 @@ $_mak_plugins port_mk = $_port_mk -SAVED_CONFIGFLAGS := $SAVED_CONFIGFLAGS -SAVED_AR := $SAVED_AR -SAVED_AS := $SAVED_AS -SAVED_ASFLAGS := $SAVED_ASFLAGS -SAVED_CPPFLAGS := $SAVED_CPPFLAGS -SAVED_CXX := $SAVED_CXX -SAVED_CXXFLAGS := $SAVED_CXXFLAGS -SAVED_LD := $SAVED_LD -SAVED_LDFLAGS := $SAVED_LDFLAGS -SAVED_RANLIB := $SAVED_RANLIB -SAVED_SDL_CONFIG := $SAVED_SDL_CONFIG -SAVED_STRIP := $SAVED_STRIP -SAVED_WINDRES := $SAVED_WINDRES -SAVED_WINDRESFLAGS := $SAVED_WINDRESFLAGS +SAVED_CONFIGFLAGS := $SAVED_CONFIGFLAGS +SAVED_AR := $SAVED_AR +SAVED_AS := $SAVED_AS +SAVED_ASFLAGS := $SAVED_ASFLAGS +SAVED_CPPFLAGS := $SAVED_CPPFLAGS +SAVED_CXX := $SAVED_CXX +SAVED_CXXFLAGS := $SAVED_CXXFLAGS +SAVED_LD := $SAVED_LD +SAVED_LDFLAGS := $SAVED_LDFLAGS +SAVED_PKG_CONFIG_LIBDIR := $SAVED_PKG_CONFIG_LIBDIR +SAVED_RANLIB := $SAVED_RANLIB +SAVED_SDL_CONFIG := $SAVED_SDL_CONFIG +SAVED_STRIP := $SAVED_STRIP +SAVED_WINDRES := $SAVED_WINDRES +SAVED_WINDRESFLAGS := $SAVED_WINDRESFLAGS EOF # |