mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kill set_oenv remnants (by just renaming the required timestamp file)

Browse Source 
Change-Id: I779128111a4f69235a4c8cc6510018fc61d1b24b
Reviewed-on: https://gerrit.libreoffice.org/1026
Tested-by: Tor Lillqvist <tml@iki.fi>
Reviewed-by: Tor Lillqvist <tml@iki.fi>
This commit is contained in:
Matteo Casalin
2012-11-10 22:14:47 +01:00
committed by Tor Lillqvist
parent cee6c4b193
commit e7037b2e7e
6 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -56,6 +56,7 @@
/config.parms /config.parms
/config_host.mk /config_host.mk
/config_host.mk.last /config_host.mk.last
/config_host.mk.stamp
/config_build.mk /config_build.mk
/configure /configure
/desktop/scripts/soffice.sh /desktop/scripts/soffice.sh
@@ -75,7 +76,6 @@
# misc # misc
/file-lists /file-lists
/cross-build-toolset.built /cross-build-toolset.built
/set_soenv.stamp
/warn /warn
/build.log /build.log
/build_error.log /build_error.log

2
Makefile.top
View File

@@ -354,7 +354,7 @@ ifeq ($(BUILD_DMAKE),YES)
endif endif
rm -fr config_host.mk config_build.mk aclocal.m4 autom4te.cache \ rm -fr config_host.mk config_build.mk aclocal.m4 autom4te.cache \
config.log config.status configure ooo.lst \ 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 {} \; find $(SOLARENV)/gdb -name "*.pyc" -exec rm {} \;
# #

13
configure.ac
View File

@@ -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 "$_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 if test -z "$save_CC" -a -x "$GCC_HOME/bin/gcc-4.0"; then
export CC="$GCC_HOME/bin/gcc-4.0" 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 }'` GCCVER2=`$CC -dumpversion | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
if test "$GCCVER2" -ge "040000" -a "$GCCVER2" -lt "040100"; then if test "$GCCVER2" -ge "040000" -a "$GCCVER2" -lt "040100"; then
GCCVER=$GCCVER2 GCCVER=$GCCVER2
@@ -3215,8 +3215,7 @@ if test "$_os" = "WINNT"; then
fi fi
AC_SUBST(BUILD_X64) AC_SUBST(BUILD_X64)
# These are passed to the environment through set_soenv.in as usual, and then # These are passed to the environment and then used in set_wntx64.mk
# used in set_wntx64.mk
AC_SUBST(CXX_X64_BINARY) AC_SUBST(CXX_X64_BINARY)
AC_SUBST(LINK_X64_BINARY) AC_SUBST(LINK_X64_BINARY)
AC_SUBST(LIBMGR_X64_BINARY) AC_SUBST(LIBMGR_X64_BINARY)
@@ -12524,13 +12523,13 @@ fi
AC_CONFIG_FILES([config_host.mk ooo.lst]) AC_CONFIG_FILES([config_host.mk ooo.lst])
AC_OUTPUT AC_OUTPUT
# touch the config timestamp file set_soenv.stamp # touch the config timestamp file
if test ! -f set_soenv.stamp; then if test ! -f config_host.mk.stamp; then
echo > set_soenv.stamp echo > config_host.mk.stamp
elif diff config_host.mk config_host.mk.last >/dev/null 2>&1; then elif diff config_host.mk config_host.mk.last >/dev/null 2>&1; then
echo "Configuration unchanged - avoiding scp2 stamp update" echo "Configuration unchanged - avoiding scp2 stamp update"
else else
echo > set_soenv.stamp echo > config_host.mk.stamp
fi fi

1
odk/source/unowinreg/win/makefile.mk
View File

@@ -40,7 +40,6 @@ USE_DEFFILE=TRUE
JAVA_INCLUDES:= -I$(JAVA_HOME)/include JAVA_INCLUDES:= -I$(JAVA_HOME)/include
# values taken from set_soenv.in
.IF "$(OS)" == "LINUX" .IF "$(OS)" == "LINUX"
JAVA_INCLUDES+= -I$(JAVA_HOME)/include/linux JAVA_INCLUDES+= -I$(JAVA_HOME)/include/linux
.ELIF "$(OS)" == "FREEBSD" .ELIF "$(OS)" == "FREEBSD"

4
scp2/CustomTarget_langmacros.mk
View File

@@ -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 :| $(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,\ $(call gb_Helper_abbreviate_dirs,\
export COMPLETELANGISO_VAR='$(gb_ScpTemplateTarget_LANGS)' && \ 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: # vim: set shiftwidth=4 tabstop=4 noexpandtab:

2
scp2/macros/macro.pl
View File

@@ -261,7 +261,7 @@ sub args_require_build
# changed script - run always # changed script - run always
return 1 if (stat($0))[9] > (stat("$destfile"))[9] ; return 1 if (stat($0))[9] > (stat("$destfile"))[9] ;
# changed set_soenv.stamp - run always # changed config timestamp - run always
if (-f "$config_stamp") { if (-f "$config_stamp") {
return 1 if (stat($config_stamp))[9] > (stat($destfile))[9]; return 1 if (stat($config_stamp))[9] > (stat($destfile))[9];
} }