[Libreoffice-commits] core.git: 17 commits - bridges/Library_cpp_uno.mk bridges/Module_bridges.mk codemaker/source config_host.mk.in configure.ac download.lst external/hyphen external/mingw-externals external/mythes external/nss external/openssl external/postgresql idl/inc idl/source include/rtl odk/CustomTarget_check.mk sal/Library_sal.mk scp2/source solenv/bin solenv/gbuild vcl/generic vcl/Library_vcl.mk vcl/source vcl/unx
Michael Stahl
mstahl at redhat.com
Thu Nov 7 01:43:13 CET 2013
bridges/Library_cpp_uno.mk | 32 ++++-----
bridges/Module_bridges.mk | 2
codemaker/source/codemaker/global.cxx | 5 -
config_host.mk.in | 4 -
configure.ac | 60 ++---------------
download.lst | 6 -
external/hyphen/ExternalProject_hyphen.mk | 2
external/mingw-externals/CustomTarget_jawt.mk | 2
external/mythes/ExternalProject_mythes.mk | 2
external/nss/ExternalProject_nss.mk | 6 -
external/openssl/ExternalProject_openssl.mk | 14 +--
external/postgresql/postgresql-9.2.1-libreoffice.patch | 41 -----------
idl/inc/lex.hxx | 4 -
idl/source/cmptools/lex.cxx | 4 -
include/rtl/string.hxx | 7 -
include/rtl/ustring.hxx | 3
odk/CustomTarget_check.mk | 16 ++--
sal/Library_sal.mk | 2
scp2/source/accessories/file_font_accessories.scp | 2
solenv/bin/modules/installer/archivefiles.pm | 6 -
solenv/bin/modules/installer/control.pm | 2
solenv/bin/modules/installer/environment.pm | 2
solenv/bin/modules/installer/globals.pm | 1
solenv/bin/modules/installer/parameter.pm | 5 -
solenv/bin/modules/installer/systemactions.pm | 5 -
solenv/bin/modules/installer/ziplist.pm | 9 --
solenv/bin/modules/par2script/systemactions.pm | 7 -
solenv/bin/modules/pre2par/systemactions.pm | 7 -
solenv/gbuild/ExternalExecutable.mk | 4 -
solenv/gbuild/TargetLocations.mk | 2
solenv/gbuild/platform/com_MSC_class.mk | 3
vcl/Library_vcl.mk | 2
vcl/generic/glyphs/gcach_ftyp.cxx | 2
vcl/source/glyphs/graphite_features.cxx | 2
vcl/unx/generic/printer/ppdparser.cxx | 4 -
35 files changed, 76 insertions(+), 201 deletions(-)
New commits:
commit 518f404db780939e3f1d96300ebeeb1faaad6838
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Nov 6 16:51:05 2013 +0100
installer: remove some special-casing of obsolete "common.pro" dirs
Change-Id: I8e79bb278759c3d6c5c782c6f2e0df8758e801c8
diff --git a/solenv/bin/modules/installer/archivefiles.pm b/solenv/bin/modules/installer/archivefiles.pm
index ae138d9..e309418 100644
--- a/solenv/bin/modules/installer/archivefiles.pm
+++ b/solenv/bin/modules/installer/archivefiles.pm
@@ -162,14 +162,8 @@ sub resolving_archive_flag
if ( $styles =~ /\bARCHIVE\b/ ) # copying, unzipping and changing the file list
{
- my $iscommonfile = 0;
my $sourcepath = $onefile->{'sourcepath'};
- if ( $sourcepath =~ /\Q$installer::globals::separator\E\bcommon\Q$installer::globals::separator\E/ ) # /common/ or /common.pro/
- {
- $iscommonfile = 1;
- }
-
my $use_internal_rights = 0;
if ( $styles =~ /\bUSE_INTERNAL_RIGHTS\b/ ) { $use_internal_rights = 1; } # using the rights used inside the zip file
diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm
index 2037c10..0c17b48 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -202,11 +202,6 @@ sub create_directories
if ($newdirectory eq "unzip" ) # special handling for common directory
{
- $path = $path . ".." . $installer::globals::separator . "common" . $installer::globals::separator;
- create_directory($path);
-
- $path = $path . $newdirectory . $installer::globals::separator;
- create_directory($path);
}
else
{
diff --git a/solenv/bin/modules/par2script/systemactions.pm b/solenv/bin/modules/par2script/systemactions.pm
index 475f276..4783927 100644
--- a/solenv/bin/modules/par2script/systemactions.pm
+++ b/solenv/bin/modules/par2script/systemactions.pm
@@ -75,11 +75,6 @@ sub create_directories
if ($directory eq "unzip" )
{
- $path = $path . "common" . $par2script::globals::separator;
- create_directory($path);
-
- $path = $path . $directory . $par2script::globals::separator;
- create_directory($path);
}
else
{
diff --git a/solenv/bin/modules/pre2par/systemactions.pm b/solenv/bin/modules/pre2par/systemactions.pm
index cd2deaf..2cf3bdf 100644
--- a/solenv/bin/modules/pre2par/systemactions.pm
+++ b/solenv/bin/modules/pre2par/systemactions.pm
@@ -98,11 +98,6 @@ sub create_directories
if ($directory eq "unzip" )
{
- $path = $path . "common" . $pre2par::globals::separator;
- create_directory($path);
-
- $path = $path . $directory . $pre2par::globals::separator;
- create_directory($path);
}
else
{
commit 19b2933c6df6d429f47334f0882a3aaa17c61a39
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Nov 6 16:21:32 2013 +0100
installer: stop using PROEXT
Remove "productextension" from installer.
There is some "common" cruft here that needs more cleanup..
Change-Id: Ia4ef306009f0c4952792d096bb335f834b0f8262
diff --git a/solenv/bin/modules/installer/archivefiles.pm b/solenv/bin/modules/installer/archivefiles.pm
index c4fd031..ae138d9 100644
--- a/solenv/bin/modules/installer/archivefiles.pm
+++ b/solenv/bin/modules/installer/archivefiles.pm
@@ -165,7 +165,7 @@ sub resolving_archive_flag
my $iscommonfile = 0;
my $sourcepath = $onefile->{'sourcepath'};
- if ( $sourcepath =~ /\Q$installer::globals::separator\E\bcommon$installer::globals::productextension\Q$installer::globals::separator\E/ ) # /common/ or /common.pro/
+ if ( $sourcepath =~ /\Q$installer::globals::separator\E\bcommon\Q$installer::globals::separator\E/ ) # /common/ or /common.pro/
{
$iscommonfile = 1;
}
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index bd80505..caa9f52 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -308,8 +308,6 @@ sub check_logfile
my $ignore_error = 0;
my $make_error_to_warning = 0;
- if (( ! $installer::globals::pro ) && ( $installer::globals::ignore_error_in_logfile )) { $ignore_error = 1; }
-
for ( my $i = 0; $i <= $#{$logfile}; $i++ )
{
my $line = ${$logfile}[$i];
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index 91c77d9..ab0d877 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -115,7 +115,7 @@ sub set_global_environment_variables
if ( $ENV{'LAST_MINOR'} ) { $installer::globals::lastminor = $ENV{'LAST_MINOR'}; }
- if ( $ENV{'PROEXT'} ) { $installer::globals::pro = 1; }
+ if ( $ENV{'ENABLE_DBGUTIL'} ) {} else { $installer::globals::pro = 1; }
if ( $ENV{'VERBOSE'} && ( (lc $ENV{'VERBOSE'}) eq "false" ) ) { $installer::globals::quiet = 1; }
if ( $ENV{'PREPARE_WINPATCH'} ) { $installer::globals::prepare_winpatch = 1; }
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index bf0dba6..a0b92de 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -35,7 +35,6 @@ BEGIN
$destdir = "";
$rootpath = "";
- $productextension = "";
@languageproducts = ();
$build = "";
$minor = "";
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index ef7f2f6..5feef84 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -336,9 +336,6 @@ sub setglobalvariables
if ( ! $installer::globals::packageformat ) { $installer::globals::packageformat = "native"; }
- # extension, if $installer::globals::pro is set
- if ($installer::globals::pro) { $installer::globals::productextension = ".pro"; }
-
# no languages defined as parameter
if ($installer::globals::languagelist eq "") { $installer::globals::languages_defined_in_productlist = 1; }
@@ -390,7 +387,7 @@ sub setglobalvariables
if ( ! -d $installer::globals::temppath ) { installer::exiter::exit_program("ERROR: Failed to create directory $installer::globals::temppath ! Possible reason: Wrong privileges in directory $dirsave .", "setglobalvariables"); }
- $installer::globals::temppath = $installer::globals::temppath . $installer::globals::separator . $installer::globals::compiler . $installer::globals::productextension;
+ $installer::globals::temppath = $installer::globals::temppath . $installer::globals::separator . $installer::globals::compiler;
installer::systemactions::create_directory($installer::globals::temppath);
if ( $^O =~ /cygwin/i )
{
diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm
index 457d68f..2037c10 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -202,7 +202,7 @@ sub create_directories
if ($newdirectory eq "unzip" ) # special handling for common directory
{
- $path = $path . ".." . $installer::globals::separator . "common" . $installer::globals::productextension . $installer::globals::separator;
+ $path = $path . ".." . $installer::globals::separator . "common" . $installer::globals::separator;
create_directory($path);
$path = $path . $newdirectory . $installer::globals::separator;
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
index dc24d4b..18d75a9 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -185,14 +185,7 @@ sub analyze_settings_block
# Comment line in settings block begin with "#" or ";"
- if ( $installer::globals::pro )
- {
- $compilerstring = $installer::globals::compiler . ".pro";
- }
- else
- {
- $compilerstring = $installer::globals::compiler;
- }
+ $compilerstring = $installer::globals::compiler;
for ( my $i = 0; $i <= $#{$blockref}; $i++ )
{
diff --git a/solenv/bin/modules/par2script/systemactions.pm b/solenv/bin/modules/par2script/systemactions.pm
index bf3bdd8..475f276 100644
--- a/solenv/bin/modules/par2script/systemactions.pm
+++ b/solenv/bin/modules/par2script/systemactions.pm
@@ -75,7 +75,7 @@ sub create_directories
if ($directory eq "unzip" )
{
- $path = $path . "common" . $par2script::globals::productextension . $par2script::globals::separator;
+ $path = $path . "common" . $par2script::globals::separator;
create_directory($path);
$path = $path . $directory . $par2script::globals::separator;
@@ -83,7 +83,7 @@ sub create_directories
}
else
{
- $path = $path . $par2script::globals::compiler . $par2script::globals::productextension . $par2script::globals::separator;
+ $path = $path . $par2script::globals::compiler . $par2script::globals::separator;
create_directory($path);
$path = $path . $par2script::globals::product . $par2script::globals::separator;
diff --git a/solenv/bin/modules/pre2par/systemactions.pm b/solenv/bin/modules/pre2par/systemactions.pm
index ffcda9c..cd2deaf 100644
--- a/solenv/bin/modules/pre2par/systemactions.pm
+++ b/solenv/bin/modules/pre2par/systemactions.pm
@@ -98,7 +98,7 @@ sub create_directories
if ($directory eq "unzip" )
{
- $path = $path . "common" . $pre2par::globals::productextension . $pre2par::globals::separator;
+ $path = $path . "common" . $pre2par::globals::separator;
create_directory($path);
$path = $path . $directory . $pre2par::globals::separator;
@@ -106,7 +106,7 @@ sub create_directories
}
else
{
- $path = $path . $pre2par::globals::compiler . $pre2par::globals::productextension . $pre2par::globals::separator;
+ $path = $path . $pre2par::globals::compiler . $pre2par::globals::separator;
create_directory($path);
$path = $path . $pre2par::globals::product . $pre2par::globals::separator;
commit eca3dec2047bf675932cc9a6b2ad8acaaf919a24
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Nov 6 18:59:45 2013 +0100
fdo#42783: remove CPU variable from environment
Replace uses with CPUNAME instead, and get rid of the horrible
postgresql patch that worked around environment leakage.
Change-Id: I38ccabfc438360524a272901bb9332ea708e274c
diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index 699d4c8..79d2119 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -9,13 +9,13 @@
$(eval $(call gb_Library_Library,$(gb_CPPU_ENV)_uno))
-ifeq ($(OS)$(CPU),AIXP)
+ifeq ($(OS)-$(CPUNAME),AIX-POWERPC)
bridges_SELECTED_BRIDGE := gcc3_aix_powerpc
bridge_exception_objects := except
bridge_cxx_objects := cpp2uno uno2cpp
-else ifeq ($(CPU),R)
+else ifeq ($(CPUNAME),ARM)
ifeq ($(OS),IOS)
$(eval $(call gb_Library_use_sdk_api,gcc3_uno))
@@ -35,25 +35,25 @@ $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,gcc3_uno)) : \
EXTRAOBJECTLISTS += $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist
endif
-else ifeq ($(OS)$(CPU),LINUXL)
+else ifeq ($(OS)-$(CPUNAME),LINUX-AXP)
bridges_SELECTED_BRIDGE := gcc3_linux_alpha
bridge_exception_objects := cpp2uno except uno2cpp
-else ifeq ($(OS)$(CPU),LINUXH)
+else ifeq ($(OS)-$(CPUNAME),LINUX-HPPA)
bridges_SELECTED_BRIDGE := gcc3_linux_hppa
bridge_asm_objects := call
bridge_noopt_objects := cpp2uno except uno2cpp
-else ifeq ($(OS)$(CPU),LINUXA)
+else ifeq ($(OS)-$(CPUNAME),LINUX-IA64)
bridges_SELECTED_BRIDGE := gcc3_linux_ia64
bridge_asm_objects := call
bridge_exception_objects := except
bridge_noopt_objects := cpp2uno uno2cpp
-else ifeq ($(CPU),I)
+else ifeq ($(CPUNAME),INTEL)
ifneq ($(filter ANDROID DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
bridges_SELECTED_BRIDGE := gcc3_linux_intel
@@ -75,12 +75,12 @@ bridge_noopt_objects := uno2cpp
bridge_exception_objects := callvirtualmethod cpp2uno dllinit except smallstruct
endif
-else ifeq ($(OS)$(CPU),LINUX6)
+else ifeq ($(OS)-$(CPUNAME),LINUX-M68K)
bridges_SELECTED_BRIDGE := gcc3_linux_m68k
bridge_noopt_objects := cpp2uno except uno2cpp
-else ifeq ($(CPU),M)
+else ifeq ($(CPUNAME),GODSON)
ifneq ($(filter ANDROID LINUX,$(OS)),)
bridges_SELECTED_BRIDGE := gcc3_linux_mips
@@ -88,36 +88,36 @@ bridge_noopt_objects := cpp2uno uno2cpp
bridge_exception_objects := except
endif
-else ifeq ($(OS)$(CPUNAME),LINUXPOWERPC)
+else ifeq ($(OS)-$(CPUNAME),LINUX-POWERPC)
bridges_SELECTED_BRIDGE := gcc3_linux_powerpc
bridge_noopt_objects := uno2cpp
bridge_exception_objects := cpp2uno except
-else ifeq ($(OS)$(CPUNAME),LINUXPOWERPC64)
+else ifeq ($(OS)-$(CPUNAME),LINUX-POWERPC64)
bridges_SELECTED_BRIDGE := gcc3_linux_powerpc64
bridge_noopt_objects := cpp2uno uno2cpp
bridge_exception_objects := except
-else ifeq ($(OS)$(CPUNAME),LINUXS390)
+else ifeq ($(OS)-$(CPUNAME),LINUX-S390)
bridges_SELECTED_BRIDGE := gcc3_linux_s390
bridge_exception_objects := cpp2uno except uno2cpp
-else ifeq ($(OS)$(CPUNAME),LINUXS390X)
+else ifeq ($(OS)-$(CPUNAME),LINUX-S390X)
bridges_SELECTED_BRIDGE := gcc3_linux_s390x
bridge_exception_objects := cpp2uno except uno2cpp
-else ifeq ($(OS)$(CPU),LINUXS)
+else ifeq ($(OS)-$(CPUNAME),LINUX-SPARC)
bridges_SELECTED_BRIDGE := gcc3_linux_sparc
bridge_asm_objects := call
bridge_noopt_objects := except
bridge_exception_objects := cpp2uno uno2cpp
-else ifeq ($(CPU),X)
+else ifeq ($(CPUNAME),X86_64)
ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
bridges_SELECTED_BRIDGE := gcc3_linux_x86-64
@@ -140,12 +140,12 @@ bridge_noncallexception_noopt_objects := callvirtualmethod
bridge_exception_objects := abi cpp2uno except uno2cpp
endif
-else ifeq ($(OS)$(CPU),SOLARISI)
+else ifeq ($(OS)-$(CPUNAME),SOLARIS-INTEL)
bridges_SELECTED_BRIDGE := gcc3_solaris_intel
bridge_exception_objects := cpp2uno except uno2cpp
-else ifeq ($(OS)$(CPU),SOLARISS)
+else ifeq ($(OS)-$(CPUNAME),SOLARIS-SPARC)
bridges_SELECTED_BRIDGE := gcc3_solaris_sparc
bridge_noopt_objects := cpp2uno uno2cpp
diff --git a/bridges/Module_bridges.mk b/bridges/Module_bridges.mk
index 6c4e3bf..534efda 100644
--- a/bridges/Module_bridges.mk
+++ b/bridges/Module_bridges.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_Module_add_targets,bridges,\
Library_java_uno \
$(if $(filter MACOSX,$(OS)),Package_jnilib_java_uno) \
) \
- $(if $(filter R,$(CPU)),\
+ $(if $(filter ARM,$(CPUNAME)),\
$(if $(filter IOS,$(OS)),\
CustomTarget_gcc3_ios_arm) \
$(if $(filter ANDROID LINUX,$(OS)),\
diff --git a/config_host.mk.in b/config_host.mk.in
index 7b00038..4633b6e 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -68,7 +68,6 @@ export COM_GCC_IS_CLANG=@COM_GCC_IS_CLANG@
export CPP_LIBRARY=@CPP_LIBRARY@
export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@
export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@
-export CPU=@CPU@
export CPUNAME=@CPUNAME@
export CROSS_COMPILING=@CROSS_COMPILING@
export CURL=@CURL@
diff --git a/configure.ac b/configure.ac
index 563d899..3fbfdcd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3839,7 +3839,7 @@ AC_SUBST(x_OBJCXXFLAGS)
AC_SUBST(x_LDFLAGS)
#
-# determine CPU, CPUNAME, GUIBASE, ...
+# determine CPUNAME, GUIBASE, ...
#
LIB64="lib"
SOLARINC=
@@ -3848,7 +3848,6 @@ case "$host_os" in
aix*)
COM=GCC
- CPU=P
CPUNAME=POWERPC
GUIBASE=unx
OS=AIX
@@ -3869,14 +3868,12 @@ cygwin*)
case "$host_cpu" in
i*86|x86_64)
if test "$BITNESS_OVERRIDE" = 64; then
- CPU=X
CPUNAME=X86_64
RTL_ARCH=X86_64
LIB64="lib/x64"
PLATFORMID=windows_x86_64
OUTPATH=wntmscx$COMEX
else
- CPU=I
CPUNAME=INTEL
RTL_ARCH=x86
PLATFORMID=windows_x86
@@ -3899,7 +3896,6 @@ darwin*)
case "$host_cpu" in
arm*)
- CPU=R
CPUNAME=ARM
RTL_ARCH=ARM_EABI
PLATFORMID=ios_arm
@@ -3911,7 +3907,6 @@ darwin*)
if test "$BITNESS_OVERRIDE" = 64; then
AC_MSG_ERROR([Can't build 64-bit code in 32-bit OS])
fi
- CPU=I
CPUNAME=INTEL
RTL_ARCH=x86
PLATFORMID=macosx_x86
@@ -3919,13 +3914,11 @@ darwin*)
;;
x86_64)
if test "$BITNESS_OVERRIDE" = 64; then
- CPU=X
CPUNAME=X86_64
RTL_ARCH=X86_64
PLATFORMID=macosx_x86_64
OUTPATH=unxmacxx
else
- CPU=I
CPUNAME=INTEL
RTL_ARCH=x86
PLATFORMID=macosx_x86
@@ -3948,13 +3941,11 @@ dragonfly*)
case "$host_cpu" in
i*86)
- CPU=I
CPUNAME=INTEL
RTL_ARCH=x86
PLATFORMID=dragonfly_x86
;;
x86_64)
- CPU=X
CPUNAME=X86_64
RTL_ARCH=X86_64
PLATFORMID=dragonfly_x86_64
@@ -3975,14 +3966,12 @@ freebsd*)
case "$host_cpu" in
i*86)
- CPU=I
CPUNAME=INTEL
RTL_ARCH=x86
PLATFORMID=freebsd_x86
OUTPATH=unxfbsdi
;;
x86_64)
- CPU=X
CPUNAME=X86_64
RTL_ARCH=X86_64
PLATFORMID=freebsd_x86_64
@@ -4003,14 +3992,12 @@ kfreebsd*)
case "$host_cpu" in
i*86)
- CPU=I
CPUNAME=INTEL
RTL_ARCH=x86
PLATFORMID=kfreebsd_x86
OUTPATH=unxkfgi6
;;
x86_64)
- CPU=X
CPUNAME=X86_64
RTL_ARCH=X86_64
LIB64="lib64"
@@ -4033,14 +4020,12 @@ linux-gnu*)
case "$host_cpu" in
alpha)
- CPU=L
CPUNAME=AXP
RTL_ARCH=ALPHA
PLATFORMID=linux_alpha
OUTPATH=unxlngaxp
;;
arm*)
- CPU=R
CPUNAME=ARM
EPM_FLAGS="-a arm"
OUTPATH=unxlngr
@@ -4054,7 +4039,6 @@ linux-gnu*)
esac
;;
hppa)
- CPU=H
CPUNAME=HPPA
RTL_ARCH=HPPA
EPM_FLAGS="-a hppa"
@@ -4062,21 +4046,18 @@ linux-gnu*)
OUTPATH=unxlnghppa
;;
i*86)
- CPU=I
CPUNAME=INTEL
RTL_ARCH=x86
PLATFORMID=linux_x86
OUTPATH=unxlngi6
;;
ia64)
- CPU=A
CPUNAME=IA64
RTL_ARCH=IA64
PLATFORMID=linux_ia64
OUTPATH=unxlnga
;;
mips)
- CPU=M
CPUNAME=GODSON
RTL_ARCH=MIPS_EB
EPM_FLAGS="-a mips"
@@ -4084,7 +4065,6 @@ linux-gnu*)
OUTPATH=unxlngmips
;;
mips64)
- CPU=M
CPUNAME=GODSON
RTL_ARCH=MIPS_EB
EPM_FLAGS="-a mips64"
@@ -4092,7 +4072,6 @@ linux-gnu*)
OUTPATH=unxlngmips
;;
mips64el)
- CPU=M
CPUNAME=GODSON
RTL_ARCH=MIPS_EL
EPM_FLAGS="-a mips64el"
@@ -4100,7 +4079,6 @@ linux-gnu*)
OUTPATH=unxlngmips
;;
mipsel)
- CPU=M
CPUNAME=GODSON
RTL_ARCH=MIPS_EL
EPM_FLAGS="-a mipsel"
@@ -4108,21 +4086,18 @@ linux-gnu*)
OUTPATH=unxlngmips
;;
m68k)
- CPU=6
CPUNAME=M68K
RTL_ARCH=M68K
PLATFORMID=linux_m68k
OUTPATH=unxlngm68k
;;
powerpc)
- CPU=P
CPUNAME=POWERPC
RTL_ARCH=PowerPC
PLATFORMID=linux_powerpc
OUTPATH=unxlngppc
;;
powerpc64)
- CPU=P
CPUNAME=POWERPC64
RTL_ARCH=PowerPC_64
LIB64="lib64"
@@ -4130,21 +4105,18 @@ linux-gnu*)
OUTPATH=unxlngppc64
;;
sparc)
- CPU=S
CPUNAME=SPARC
RTL_ARCH=SPARC
PLATFORMID=linux_sparc
OUTPATH=unxlngs
;;
s390)
- CPU=3
CPUNAME=S390
RTL_ARCH=S390
PLATFORMID=linux_s390
OUTPATH=unxlngs390
;;
s390x)
- CPU=3
CPUNAME=S390X
RTL_ARCH=S390x
LIB64="lib64"
@@ -4152,7 +4124,6 @@ linux-gnu*)
OUTPATH=unxlngs390x
;;
x86_64)
- CPU=X
CPUNAME=X86_64
RTL_ARCH=X86_64
LIB64="lib64"
@@ -4175,21 +4146,18 @@ linux-android*)
case "$host_cpu" in
arm|armel)
- CPU=R
CPUNAME=ARM
RTL_ARCH=ARM_EABI
PLATFORMID=android_arm_eabi
OUTPATH=unxandr
;;
mips|mipsel)
- CPU=M
CPUNAME=GODSON # Weird, but maybe that's the LO convention?
RTL_ARCH=MIPS_EL
PLATFORMID=android_mips_el
OUTPATH=unxandm
;;
i*86)
- CPU=I
CPUNAME=INTEL
RTL_ARCH=x86
PLATFORMID=android_x86
@@ -4211,14 +4179,12 @@ mingw*)
case "$host_cpu" in
i*86|x86_64)
if test "$BITNESS_OVERRIDE" = 64; then
- CPU=X
CPUNAME=X86_64
RTL_ARCH=X86_84
PLATFORMID=windows_x86_64
OUTPATH=wntgccx$COMEX
SOLARINC="$SOLARINC -I$SRC_ROOT/include/wntgccx"
else
- CPU=I
CPUNAME=INTEL
RTL_ARCH=x86
PLATFORMID=windows_x86
@@ -4244,25 +4210,21 @@ mingw*)
case "$host_cpu" in
i*86)
- CPU=I
CPUNAME=INTEL
RTL_ARCH=x86
PLATFORMID=netbsd_x86
;;
powerpc)
- CPU=P
CPUNAME=POWERPC
RTL_ARCH=PowerPC
PLATFORMID=netbsd_powerpc
;;
sparc)
- CPU=S
CPUNAME=SPARC
RTL_ARCH=SPARC
PLATFORMID=netbsd_sparc
;;
x86_64)
- CPU=X
CPUNAME=X86_64
RTL_ARCH=X86_64
PLATFORMID=netbsd_x86_64
@@ -4283,13 +4245,11 @@ openbsd*)
case "$host_cpu" in
i*86)
- CPU=I
CPUNAME=INTEL
RTL_ARCH=x86
PLATFORMID=openbsd_x86
;;
x86_64)
- CPU=X
CPUNAME=X86_64
RTL_ARCH=X86_64
PLATFORMID=openbsd_x86_64
@@ -4313,21 +4273,18 @@ solaris*)
case "$host_cpu" in
i*86)
- CPU=I
CPUNAME=INTEL
RTL_ARCH=x86
PLATFORMID=solaris_x86
OUTPATH=unxsogi
;;
sparc)
- CPU=S
CPUNAME=SPARC
RTL_ARCH=SPARC
PLATFORMID=solaris_sparc
OUTPATH=unxsogs
;;
sparc64)
- CPU=U
CPUNAME=SPARC64
RTL_ARCH=SPARC64
PLATFORMID=solaris_sparc64
@@ -4360,7 +4317,6 @@ INSTDIR="${BUILDDIR}/instdir/${INPATH}"
INSTROOT="${INSTDIR}${INSTROOTSUFFIX}"
SOLARINC="-I. -I$SRC_ROOT/include $SOLARINC"
AC_SUBST(COM)
-AC_SUBST(CPU)
AC_SUBST(CPUNAME)
AC_SUBST(RTL_OS)
AC_SUBST(RTL_ARCH)
@@ -4445,7 +4401,7 @@ if test "$cross_compiling" = "yes"; then
cp configure CONF-FOR-BUILD
test -d config_build && cp -p config_build/*.h CONF-FOR-BUILD/config_host 2>/dev/null
(
- unset COM GUIBASE OS CPU CPUNAME
+ unset COM GUIBASE OS CPUNAME
unset CC CXX SYSBASE CFLAGS
unset AR NM OBJDUMP PKG_CONFIG RANLIB STRIP
unset CPPUNIT_CFLAGS CPPUNIT_LIBS
diff --git a/download.lst b/download.lst
index 00431f0..7a56e0d 100644
--- a/download.lst
+++ b/download.lst
@@ -103,6 +103,6 @@ export WPS_TARBALL := 46eb0e7f213ad61bd5dee0c494132cb0-libwps-0.2.9.tar.bz2
export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
export ZLIB_TARBALL := 2ab442d169156f34c379c968f3f482dd-zlib-1.2.7.tar.bz2
-export MOZ_ZIP_INC := $(OS)$(COM)$(CPU)inc.zip
-export MOZ_ZIP_LIB := $(OS)$(COM)$(CPU)lib.zip
-export MOZ_ZIP_RUNTIME := $(OS)$(COM)$(CPU)runtime.zip
+export MOZ_ZIP_INC := $(OS)$(COM)$(if $(filter INTEL,$(CPUNAME)),I,X)inc.zip
+export MOZ_ZIP_LIB := $(OS)$(COM)$(if $(filter INTEL,$(CPUNAME)),I,X)lib.zip
+export MOZ_ZIP_RUNTIME := $(OS)$(COM)$(if $(filter INTEL,$(CPUNAME)),I,X)runtime.zip
diff --git a/external/mingw-externals/CustomTarget_jawt.mk b/external/mingw-externals/CustomTarget_jawt.mk
index 2d35d93..1fb5fa8 100644
--- a/external/mingw-externals/CustomTarget_jawt.mk
+++ b/external/mingw-externals/CustomTarget_jawt.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_CustomTarget_register_targets,external/jawt,\
libjawt.dll.a \
))
-ifeq ($(OS)$(CPU),WNTX)
+ifeq ($(OS)-$(CPUNAME),WNT-X86_64)
$(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def:
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
echo EXPORTS > $@
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk
index af354e5..0bd7a38 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -19,7 +19,7 @@ $(call gb_ExternalProject_get_state_target,nss,configure):
$(if $(filter MSC,$(COM)),LIB="$(ILIB)") \
mozilla/nsprpub/configure --includedir=$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
- $(if $(filter MSCX,$(COM)$(CPU)),--enable-64bit) \
+ $(if $(filter MSC-X86_64,$(COM)-$(CPUNAME)),--enable-64bit) \
,,nss_configure.log)
ifeq ($(OS),WNT)
@@ -28,7 +28,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject
$(call gb_ExternalProject_run,build,\
$(if $(MSVC_USE_DEBUG_RUNTIME),USE_DEBUG_RTL=1,BUILD_OPT=1) \
MOZ_MSVCVERSION=9 OS_TARGET=WIN95 \
- $(if $(filter X,$(CPU)),USE_64=1) \
+ $(if $(filter X86_64,$(CPUNAME)),USE_64=1) \
LIB="$(ILIB)" \
XCFLAGS="$(SOLARINC)" \
$(MAKE) -j1 nss_build_all RC="rc.exe $(SOLARINC)" \
@@ -58,7 +58,7 @@ endif
else # OS!=WNT
$(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject_get_state_target,nss,configure) $(call gb_ExternalExecutable_get_dependencies,python)
$(call gb_ExternalProject_run,build,\
- $(if $(filter FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X,$(CPU)),USE_64=1)) \
+ $(if $(filter FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X86_64,$(CPUNAME)),USE_64=1)) \
$(if $(filter MACOSX,$(OS)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH) \
NSS_USE_SYSTEM_SQLITE=1) \
$(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \
diff --git a/external/openssl/ExternalProject_openssl.mk b/external/openssl/ExternalProject_openssl.mk
index e41adb8..919e354 100644
--- a/external/openssl/ExternalProject_openssl.mk
+++ b/external/openssl/ExternalProject_openssl.mk
@@ -19,10 +19,10 @@ $(eval $(call gb_ExternalProject_register_targets,openssl,\
OPENSSL_PLATFORM := \
$(if $(filter LINUX FREEBSD ANDROID,$(OS)),\
- $(if $(filter I,$(CPU)),\
+ $(if $(filter INTEL,$(CPUNAME)),\
$(if $(filter GNU/kFreeBSD,$(shell uname)),debian-kfreebsd-i386,linux-elf)\
,\
- $(if $(filter X,$(CPU)),\
+ $(if $(filter X86_64,$(CPUNAME)),\
$(if $(filter GNU/kFreeBSD,$(shell uname)),\
debian-kfreebsd-amd64\
,\
@@ -34,10 +34,8 @@ OPENSSL_PLATFORM := \
)\
,\
$(if $(filter SOLARIS,$(OS)),\
- $(if $(filter INTEL,$(CPUNAME)),\
- $(if $(filter X,$(CPU)),solaris64-x86_64-cc,solaris-x86-cc)\
- ,\
- solaris-sparcv9-cc\
+ $(if $(filter INTEL,$(CPUNAME)),solaris-x86-cc,\
+ $(if $(filter X86_64,$(CPUNAME)),solaris64-x86_64-cc,solaris-sparcv9-cc)\
)\
,\
$(if $(filter IOS,$(OS)),\
@@ -47,11 +45,11 @@ OPENSSL_PLATFORM := \
$(if $(filter GCC,$(COM)),\
mingw\
,\
- $(if $(filter I,$(CPU)),VC-WIN32,VC-WIN64A)\
+ $(if $(filter INTEL,$(CPUNAME)),VC-WIN32,VC-WIN64A)\
)\
,\
$(if $(filter MACOSX,$(OS)),\
- $(if $(filter I,$(CPU)),darwin-i386-cc,darwin64-x86_64-cc)\
+ $(if $(filter INTEL,$(CPUNAME)),darwin-i386-cc,darwin64-x86_64-cc)\
)\
)\
)\
diff --git a/external/postgresql/postgresql-9.2.1-libreoffice.patch b/external/postgresql/postgresql-9.2.1-libreoffice.patch
index 87d3da7..174ee85 100644
--- a/external/postgresql/postgresql-9.2.1-libreoffice.patch
+++ b/external/postgresql/postgresql-9.2.1-libreoffice.patch
@@ -9,28 +9,7 @@
+ @printf '%s\n' 'LIBPQ_DEP_LIBS+=$(SHLIB_LINK)' > '$@'
--- misc/build/postgresql-9.1.1/src/interfaces/libpq/win32.mak 2011-12-14 14:28:59.000000000 +0100
+++ misc/build/postgresql-9.1.1.patched/src/interfaces/libpq/win32.mak 2011-12-15 09:11:37.000000000 +0100
-@@ -11,30 +11,29 @@
-
- # CPU="i386" or CPU environment of nmake.exe (AMD64 or IA64)
-
--!IF ("$(CPU)" == "")||("$(CPU)" == "i386")
--CPU=i386
-+!IF ("$(CPU)" == "")||("$(CPU)" == "I")
-+MACHINE=i386
- !MESSAGE Building the Win32 static library...
- !MESSAGE
--!ELSEIF ("$(CPU)" == "IA64")||("$(CPU)" == "AMD64")
-+!ELSEIF ("$(CPU)" == "X")
-+MACHINE=AMD64
- ADD_DEFINES=/D "WIN64" /Wp64 /GS
- ADD_SECLIB=bufferoverflowU.lib
- !MESSAGE Building the Win64 static library...
- !MESSAGE
- !ELSE
- !MESSAGE Please check a CPU=$(CPU) ?
--!MESSAGE CPU=i386 or AMD64 or IA64
-+!MESSAGE CPU=I or X
- !ERROR Make aborted.
+@@ -11,14 +11,12 @@
!ENDIF
!IFDEF DEBUG
@@ -47,15 +26,6 @@
OUTFILENAME=libpq
!ENDIF
-@@ -54,7 +53,7 @@
- !ENDIF
-
- !IF "$(KFW_LIB_PATH)" == ""
--KFW_LIB_PATH=C:\kfw-2.6.5\lib\$(CPU)
-+KFW_LIB_PATH=C:\kfw-2.6.5\lib\$(MACHINE)
- !MESSAGE Using default Kerberos Library directory: $(KFW_LIB_PATH)
- !ENDIF
-
@@ -67,18 +66,11 @@
CPP=cl.exe
RSC=rc.exe
@@ -92,15 +62,6 @@
/D "_CRT_SECURE_NO_DEPRECATE" $(ADD_DEFINES)
!IFDEF USE_SSL
-@@ -205,7 +198,7 @@
- LINK32=link.exe
- LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib shfolder.lib wsock32.lib ws2_32.lib secur32.lib $(SSL_LIBS) $(KFW_LIB) $(ADD_SECLIB) \
- /nologo /subsystem:windows /dll $(LOPT) /incremental:no \
-- /pdb:"$(OUTDIR)\libpqdll.pdb" /machine:$(CPU) \
-+ /pdb:"$(OUTDIR)\libpqdll.pdb" /machine:$(MACHINE) \
- /out:"$(OUTDIR)\$(OUTFILENAME).dll"\
- /implib:"$(OUTDIR)\$(OUTFILENAME)dll.lib" \
- /libpath:"$(SSL_LIB_PATH)" /libpath:"$(KFW_LIB_PATH)" \
@@ -222,7 +215,7 @@
<<
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 86f7289..6ba73ee 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -206,7 +206,7 @@ $(eval $(call gb_Library_add_cobjects,sal,\
sal/osl/unx/backtrace \
))
endif
-ifneq ($(filter $(OS)$(CPU),SOLARISU SOLARISS NETBSDS LINUXS),)
+ifneq ($(filter $(CPUNAME),SPARC64 SPARC),)
$(eval $(call gb_Library_add_asmobjects,sal,\
sal/osl/unx/asm/interlck_sparc \
))
commit 9487456637abc1f26eda26f9e38f260b5f49edc2
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Nov 6 18:32:40 2013 +0100
configure: add vars for Solaris/SPARC64 (already checked in vcl)
Change-Id: Ic27986d8d45f61facedf2400b77334aaf1da7c1e
diff --git a/configure.ac b/configure.ac
index 0a7b157..563d899 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4326,6 +4326,13 @@ solaris*)
PLATFORMID=solaris_sparc
OUTPATH=unxsogs
;;
+ sparc64)
+ CPU=U
+ CPUNAME=SPARC64
+ RTL_ARCH=SPARC64
+ PLATFORMID=solaris_sparc64
+ OUTPATH=unxsogu
+ ;;
*)
AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
;;
diff --git a/external/hyphen/ExternalProject_hyphen.mk b/external/hyphen/ExternalProject_hyphen.mk
index 573fbae..6687265 100644
--- a/external/hyphen/ExternalProject_hyphen.mk
+++ b/external/hyphen/ExternalProject_hyphen.mk
@@ -20,7 +20,7 @@ $(call gb_ExternalProject_get_state_target,hyphen,build):
./configure --disable-shared \
$(if $(filter-out IOS,$(OS)),--with-pic) \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \
- $(if $(filter C52U,$(COM)$(CPU)),CFLAGS="-m64") \
+ $(if $(filter C52-SPARC64,$(COM)-$(CPUNAME)),CFLAGS="-m64") \
&& $(MAKE) \
)
diff --git a/external/mythes/ExternalProject_mythes.mk b/external/mythes/ExternalProject_mythes.mk
index 8681cc2..88e2a61 100644
--- a/external/mythes/ExternalProject_mythes.mk
+++ b/external/mythes/ExternalProject_mythes.mk
@@ -19,7 +19,7 @@ $(call gb_ExternalProject_get_state_target,mythes,build):
$(call gb_ExternalProject_run,build,\
LIBS="$(gb_STDLIBS) $(LIBS)" ./configure --disable-shared --with-pic \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \
- $(if $(filter C52U,$(COM)$(CPU)),CFLAGS="-m64") \
+ $(if $(filter C52-SPARC64,$(COM)-$(CPUNAME)),CFLAGS="-m64") \
&& $(MAKE) \
)
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index bba54fb..88af63a 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -16,14 +16,14 @@ $(eval $(call gb_CustomTarget_register_targets,odk/check,\
odk_PLATFORM := $(if $(filter WNT,$(OS)),\
$(if $(filter GCC,$(COM)),mingw,windows),\
$(if $(filter SOLARIS,$(OS)),\
- $(if $(filter SPARC,$(CPUNAME)),solsparc,\
- $(if $(filter U,$(CPU)),solsparc64,solintel)),\
- $(if $(filter LINUX,$(OS)),linux,\
- $(if $(filter NETBSD,$(OS)),netbsd,\
- $(if $(filter FREEBSD,$(OS)),freebsd,\
- $(if $(filter DRAGONFLY,$(OS)),dragonfly,\
- $(if $(filter MACOSX,$(OS)),macosx,\
- $(if $(filter AIX,$(OS)),aix))))))))
+ $(if $(filter SPARC,$(CPUNAME)),solsparc,\
+ $(if $(filter SPARC64,$(CPUNAME)),solsparc64,solintel)),\
+ $(if $(filter LINUX,$(OS)),linux,\
+ $(if $(filter NETBSD,$(OS)),netbsd,\
+ $(if $(filter FREEBSD,$(OS)),freebsd,\
+ $(if $(filter DRAGONFLY,$(OS)),dragonfly,\
+ $(if $(filter MACOSX,$(OS)),macosx,\
+ $(if $(filter AIX,$(OS)),aix))))))))
$(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
$(SRCDIR)/odk/util/check.pl \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 5dd3356..fd24589 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -661,7 +661,7 @@ $(eval $(call gb_Library_add_libs,vcl,\
endif
ifeq ($(OS),SOLARIS)
-ifeq ($(CPUNAME)$(CPU),SPARCU)
+ifeq ($(CPUNAME),SPARC64)
$(eval $(call gb_Library_add_ldflags,vcl,\
-R/usr/sfw/lib/64 \
))
commit 8c85ae050f7205e5cb8f56abb48ea88eb7a4eb7a
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Nov 6 14:56:11 2013 +0100
configure: stop adding dmake location to PATH
Change-Id: I06c85f064a478ead6cecbe1c2d666ba3d947a177
diff --git a/configure.ac b/configure.ac
index a314ad1..0a7b157 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12598,7 +12598,6 @@ else
;;
esac
- pathmunge "$SRC_ROOT/solenv/$OUTPATH/bin" "before"
pathmunge "$SRC_ROOT/solenv/bin" "before"
pathmunge "." "before"
fi
commit fadadbdd3536e3640116127b4c7b59f718913be1
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Nov 6 14:42:56 2013 +0100
remove unused gb_smoketest_instset
Change-Id: I73739639be5aac39e50cf6cbe6dc576f350d07fa
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index a1d4f8c..b36bed8 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -406,9 +406,6 @@ endef
# JunitTest class
-gb_defaultlangiso := en-US
-gb_smoketest_instset := $(SRCDIR)/instsetoo_native/$(INPATH)/OpenOffice/archive/install/$(gb_defaultlangiso)/OOo_*_install-arc_$(gb_defaultlangiso).zip
-
ifneq ($(OOO_TEST_SOFFICE),)
gb_JunitTest_SOFFICEARG:=$(OOO_TEST_SOFFICE)
else
commit e832d717eccd91f3a89e94b0d20b333f3f83d995
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Nov 6 13:20:46 2013 +0100
config_host.mk: remove unused use_shl_version
Change-Id: Ic829f1966cafa7c7680b95600ef071417ee9b9f7
diff --git a/config_host.mk.in b/config_host.mk.in
index f42c5fc..7b00038 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -561,7 +561,6 @@ export UPD=@UPD@
export URELIBS=@URELIBS@
export USE_LIBRARY_BIN_TAR=@USE_LIBRARY_BIN_TAR@
export USE_XINERAMA=@USE_XINERAMA@
-export use_shl_version=@use_shl_version@
export UUIDGEN=@UUIDGEN@
export VALGRIND_CFLAGS=$(gb_SPACE)@VALGRIND_CFLAGS@
export VALIDATOR_EXTENSION_PACK=@VALIDATOR_EXTENSION_PACK@
commit 323123337d407644e94e3ce2b8ffa863cbd41e68
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Nov 6 12:38:53 2013 +0100
configure: WORDS_BIGENDIAN is unused
Change-Id: I81b268d06c66860982b4d2443a1126e787f4190b
diff --git a/config_host.mk.in b/config_host.mk.in
index 36df9ac..f42c5fc 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -598,7 +598,6 @@ export WITH_MOZAB4WIN=@WITH_MOZAB4WIN@
export WITH_MYSPELL_DICTS=@WITH_MYSPELL_DICTS@
export WITH_POOR_HELP_LOCALIZATIONS=@WITH_POOR_HELP_LOCALIZATIONS@
export WITH_THEMES=@WITH_THEMES@
-export WORDS_BIGENDIAN=@WORDS_BIGENDIAN@
export WORKDIR=@WORKDIR@
export WORKDIR_FOR_BUILD=@WORKDIR_FOR_BUILD@
export WORK_STAMP=@SOURCEVERSION@
diff --git a/configure.ac b/configure.ac
index 789b31e..a314ad1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5437,9 +5437,6 @@ if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
AC_MSG_ERROR([Cannot find alignment of 8 byte types.])
fi
- AC_C_BIGENDIAN
- WORDS_BIGENDIAN=$ac_cv_c_bigendian
-
dnl Check for large file support
AC_SYS_LARGEFILE
if test -n "$ac_cv_sys_file_offset_bits" -a "$ac_cv_sys_file_offset_bits" != "no"; then
@@ -5462,10 +5459,8 @@ else
SAL_TYPES_ALIGNMENT2=2
SAL_TYPES_ALIGNMENT4=4
SAL_TYPES_ALIGNMENT8=8
- WORDS_BIGENDIAN=no
LFS_CFLAGS=''
fi
-AC_SUBST(WORDS_BIGENDIAN)
AC_SUBST(LFS_CFLAGS)
AC_DEFINE_UNQUOTED(SAL_TYPES_SIZEOFSHORT,$SAL_TYPES_SIZEOFSHORT)
commit 94d31d9ad1513504bb1415f0cfe70be380e18b9a
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Nov 6 13:01:55 2013 +0100
vcl: WORDS_BIGENDIAN is never defined, use OSL_BIGENDIAN
Change-Id: I5186904b9703d6c9c49ca4c3b4a62f83423b1ae1
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index 384de84..abfa775 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -205,7 +205,7 @@ const void * graphiteFontTable(const void* appFaceHandle, unsigned int name, siz
} TableId;
TableId tableId;
tableId.m_id = name;
-#ifndef WORDS_BIGENDIAN
+#ifndef OSL_BIGENDIAN
TableId swapped;
swapped.m_c[3] = tableId.m_c[0];
swapped.m_c[2] = tableId.m_c[1];
diff --git a/vcl/source/glyphs/graphite_features.cxx b/vcl/source/glyphs/graphite_features.cxx
index 609c88b..6901931 100644
--- a/vcl/source/glyphs/graphite_features.cxx
+++ b/vcl/source/glyphs/graphite_features.cxx
@@ -219,7 +219,7 @@ gr_uint32 GrFeatureParser::getCharId(const OString & id, size_t offset, size_t l
{
FeatId charId;
charId.num = 0;
-#ifdef WORDS_BIGENDIAN
+#ifdef OSL_BIGENDIAN
for (size_t i = 0; i < length; i++)
{
charId.label[i] = id[offset+i];
commit 1e7f9952140fb42c71df2113166902ef98287780
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Nov 6 12:30:03 2013 +0100
configure: no need to put OSVERSION in environment
... since it's only used inside configure.
Change-Id: Iaf88239a5e8eb7215406b9948ca2599bd1468a8b
diff --git a/config_host.mk.in b/config_host.mk.in
index 57e0574..36df9ac 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -421,7 +421,6 @@ export OPENSSL_LIBS=$(gb_SPACE)@OPENSSL_LIBS@
export ORCUS_CFLAGS=$(gb_SPACE)@ORCUS_CFLAGS@
export ORCUS_LIBS=$(gb_SPACE)@ORCUS_LIBS@
export OS=@OS@
-export OSVERSION=@OSVERSION@
export OS_FOR_BUILD=@OS_FOR_BUILD@
export OUTPATH=@OUTPATH@
export PATH=@LO_PATH@
diff --git a/configure.ac b/configure.ac
index b73df30..789b31e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -692,7 +692,6 @@ fi
AC_SUBST(SDKDIRNAME)
AC_SUBST(WITH_MINGW)
-AC_SUBST(OSVERSION)
AC_SUBST(PTHREAD_CFLAGS)
AC_SUBST(PTHREAD_LIBS)
commit dc920c16de09dba26213c061ff0a17ed77c10782
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Nov 6 17:59:46 2013 +0100
gbuild: add BUILDTOOLTRACE to debug build tools more easily
Can be set like the CPPUNITTRACE variable to run build tools in gdb when
they crash, like so (but beware that it will run _every_ build tool in
gdb...):
make PARALLELISM=1 BUILDTOOLTRACE="gdb --args"
Change-Id: I64bd92f77c091c72cbabd07aa449882e78bdfc95
diff --git a/solenv/gbuild/ExternalExecutable.mk b/solenv/gbuild/ExternalExecutable.mk
index 770dd3a..014e011 100644
--- a/solenv/gbuild/ExternalExecutable.mk
+++ b/solenv/gbuild/ExternalExecutable.mk
@@ -115,7 +115,7 @@ endef
define gb_ExternalExecutable__set_internal
gb_ExternalExecutable_$(1)_EXECUTABLE := $(2)
gb_ExternalExecutable_$(1)_DEPENDENCIES := $(if $(findstring $(WORKDIR_FOR_BUILD),$(2)),,$(2))
-gb_ExternalExecutable_$(1)_PRECOMMAND := $(subst $$,$$$$,$(gb_Helper_set_ld_path))
+gb_ExternalExecutable_$(1)_PRECOMMAND := $(subst $$,$$$$,$(gb_Helper_set_ld_path)) $(BUILDTOOLTRACE)
endef
@@ -138,7 +138,7 @@ endef
#
# gb_ExternalExecutable_set_precommand executable precommand
define gb_ExternalExecutable_set_precommand
-gb_ExternalExecutable_$(1)_PRECOMMAND := $(2)
+gb_ExternalExecutable_$(1)_PRECOMMAND := $(2) $(BUILDTOOLTRACE)
endef
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 58b4f6b..ebd4960 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -346,7 +346,7 @@ endef
#
# gb_Executable_get_command executable
define gb_Executable_get_command
-$(gb_Helper_set_ld_path) $(2) $(call gb_Executable_get_target_for_build,$(1))
+$(gb_Helper_set_ld_path) $(BUILDTOOLTRACE) $(2) $(call gb_Executable_get_target_for_build,$(1))
endef
define gb_Executable__get_workdir_linktargetname
commit 7a273a59f73df057d2fd20fca40ae060ffbaffa3
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Nov 6 13:46:42 2013 +0100
OUString::operator[] silence -Werror=strict-overflow warnings
GCC 4.8.2 warns when index is a subtraction expression; the real
problems in that case will be found by the "index >= 0" check.
Change-Id: Iac2796badf88b7bdf6c273ddb800a8af0d3eaa6a
diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx
index e5ac7d6..8b7eca4 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -362,7 +362,8 @@ public:
@since LibreOffice 3.5
*/
sal_Char operator [](sal_Int32 index) const {
- assert(index >= 0 && index < getLength());
+ // silence spurious -Werror=strict-overflow warnings from GCC 4.8.2
+ assert(index >= 0 && static_cast<sal_uInt32>(index) < static_cast<sal_uInt32>(getLength()));
return getStr()[index];
}
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index 327f455..79ddfb0 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -417,7 +417,8 @@ public:
@since LibreOffice 3.5
*/
sal_Unicode operator [](sal_Int32 index) const {
- assert(index >= 0 && index < getLength());
+ // silence spurious -Werror=strict-overflow warnings from GCC 4.8.2
+ assert(index >= 0 && static_cast<sal_uInt32>(index) < static_cast<sal_uInt32>(getLength()));
return getStr()[index];
}
commit b5aa7f71e6aa4440d5a7bb3cd35a34d35c81f970
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Nov 6 13:53:59 2013 +0100
OString::operator[]: make this consistent with OUString
Change-Id: If63362aba058bbcc0cc6bb1fae1c76005f1291d4
diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx
index 3a338fd..e5ac7d6 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -362,11 +362,7 @@ public:
@since LibreOffice 3.5
*/
sal_Char operator [](sal_Int32 index) const {
- assert(index >= 0 && index <= getLength());
- //TODO: should really check for < getLength(), but there is quite
- // some clever code out there that violates this function's
- // documented precondition and relies on s[s.getLength()] == 0 and
- // that would need to be fixed first
+ assert(index >= 0 && index < getLength());
return getStr()[index];
}
commit 5effaa90f38d55f035d381ad8982d2ed6b9d46de
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Nov 6 20:53:13 2013 +0100
idl: fix out of bounds string accesses
Change-Id: Id0d07ff9bcd4858cb74458eaf13fb9386387f455
diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx
index 238f5b9..2f81635 100644
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -140,7 +140,9 @@ class SvTokenStream
int GetNextChar();
int GetFastNextChar()
{
- return aBufStr[nBufPos++];
+ return (nBufPos < aBufStr.getLength())
+ ? aBufStr[nBufPos++]
+ : '\0';
}
void FillTokenList();
diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx
index d6644b8..3e131ee 100644
--- a/idl/source/cmptools/lex.cxx
+++ b/idl/source/cmptools/lex.cxx
@@ -151,9 +151,9 @@ void SvTokenStream::FillTokenList()
int SvTokenStream::GetNextChar()
{
int nChar;
- if( aBufStr.getLength() < nBufPos )
+ while (aBufStr.getLength() <= nBufPos)
{
- if( rInStream.ReadLine( aBufStr ) )
+ if (rInStream.ReadLine(aBufStr))
{
nLine++;
nColumn = 0;
commit 614e04019a672cdd61b86699d99250d80f169f95
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Nov 6 17:37:42 2013 +0100
codemaker: fix invalid string index access
Change-Id: Icca819484e751864d146a893fe78e8ef2c36363b
diff --git a/codemaker/source/codemaker/global.cxx b/codemaker/source/codemaker/global.cxx
index d6c5a0f..ba3f424 100644
--- a/codemaker/source/codemaker/global.cxx
+++ b/codemaker/source/codemaker/global.cxx
@@ -87,8 +87,9 @@ OString createFileNameFromType( const OString& destination,
length += prefix.getLength() + type.getLength() + postfix.getLength();
sal_Bool withSeparator = sal_False;
- if (destination[destination.getLength()] != '\\' &&
- destination[destination.getLength()] != '/' &&
+ if (!destination.isEmpty() &&
+ destination[destination.getLength() - 1] != '\\' &&
+ destination[destination.getLength() - 1] != '/' &&
type[0] != '\\' &&
type[0] != '/')
{
commit 10dc66052ae1bd5f8ba4be1554ab9654d2af3e93
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Nov 7 00:49:15 2013 +0100
vcl: PPDParser: fix out of bounds string accesses
Change-Id: I1793a58fa107b190f8412bbc3376009f3b85c6b0
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 0ec2055..7d286e0 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -680,7 +680,7 @@ PPDParser::PPDParser( const OUString& rFile ) :
while( ! aStream.IsEof() )
{
OString aCurLine = aStream.ReadLine();
- if( aCurLine[0] == '*' )
+ if (!aCurLine.isEmpty() && aCurLine[0] == '*')
{
if (aCurLine.matchIgnoreAsciiCase(OString("*include:")))
{
@@ -952,7 +952,7 @@ void PPDParser::parse( ::std::list< OString >& rLines )
{
OString aCurrentLine( *line );
++line;
- if( aCurrentLine[0] != '*' )
+ if (aCurrentLine.getLength() < 2 || aCurrentLine[0] != '*')
continue;
if( aCurrentLine[1] == '%' )
continue;
commit c98fc675df85b0d54c0c10c9c7e9e30716c927d2
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Nov 7 01:18:44 2013 +0100
scp2: fix extra_fonts
Change-Id: I9fcb88dd50dbd0f4145bf83dea27e414e6fb3aff
diff --git a/scp2/source/accessories/file_font_accessories.scp b/scp2/source/accessories/file_font_accessories.scp
index cd4761b..8b78508 100644
--- a/scp2/source/accessories/file_font_accessories.scp
+++ b/scp2/source/accessories/file_font_accessories.scp
@@ -9,5 +9,5 @@
#include "macros.inc"
#ifdef WITH_EXTRA_FONT
-STD_FONT_FILELIST( gid_File_Fnt_Extra, "extras_extra_fonts.filelist" )
+STD_FONT_FILELIST( gid_File_Fnt_Extra, "accessories_extra_fonts.filelist" )
#endif
More information about the Libreoffice-commits
mailing list