diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile.top | 2 | ||||
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | odk/source/unowinreg/win/makefile.mk | 1 | ||||
| -rw-r--r-- | scp2/CustomTarget_langmacros.mk | 4 | ||||
| -rw-r--r-- | scp2/macros/macro.pl | 2 |
6 files changed, 11 insertions, 13 deletions
diff --git a/.gitignore b/.gitignore index bfcbb5669fae..e1799e23ebb1 100644 --- a/.gitignore +++ b/.gitignore @@ -56,6 +56,7 @@ /config.parms /config_host.mk /config_host.mk.last +/config_host.mk.stamp /config_build.mk /configure /desktop/scripts/soffice.sh @@ -75,7 +76,6 @@ # misc /file-lists /cross-build-toolset.built -/set_soenv.stamp /warn /build.log /build_error.log diff --git a/Makefile.top b/Makefile.top index 42e63a031b6e..1842c55a4bba 100644 --- a/Makefile.top +++ b/Makefile.top @@ -354,7 +354,7 @@ ifeq ($(BUILD_DMAKE),YES) endif rm -fr config_host.mk config_build.mk aclocal.m4 autom4te.cache \ config.log config.status configure ooo.lst \ - config_host.mk.last set_soenv.stamp src.downloaded warn + config_host.mk.last config_host.mk.stamp src.downloaded warn find $(SOLARENV)/gdb -name "*.pyc" -exec rm {} \; # diff --git a/configure.ac b/configure.ac index c968dc2e19ef..c75c082ebbba 100644 --- a/configure.ac +++ b/configure.ac @@ -2903,7 +2903,7 @@ if test "$GCC" = "yes"; then if test "$_os" = "Darwin" -a "$with_macosx_sdk" = "10.4" -a "$GCCVER" -ge "040100"; then if test -z "$save_CC" -a -x "$GCC_HOME/bin/gcc-4.0"; then export CC="$GCC_HOME/bin/gcc-4.0" - # export CC to have it available in set_soenv -> config.guess + # export CC to make it finally available to config.guess GCCVER2=`$CC -dumpversion | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'` if test "$GCCVER2" -ge "040000" -a "$GCCVER2" -lt "040100"; then GCCVER=$GCCVER2 @@ -3215,8 +3215,7 @@ if test "$_os" = "WINNT"; then fi AC_SUBST(BUILD_X64) - # These are passed to the environment through set_soenv.in as usual, and then - # used in set_wntx64.mk + # These are passed to the environment and then used in set_wntx64.mk AC_SUBST(CXX_X64_BINARY) AC_SUBST(LINK_X64_BINARY) AC_SUBST(LIBMGR_X64_BINARY) @@ -12524,13 +12523,13 @@ fi AC_CONFIG_FILES([config_host.mk ooo.lst]) AC_OUTPUT -# touch the config timestamp file set_soenv.stamp -if test ! -f set_soenv.stamp; then - echo > set_soenv.stamp +# touch the config timestamp file +if test ! -f config_host.mk.stamp; then + echo > config_host.mk.stamp elif diff config_host.mk config_host.mk.last >/dev/null 2>&1; then echo "Configuration unchanged - avoiding scp2 stamp update" else - echo > set_soenv.stamp + echo > config_host.mk.stamp fi diff --git a/odk/source/unowinreg/win/makefile.mk b/odk/source/unowinreg/win/makefile.mk index f614b366f656..36cce52c8993 100644 --- a/odk/source/unowinreg/win/makefile.mk +++ b/odk/source/unowinreg/win/makefile.mk @@ -40,7 +40,6 @@ USE_DEFFILE=TRUE JAVA_INCLUDES:= -I$(JAVA_HOME)/include -# values taken from set_soenv.in .IF "$(OS)" == "LINUX" JAVA_INCLUDES+= -I$(JAVA_HOME)/include/linux .ELIF "$(OS)" == "FREEBSD" diff --git a/scp2/CustomTarget_langmacros.mk b/scp2/CustomTarget_langmacros.mk index 1d1a15793d69..19c680fcac02 100644 --- a/scp2/CustomTarget_langmacros.mk +++ b/scp2/CustomTarget_langmacros.mk @@ -31,10 +31,10 @@ $(call gb_CustomTarget_get_target,scp2/macros) : $(call gb_CustomTarget_get_work $(call gb_CustomTarget_get_workdir,scp2/macros)/langmacros.inc :| $(call gb_CustomTarget_get_workdir,scp2/macros)/.dir -$(call gb_CustomTarget_get_workdir,scp2/macros)/langmacros.inc : $(SRCDIR)/scp2/macros/macro.pl $(SRCDIR)/set_soenv.stamp +$(call gb_CustomTarget_get_workdir,scp2/macros)/langmacros.inc : $(SRCDIR)/scp2/macros/macro.pl $(SRCDIR)/config_host.mk.stamp $(call gb_Helper_abbreviate_dirs,\ export COMPLETELANGISO_VAR='$(gb_ScpTemplateTarget_LANGS)' && \ - $(PERL) $< -verbose -o $@ -c $(SRCDIR)/set_soenv.stamp \ + $(PERL) $< -verbose -o $@ -c $(SRCDIR)/config_host.mk.stamp \ ) # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl index 9ea949cccf74..dc5d2a978a31 100644 --- a/scp2/macros/macro.pl +++ b/scp2/macros/macro.pl @@ -261,7 +261,7 @@ sub args_require_build # changed script - run always return 1 if (stat($0))[9] > (stat("$destfile"))[9] ; - # changed set_soenv.stamp - run always + # changed config timestamp - run always if (-f "$config_stamp") { return 1 if (stat($config_stamp))[9] > (stat($destfile))[9]; } |