[Libreoffice-commits] .: 19 commits - Makefile.in solenv/bin solenv/inc
Jan Holesovsky
kendy at kemper.freedesktop.org
Thu Nov 25 12:11:59 PST 2010
Makefile.in | 2 +-
solenv/bin/addsym.awk | 23 ++++++++++++++++++-----
solenv/inc/minor.mk | 2 +-
3 files changed, 20 insertions(+), 7 deletions(-)
New commits:
commit 2f2ea6cd4afe98e75ac1e3a478808ec7e0bbf5a3
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Nov 25 17:13:05 2010 +0100
Makefile.in: Add a missing '--' delimiter, so that -P at ...JOBS@ goes to dmake.
diff --git a/Makefile.in b/Makefile.in
index eb67773..8b28749 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,7 +7,7 @@ all:
@. ./*[Ee]nv.[Ss]et.sh && \
./bootstrap && \
cd instsetoo_native && \
- ../solenv/bin/build.pl -P at BUILD_NCPUS@ --all -P at BUILD_MAX_JOBS@
+ ../solenv/bin/build.pl -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@
distclean:
@. ./*[Ee]nv.[Ss]et.sh && \
commit f004f49f4e9043c7a1198539933b36d0ce0ac107
Merge: 1e7d9e3... 3330f12...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Nov 25 14:19:27 2010 +0100
Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
scp2/source/python/module_python.scp
solenv/inc/unxgcc.mk
commit 3330f12ca7f7bc9faff62fd8860f66fa7c35e582
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date: Tue Nov 23 13:12:21 2010 +0100
Don't install html versions of LICENSE and README
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 5734a4b..701f9a7 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -134,18 +134,12 @@ Module gid_Module_Langpack_Brand_Template
gid_Brand_File_Help_C05_Swriter_Zip,
gid_Brand_File_License_License,
gid_Brand_File_License_License_Small,
- gid_Brand_File_License_License_Html,
- gid_Brand_File_License_License_Html_Small,
gid_Brand_File_Readme_Readme,
- gid_Brand_File_Readme_Readme_Html,
gid_Brand_File_Share_Registry_Cjk_Xcd,
gid_Brand_File_Share_Registry_Korea_Xcd,
gid_Brand_File_Txt_License,
gid_Brand_File_Txt_License_Small,
- gid_Brand_File_Txt_License_Html,
- gid_Brand_File_Txt_License_Html_Small,
- gid_Brand_File_Txt_Readme,
- gid_Brand_File_Txt_Readme_Html);
+ gid_Brand_File_Txt_Readme);
End
// Directories
diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp
index d6f294f..de546e8 100644
--- a/scp2/source/ooo/scpaction_ooo.scp
+++ b/scp2/source/ooo/scpaction_ooo.scp
@@ -27,22 +27,6 @@
#include "macros.inc"
-ScpAction scp_Copy_License_Html
- #ifdef UNX
- README_TXT_ALL_LANG(Copy, LICENSE, html);
- README_TXT_ALL_LANG(Name, LICENSE, html);
- #else
- README_TXT_ALL_LANG(Copy, license, html);
- README_TXT_ALL_LANG(Name, license, html);
- #endif
- Styles = (SCPZIP_REPLACE);
- #ifndef MACOSX
- Subdir = "licenses";
- #else
- Subdir = "LICENSEs";
- #endif
-End
-
ScpAction scp_Copy_License_Txt
#ifdef UNX
README_ALL_LANG(Copy, LICENSE);
@@ -67,22 +51,6 @@ ScpAction scp_Copy_Thirdpartylicense_Readme_Html
End
#endif
-ScpAction scp_Copy_Readme_Html
- #ifdef UNX
- README_TXT_ALL_LANG(Copy, README, html);
- README_TXT_ALL_LANG(Name, README, html);
- #else
- README_TXT_ALL_LANG(Copy, readme, html);
- README_TXT_ALL_LANG(Name, readme, html);
- #endif
- Styles = (SCPZIP_REPLACE);
- #ifndef MACOSX
- Subdir = "readmes";
- #else
- Subdir = "READMEs";
- #endif
-End
-
ScpAction scp_Copy_Readme_Txt
#ifdef UNX
README_ALL_LANG(Copy, README);
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index 0f79720..2c7aa6e 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -95,13 +95,6 @@ End
#if defined MACOSX
-ScpAction scp_Copy_License_Html_Sdk
- README_TXT_ALL_LANG(Copy, LICENSE, html);
- README_TXT_ALL_LANG(Name, LICENSE, html);
- Styles = (SCPZIP_REPLACE);
- Subdir = "LICENSEs";
-End
-
ScpAction scp_Copy_License_Txt_Sdk
README_ALL_LANG(Copy, LICENSE);
README_ALL_LANG(Name, LICENSE);
@@ -110,7 +103,6 @@ ScpAction scp_Copy_License_Txt_Sdk
End
#endif
-
Directory gid_Dir_Share_Sdk
ParentID = gid_Dir_Basis_Sdk;
DosName = "share";
@@ -141,18 +133,6 @@ File gid_File_Txt_License
Styles = (PACKED, SCPZIP_REPLACE);
End
-File gid_File_Txt_License_Html
- TXT_FILE_BODY;
- Dir = gid_Dir_Share_Readme_Sdk;
- #ifdef UNX
- Name = "LICENSE_en-US.html";
- #endif
- #ifdef WNT
- Name = "license_en-US.html";
- #endif
- Styles = (PACKED, SCPZIP_REPLACE);
-End
-
File gid_File_Txt_Readme
TXT_FILE_BODY;
Dir = gid_Dir_Share_Readme_Sdk;
@@ -165,19 +145,6 @@ File gid_File_Txt_Readme
Styles = (PACKED, SCPZIP_REPLACE);
End
-File gid_File_Txt_Readme_Html
- TXT_FILE_BODY;
- Dir = gid_Dir_Share_Readme_Sdk;
- #ifdef UNX
- Name = "README_en-US.html";
- #endif
- #ifdef WNT
- Name = "readme_en-US.html";
- #endif
- Styles = (PACKED, SCPZIP_REPLACE);
-End
-
-
File gid_File_Zip_Odkexamples
TXT_FILE_BODY;
Dir = gid_Dir_Basis_Sdk;
commit 5efb5fa46e08f2fbd2f840f172bf5b7f6955e8ff
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date: Wed Nov 17 16:44:14 2010 +0100
Don't install the readme.html files
Signed-off-by: Sebastian Spaeth <Sebastian at SSpaeth.de>
diff --git a/scp2/source/ooo/common_brand_readme.scp b/scp2/source/ooo/common_brand_readme.scp
index dea9145..6655f80 100644
--- a/scp2/source/ooo/common_brand_readme.scp
+++ b/scp2/source/ooo/common_brand_readme.scp
@@ -89,18 +89,6 @@ File gid_Brand_File_Txt_Readme
Styles = (PACKED, SCPZIP_REPLACE);
End
-File gid_Brand_File_Txt_Readme_Html
- TXT_FILE_BODY;
- Dir = gid_Brand_Dir_Share_Readme;
- #ifdef UNX
- README_TXT_ALL_LANG(Name, README, html);
- #endif
- #ifdef WNT
- README_TXT_ALL_LANG(Name, readme, html);
- #endif
- Styles = (PACKED, SCPZIP_REPLACE);
-End
-
File gid_Brand_File_Readme_Readme
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Readme;
@@ -112,15 +100,3 @@ File gid_Brand_File_Readme_Readme
#endif
Styles = (PACKED, SCPZIP_REPLACE);
End
-
-File gid_Brand_File_Readme_Readme_Html
- TXT_FILE_BODY;
- Dir = gid_Brand_Dir_Readme;
- #ifdef UNX
- README_TXT_ALL_LANG(Name, README, html);
- #endif
- #ifdef WNT
- README_TXT_ALL_LANG(Name, readme, html);
- #endif
- Styles = (PACKED, SCPZIP_REPLACE);
-End
commit a434bc4266e148ff25b52df173da22efd27b186a
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Nov 23 15:48:13 2010 +0100
find the internal libpython (fdo#31764)
libpython2.6.so symlink was not created, so pyuno was not able to find the
internal libpython2.6.so.1.0
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index e586876..84e234e 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -142,6 +142,14 @@ File gid_File_Lib_Python_So
Name = STRING(PY_FULL_DLL_NAME);
Styles = (PACKED);
End
+#ifdef UNX
+Shortcut gid_Shortcut_Lib_Python_So
+ FileID = gid_File_Lib_Python_So;
+ Dir = gid_Dir_Program;
+ Name = STRING(CONCAT3(libpython,PYMAJMIN,UNXSUFFIX));
+ Styles = (NETWORK,RELATIVE);
+End
+#endif //UNX
#else //MACOSX
//directory entries solely to be able to create the symlinks
Directory gid_Dir_PythonFramework
diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp
index 3abeec2..30dab85 100644
--- a/scp2/source/python/module_python.scp
+++ b/scp2/source/python/module_python.scp
@@ -32,7 +32,7 @@ Module gid_Module_Optional_Pyuno
MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON );
ParentID = gid_Module_Optional;
Sortkey = "750";
- Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So, gid_File_Lib_Python_So_Brand, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd);
+ Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So,gid_Shortcut_Lib_Python_So,gid_File_Lib_Python_So_Brand, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd);
Minimal = NO;
Default = YES;
Styles = ( );
commit 4a24b4e8a27057717b02249a433510dfd9918d4d
Author: Robert Nagy <robert at openbsd.org>
Date: Sun Nov 21 15:26:47 2010 +0100
Revert "Add AC_SUBST(PYTHON) so that the PYTHON var can be used by the build"
This reverts commit ff2fec6aac243bb3ea7380709212454c3bedcc18.
diff --git a/configure.in b/configure.in
index 1b304c3..b8d4502 100644
--- a/configure.in
+++ b/configure.in
@@ -4178,8 +4178,7 @@ fi
AC_SUBST(SYSTEM_PYTHON)
AC_SUBST(PYTHON_CFLAGS)
AC_SUBST(PYTHON_LIBS)
-AC_SUBST(PYTHON)
-HOME=`echo $HOME | $SED 's:\\\\:/:g'`
+HOME=`echo $HOME | sed 's:\\\\:/:g'`
AC_SUBST(HOME)
dnl ===================================================================
commit ff2fec6aac243bb3ea7380709212454c3bedcc18
Author: Robert Nagy <robert at openbsd.org>
Date: Sun Nov 21 15:19:15 2010 +0100
Add AC_SUBST(PYTHON) so that the PYTHON var can be used by the build
diff --git a/configure.in b/configure.in
index b8d4502..1b304c3 100644
--- a/configure.in
+++ b/configure.in
@@ -4178,7 +4178,8 @@ fi
AC_SUBST(SYSTEM_PYTHON)
AC_SUBST(PYTHON_CFLAGS)
AC_SUBST(PYTHON_LIBS)
-HOME=`echo $HOME | sed 's:\\\\:/:g'`
+AC_SUBST(PYTHON)
+HOME=`echo $HOME | $SED 's:\\\\:/:g'`
AC_SUBST(HOME)
dnl ===================================================================
commit 7483d886132c8c8c272010d4013bc1fb95608d63
Merge: 9beb461... e67a599...
Author: Rene Engelhard <rene at debian.org>
Date: Sun Nov 21 14:46:24 2010 +0100
Merge commit 'ooo/OOO330_m16' into libreoffice-3-3
diff --cc solenv/inc/minor.mk
index 94f8dc2,6b22483..80c9d76
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@@ -1,5 -1,5 +1,5 @@@
RSCVERSION=330
-RSCREVISION=330m16(Build:9549)
-BUILD=9549
+RSCREVISION=330m15(Build:1)
+BUILD=1
- LAST_MINOR=m15
+ LAST_MINOR=m16
SOURCEVERSION=OOO330
commit 9beb461b81660790521961eecaed05f08c704125
Author: Petr Mladek <pmladek at suse.cz>
Date: Thu Nov 18 20:39:50 2010 +0100
Do not mention date in the downlaod tarball name
it was to long; version is enough
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 8e70bbb..7626000 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -778,9 +778,7 @@ sub get_current_version
###############################################################################################
# Setting the download file name
# Syntax:
-# (PRODUCTNAME)_(VERSION)_(TIMESTAMP)_(OS)_(ARCH)_(INSTALLTYPE)_(LANGUAGE).(FILEEXTENSION)
-# Rules:
-# Timestamp only for Beta and Release Candidate
+# (PRODUCTNAME)_(VERSION)_(OS)_(ARCH)_(INSTALLTYPE)_(LANGUAGE).(FILEEXTENSION)
###############################################################################################
sub set_download_filename
@@ -789,7 +787,6 @@ sub set_download_filename
my $start = get_downloadname_productname($allvariables);
my $versionstring = get_download_version($allvariables);
- my $date = set_date_string($allvariables);
my $platform = get_download_platformname();
my $architecture = get_download_architecture();
my $type = get_install_type($allvariables);
@@ -797,7 +794,7 @@ sub set_download_filename
# Setting the extension happens automatically
- my $filename = $start . "_" . $versionstring . "_" . $date . "_" . $platform . "_" . $architecture . "_" . $type . "_" . $language;
+ my $filename = $start . "_" . $versionstring . "_" . "_" . $platform . "_" . $architecture . "_" . $type . "_" . $language;
$filename =~ s/\_\_/\_/g; # necessary, if $versionstring or $platform or $language are empty
$filename =~ s/\_\s*$//; # necessary, if $language and $addon are empty
commit c2d0fc7bdafcbaf3275303ae0ac6a72404d2de7d
Author: Petr Mladek <pmladek at suse.cz>
Date: Thu Nov 18 20:38:25 2010 +0100
Revert "fix smoketest with the improved download tarball (fdo#30837)"
This reverts commit bdbd0385f6972f49a5e954cebb342263f3666c7d.
It is not longer needed after the previous fix.
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk
index 80de446..15a80b0 100644
--- a/solenv/inc/installationtest.mk
+++ b/solenv/inc/installationtest.mk
@@ -39,7 +39,7 @@ my_instsets = $(shell ls -dt \
installationtest_instset = $(my_instsets:1)
.ELSE
installationtest_instset = \
- $(SOLARSRC)/instsetoo_native/$(INPATH)/LibreOffice/archive/install
+ $(SOLARSRC)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/$(defaultlangiso)
.END
.IF "$(OS)" == "WNT"
commit e8d121487d64ce29f86f3de916c5bbcbe72d3428
Author: Petr Mladek <pmladek at suse.cz>
Date: Thu Nov 18 20:35:06 2010 +0100
fallback to the old install dirname if ooodownloadfilename is not defined
the check for versioned install dir (fdo#30837) broke creation of
languagepack on Windows and MAC; it is because ooodownloadfilename
was defined only for linux; we still need lang-specific directory
for other archs
diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm
index 83502ef..d0e05d0 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -395,10 +395,10 @@ sub create_directories
if ( $$languagesref ) { $locallanguagesref = $$languagesref; }
- if ($newdirectory eq "install" )
+ if ($newdirectory eq "install" && $installer::globals::ooodownloadfilename ne "" )
{
- # put packages into versioned path (fdo#30837)
- $path = $path . "$installer::globals::ooodownloadfilename";
+ # put packages into versioned path; needed only on linux (fdo#30837)
+ $path = $path . "$installer::globals::ooodownloadfilename" . $installer::globals::separator;
create_directory($path);
}
else
@@ -417,7 +417,7 @@ sub create_directories
$languagestring = "lang_" . $number_of_languages . "_id_" . $id;
}
- $path = $path . $languagestring . $installer::globals::separator;
+ $path = $path . $languagestring . $installer::globals::separator;
create_directory($path);
}
}
commit 871f1ad0227ad9e5673c85a3ff42eea698308dcc
Author: Robert Nagy <robert at openbsd.org>
Date: Thu Nov 18 20:20:30 2010 +0100
libGLU needs libm so make sure it gets linked
diff --git a/configure.in b/configure.in
index f03ca25..b8d4502 100644
--- a/configure.in
+++ b/configure.in
@@ -6219,6 +6219,8 @@ AC_MSG_CHECKING([whether to build the OpenGL Transitions component])
ENABLE_OPENGL=
if test "x$enable_opengl" != "xno" ; then
+ save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -lm"
AC_MSG_RESULT([yes])
AC_CHECK_HEADER(GL/gl.h, [],
[AC_MSG_ERROR([OpenGL headers not found])], [])
@@ -6227,6 +6229,7 @@ if test "x$enable_opengl" != "xno" ; then
AC_CHECK_LIB(GLU, main, [],
[AC_MSG_ERROR(libGLU not installed or functional)], [])
ENABLE_OPENGL=TRUE
+ LDFLAGS=$save_LDFLAGS
else
AC_MSG_RESULT([no])
fi
commit e67a59928bd4d8d5d7d04faa652662bc3e7fcf58
Author: Release Engineering <releng at openoffice.org>
Date: Thu Nov 18 19:10:50 2010 +0100
OOO330
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index e22bfc3..6b22483 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=330
-RSCREVISION=330m15(Build:9546)
-BUILD=9546
-LAST_MINOR=m15
+RSCREVISION=330m16(Build:9549)
+BUILD=9549
+LAST_MINOR=m16
SOURCEVERSION=OOO330
commit 4ff87f5b1a420be0768a7d96d9afdce4984969b9
Merge: 65adbdf... 652c3b7...
Author: obo <obo at openoffice.org>
Date: Thu Nov 18 18:39:08 2010 +0100
CWS-TOOLING: integrate CWS sb136
commit 38068f114133ceeccabe2400c6b2f41e24b3f022
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Nov 17 21:12:56 2010 +0000
need -lpthread as PTHREAD_LIBS on Linux
diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk
index c39c251..62746ce 100644
--- a/solenv/inc/unxlng.mk
+++ b/solenv/inc/unxlng.mk
@@ -26,6 +26,7 @@
#*************************************************************************
CDEFS+=-DGLIBC=2
+PTHREAD_LIBS=-lpthread
DL_LIB=-ldl
.INCLUDE : unxgcc.mk
commit 49a328e3bf879b6106f204aae23988e21fe335f9
Author: Robert Nagy <robert at openbsd.org>
Date: Wed Nov 17 20:45:47 2010 +0100
Use a generic unxgcc.mk
Move unxlng.mk to unxgcc.mk and use that on OpenBSD and Linux
too as a default and then overwrite or add variables.
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
new file mode 100644
index 0000000..b54736c
--- /dev/null
+++ b/solenv/inc/unxgcc.mk
@@ -0,0 +1,279 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+# generic mk file for gcc on unix systems
+
+ASM*=
+AFLAGS*=
+SOLAR_JAVA*=
+# default optimization level for product code
+CDEFAULTOPT*=-O2
+# architecture dependent flags for the C and C++ compiler that can be changed by
+# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
+ARCH_FLAGS*=
+# position independent code switch
+PICSWITCH*:=-fpic
+JAVAFLAGSDEBUG=-g
+
+# filter for supressing verbose messages from linker
+#not needed at the moment
+#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
+
+# _PTHREADS is needed for the stl
+CDEFS+=-D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
+
+# enable visibility define in "sal/types.h"
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+
+# this is a platform with JAVA support
+.IF "$(SOLAR_JAVA)"!=""
+JAVADEF=-DSOLAR_JAVA
+.IF "$(debug)"==""
+JAVA_RUNTIME=-ljava
+.ELSE
+JAVA_RUNTIME=-ljava_g
+.ENDIF
+.ENDIF
+
+# name of C++ Compiler
+CXX*=g++
+# name of C Compiler
+CC*=gcc
+.IF "$(SYSBASE)"!=""
+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+CXX+:=$(CFLAGS_SYSBASE)
+CC+:=$(CFLAGS_SYSBASE)
+.ENDIF # "$(SYSBASE)"!=""
+CFLAGS+=-fmessage-length=0 -c
+
+# flags to enable build with symbols; required for crashdump feature
+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
+CFLAGSENABLESYMBOLS=-g1
+.ELSE
+CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
+
+.ENDIF
+
+# flags for the C++ Compiler
+CFLAGSCC= -pipe $(ARCH_FLAGS)
+# Flags for enabling exception handling
+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+# Flags for disabling exception handling
+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
+
+# -fpermissive should be removed as soon as possible
+CFLAGSCXX= -pipe $(ARCH_FLAGS)
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CFLAGSCXX += -fvisibility-inlines-hidden
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+
+CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
+CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch
+CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)$/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch
+
+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
+CFLAGSOBJGUIMT=
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
+CFLAGSSLOGUIMT=$(PICSWITCH)
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
+CFLAGSSLOCUIMT=$(PICSWITCH)
+# Compiler flags for profiling
+CFLAGSPROF=
+# Compiler flags for debugging
+CFLAGSDEBUG=-g
+CFLAGSDBGUTIL=
+# Compiler flags for enabling optimizations
+.IF "$(PRODUCT)"!=""
+CFLAGSOPT=$(CDEFAULTOPT) # optimizing for products
+
+GCCNUMVERSION_CMD=-dumpversion $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
+GCCNUMVER:=$(shell @-$(CXX) $(GCCNUMVERSION_CMD))
+
+.IF "$(USE_SYSTEM_STL)"!="YES" || "$(GCCNUMVER)" <= "000400050000"
+#STLPort headers are full of aliasing warnings and
+#At least SLED 10.2 gcc 4.3 overly agressively optimizes
+#uno::Sequence into junk, so only strict-alias on compiler
+#later than 4.5.1
+CFLAGSOPT+=-fno-strict-aliasing
+.ENDIF
+.ELSE # "$(PRODUCT)"!=""
+CFLAGSOPT= # no optimizing for non products
+.ENDIF # "$(PRODUCT)"!=""
+# Compiler flags for disabling optimizations
+CFLAGSNOOPT=-O0
+# Compiler flags for describing the output path
+CFLAGSOUTOBJ=-o
+
+# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
+CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
+CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
+ -Wno-non-virtual-dtor
+CFLAGSWALLCC=$(CFLAGSWARNCC)
+CFLAGSWALLCXX=$(CFLAGSWARNCXX)
+CFLAGSWERRCC=-Werror
+
+# Once all modules on this platform compile without warnings, set
+# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
+# settings.mk):
+MODULES_WITH_WARNINGS := \
+ lotuswordpro \
+ soldep
+
+# switches for dynamic and static linking
+STATIC = -Wl,-Bstatic
+DYNAMIC = -Wl,-Bdynamic
+
+# name of linker
+LINK*=$(CXX)
+LINKC*=$(CC)
+
+# default linker flags
+LINKFLAGSDEFS*=-Wl,-z,defs
+LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'
+LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
+ #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
+LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
+LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
+LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
+LINKFLAGSRUNPATH_OXT=
+LINKFLAGSRUNPATH_BOXT=-Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\'
+LINKFLAGSRUNPATH_NONE=
+# flag -Wl,-z,noexecstack sets the NX bit on the stack
+LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS)
+.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"
+LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
+.ENDIF
+
+# linker flags for linking applications
+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
+ -Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
+ -Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
+
+# linker flags for linking shared libraries
+LINKFLAGSSHLGUI= -shared
+LINKFLAGSSHLCUI= -shared
+
+LINKFLAGSTACK=
+LINKFLAGSPROF=
+LINKFLAGSDEBUG=-g
+LINKFLAGSOPT=
+
+# linker flags for optimization (symbol hashtable)
+# for now, applied to symbol scoped libraries, only
+LINKFLAGSOPTIMIZE*=-Wl,-O1
+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
+
+SONAME_SWITCH=-Wl,-h
+
+# Sequence of libs does matter !
+
+STDLIBCPP=-lstdc++
+
+# default objectfilenames to link
+STDOBJVCL=$(L)$/salmain.o
+STDOBJGUI=
+STDSLOGUI=
+STDOBJCUI=
+STDSLOCUI=
+
+.IF "$(ALLOC)" == "TCMALLOC"
+STDLIBGUIMT+=-ltcmalloc
+STDLIBCUIMT+=-ltcmalloc
+STDSHLGUIMT+=-ltcmalloc
+STDSHLCUIMT+=-ltcmalloc
+.ENDIF
+
+.IF "$(ALLOC)" == "JEMALLOC"
+STDLIBGUIMT+=-ljemalloc
+STDLIBCUIMT+=-ljemalloc
+STDSHLGUIMT+=-ljemalloc
+STDSHLCUIMT+=-ljemalloc
+.ENDIF
+
+.IF "$(HAVE_LD_HASH_STYLE)" == "TRUE"
+LINKFLAGS += -Wl,--hash-style=both
+.ELSE
+LINKFLAGS += -Wl,-zdynsort
+.ENDIF
+
+# libraries for linking applications
+STDLIBGUIMT+=-Wl,--as-needed $(DL_LIB) $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
+STDLIBCUIMT+=-Wl,--as-needed $(DL_LIB) $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
+# libraries for linking shared libraries
+STDSHLGUIMT+=-Wl,--as-needed $(DL_LIB) $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
+STDSHLCUIMT+=-Wl,--as-needed $(DL_LIB) $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
+
+X11LINK_DYNAMIC = -Wl,--as-needed -lXext -lX11 -Wl,--no-as-needed
+
+LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
+
+.IF "$(USE_STLP_DEBUG)" != ""
+.IF "$(STLPORT_VER)" >= "500"
+LIBSTLPORT=$(DYNAMIC) -lstlportstlg
+LIBSTLPORTST=$(STATIC) -lstlportstlg $(DYNAMIC)
+.ELSE
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
+LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
+.ENDIF
+.ELSE # "$(USE_STLP_DEBUG)" != ""
+.IF "$(STLPORT_VER)" >= "500"
+LIBSTLPORT=$(DYNAMIC) -lstlport
+LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC)
+.ELSE
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+.ENDIF
+.ENDIF # "$(USE_STLP_DEBUG)" != ""
+
+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
+
+# name of library manager
+LIBMGR*=ar
+LIBFLAGS=-r
+
+# tool for generating import libraries
+IMPLIB=
+IMPLIBFLAGS=
+
+MAPSYM=
+MAPSYMFLAGS=
+
+RC=irc
+RCFLAGS=-fo$@ $(RCFILES)
+RCLINK=
+RCLINKFLAGS=
+RCSETVERSION=
+
+# platform specific identifier for shared libs
+DLLPRE=lib
+DLLPOST=.so
+PCHPOST=.gch
diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk
index 1b7ee75..c39c251 100644
--- a/solenv/inc/unxlng.mk
+++ b/solenv/inc/unxlng.mk
@@ -25,254 +25,7 @@
#
#*************************************************************************
-# generic mk file for unxlng (unix linux glibc)
-ASM*=
-AFLAGS*=
-SOLAR_JAVA*=
-# default optimization level for product code
-CDEFAULTOPT*=-O2
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
-# position independent code switch
-PICSWITCH*:=-fpic
-JAVAFLAGSDEBUG=-g
+CDEFS+=-DGLIBC=2
+DL_LIB=-ldl
-# filter for supressing verbose messages from linker
-#not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
-
-# _PTHREADS is needed for the stl
-CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
-
-# enable visibility define in "sal/types.h"
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-
-# this is a platform with JAVA support
-.IF "$(SOLAR_JAVA)"!=""
-JAVADEF=-DSOLAR_JAVA
-.IF "$(debug)"==""
-JAVA_RUNTIME=-ljava
-.ELSE
-JAVA_RUNTIME=-ljava_g
-.ENDIF
-.ENDIF
-
-# name of C++ Compiler
-CXX*=g++
-# name of C Compiler
-CC*=gcc
-.IF "$(SYSBASE)"!=""
-CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
-CXX+:=$(CFLAGS_SYSBASE)
-CC+:=$(CFLAGS_SYSBASE)
-.ENDIF # "$(SYSBASE)"!=""
-CFLAGS+=-fmessage-length=0 -c
-
-# flags to enable build with symbols; required for crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-CFLAGSENABLESYMBOLS=-g1
-.ELSE
-CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-
-.ENDIF
-
-# flags for the C++ Compiler
-CFLAGSCC= -pipe $(ARCH_FLAGS)
-# Flags for enabling exception handling
-CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
-# Flags for disabling exception handling
-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-
-# -fpermissive should be removed as soon as possible
-CFLAGSCXX= -pipe $(ARCH_FLAGS)
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CFLAGSCXX += -fvisibility-inlines-hidden
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-
-CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
-CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch
-CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)$/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch
-
-# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-CFLAGSOBJGUIMT=
-# Compiler flags for compiling static object in multi threaded environment with character user interface
-CFLAGSOBJCUIMT=
-# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-CFLAGSSLOGUIMT=$(PICSWITCH)
-# Compiler flags for compiling shared object in multi threaded environment with character user interface
-CFLAGSSLOCUIMT=$(PICSWITCH)
-# Compiler flags for profiling
-CFLAGSPROF=
-# Compiler flags for debugging
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
-# Compiler flags for enabling optimizations
-.IF "$(PRODUCT)"!=""
-CFLAGSOPT=$(CDEFAULTOPT) # optimizing for products
-
-GCCNUMVERSION_CMD=-dumpversion $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
-GCCNUMVER:=$(shell @-$(CXX) $(GCCNUMVERSION_CMD))
-
-.IF "$(USE_SYSTEM_STL)"!="YES" || "$(GCCNUMVER)" <= "000400050000"
-#STLPort headers are full of aliasing warnings and
-#At least SLED 10.2 gcc 4.3 overly agressively optimizes
-#uno::Sequence into junk, so only strict-alias on compiler
-#later than 4.5.1
-CFLAGSOPT+=-fno-strict-aliasing
-.ENDIF
-.ELSE # "$(PRODUCT)"!=""
-CFLAGSOPT= # no optimizing for non products
-.ENDIF # "$(PRODUCT)"!=""
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-
-# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
- -Wno-non-virtual-dtor
-CFLAGSWALLCC=$(CFLAGSWARNCC)
-CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-Werror
-
-# Once all modules on this platform compile without warnings, set
-# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
-# settings.mk):
-MODULES_WITH_WARNINGS := \
- lotuswordpro \
- soldep
-
-# switches for dynamic and static linking
-STATIC = -Wl,-Bstatic
-DYNAMIC = -Wl,-Bdynamic
-
-# name of linker
-LINK*=$(CXX)
-LINKC*=$(CC)
-
-# default linker flags
-LINKFLAGSDEFS*=-Wl,-z,defs
-LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'
-LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
- #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
-LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
-LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
-LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
-LINKFLAGSRUNPATH_OXT=
-LINKFLAGSRUNPATH_BOXT=-Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\'
-LINKFLAGSRUNPATH_NONE=
-# flag -Wl,-z,noexecstack sets the NX bit on the stack
-LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS)
-.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"
-LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
-.ENDIF
-
-# linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
- -Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
- -Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
-
-# linker flags for linking shared libraries
-LINKFLAGSSHLGUI= -shared
-LINKFLAGSSHLCUI= -shared
-
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=-g
-LINKFLAGSOPT=
-
-# linker flags for optimization (symbol hashtable)
-# for now, applied to symbol scoped libraries, only
-LINKFLAGSOPTIMIZE*=-Wl,-O1
-LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-
-SONAME_SWITCH=-Wl,-h
-
-# Sequence of libs does matter !
-
-STDLIBCPP=-lstdc++
-
-# default objectfilenames to link
-STDOBJVCL=$(L)$/salmain.o
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-
-.IF "$(ALLOC)" == "TCMALLOC"
-STDLIBGUIMT+=-ltcmalloc
-STDLIBCUIMT+=-ltcmalloc
-STDSHLGUIMT+=-ltcmalloc
-STDSHLCUIMT+=-ltcmalloc
-.ENDIF
-
-.IF "$(ALLOC)" == "JEMALLOC"
-STDLIBGUIMT+=-ljemalloc
-STDLIBCUIMT+=-ljemalloc
-STDSHLGUIMT+=-ljemalloc
-STDSHLCUIMT+=-ljemalloc
-.ENDIF
-
-.IF "$(HAVE_LD_HASH_STYLE)" == "TRUE"
-LINKFLAGS += -Wl,--hash-style=both
-.ELSE
-LINKFLAGS += -Wl,-zdynsort
-.ENDIF
-
-# libraries for linking applications
-STDLIBGUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
-STDLIBCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
-# libraries for linking shared libraries
-STDSHLGUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
-STDSHLCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
-
-X11LINK_DYNAMIC = -Wl,--as-needed -lXext -lX11 -Wl,--no-as-needed
-
-LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-
-.IF "$(USE_STLP_DEBUG)" != ""
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlportstlg
-LIBSTLPORTST=$(STATIC) -lstlportstlg $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
-LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
-.ENDIF
-.ELSE # "$(USE_STLP_DEBUG)" != ""
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlport
-LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-.ENDIF
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-
-#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
-
-# name of library manager
-LIBMGR*=ar
-LIBFLAGS=-r
-
-# tool for generating import libraries
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=irc
-RCFLAGS=-fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-# platform specific identifier for shared libs
-DLLPRE=lib
-DLLPOST=.so
-PCHPOST=.gch
+.INCLUDE : unxgcc.mk
diff --git a/solenv/inc/unxobsd.mk b/solenv/inc/unxobsd.mk
index 548be65..d700614 100644
--- a/solenv/inc/unxobsd.mk
+++ b/solenv/inc/unxobsd.mk
@@ -26,17 +26,6 @@
#*************************************************************************
# Makefile for OpenBSD
-ASM*=
-AFLAGS*=
-SOLAR_JAVA*=
-# default optimization level for product code
-CDEFAULTOPT*=-O2
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
-# position independent code switch
-PICSWITCH*:=-fpic
-JAVAFLAGSDEBUG=-g
# arch specific defines
.IF "$(CPUNAME)" == "INTEL"
@@ -48,224 +37,13 @@ ARCH_FLAGS*=
BUILD64=1
.ENDIF
-# filter for supressing verbose messages from linker
-#not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
-
-# _PTHREADS is needed for the stl
-CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
-
-# enable visibility define in "sal/types.h"
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-
-# this is a platform with JAVA support
-.IF "$(SOLAR_JAVA)"!=""
-JAVADEF=-DSOLAR_JAVA
-.IF "$(debug)"==""
-JAVA_RUNTIME=-ljava
-.ELSE
-JAVA_RUNTIME=-ljava_g
-.ENDIF
-.ENDIF
-
-# name of C++ Compiler
-CXX*=g++
-# name of C Compiler
-CC*=gcc
-.IF "$(SYSBASE)"!=""
-CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
-CXX+:=$(CFLAGS_SYSBASE)
-CC+:=$(CFLAGS_SYSBASE)
-.ENDIF # "$(SYSBASE)"!=""
-CFLAGS+=-fmessage-length=0 -c
-
-# flags to enable build with symbols; required for crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-CFLAGSENABLESYMBOLS=-g1
-.ELSE
-CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-
-.ENDIF
-
-# flags for the C++ Compiler
-CFLAGSCC= -pipe $(ARCH_FLAGS)
-# Flags for enabling exception handling
-CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
-# Flags for disabling exception handling
-CFLAGS_NO_EXCEPTIONS=-fno-exceptions -DBOOST_NO_EXCEPTIONS
-
-# -fpermissive should be removed as soon as possible
-CFLAGSCXX= -pipe $(ARCH_FLAGS)
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CFLAGSCXX += -fvisibility-inlines-hidden
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-
-CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
-CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch
-CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)$/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch
-
-# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-CFLAGSOBJGUIMT=
-# Compiler flags for compiling static object in multi threaded environment with character user interface
-CFLAGSOBJCUIMT=
-# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-CFLAGSSLOGUIMT=$(PICSWITCH)
-# Compiler flags for compiling shared object in multi threaded environment with character user interface
-CFLAGSSLOCUIMT=$(PICSWITCH)
-# Compiler flags for profiling
-CFLAGSPROF=
-# Compiler flags for debugging
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
-# Compiler flags for enabling optimizations
-.IF "$(PRODUCT)"!=""
-CFLAGSOPT=$(CDEFAULTOPT) # optimizing for products
-.IF "$(USE_SYSTEM_STL)"!="YES" || "$(CCNUMVER)" <= "000400050000"
-#STLPort headers are full of aliasing warnings and
-#At least SLED 10.2 gcc 4.3 overly agressively optimizes
-#uno::Sequence into junk, so only strict-alias on compiler
-#later than 4.5.1
-CFLAGSOPT+=-fno-strict-aliasing
-.ENDIF
-.ELSE # "$(PRODUCT)"!=""
-CFLAGSOPT= # no optimizing for non products
-.ENDIF # "$(PRODUCT)"!=""
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-
-# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
- -Wno-non-virtual-dtor
-CFLAGSWALLCC=$(CFLAGSWARNCC)
-CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-Werror
-
-# Once all modules on this platform compile without warnings, set
-# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
-# settings.mk):
-MODULES_WITH_WARNINGS := \
- lotuswordpro \
- soldep
-
-# switches for dynamic and static linking
-STATIC = -Wl,-Bstatic
-DYNAMIC = -Wl,-Bdynamic
+.INCLUDE : unxgcc.mk
-# name of linker
-LINK*=$(CXX)
-LINKC*=$(CC)
+# disable exceptions in boost
+CFLAGS_NO_EXCEPTIONS+=-DBOOST_NO_EXCEPTIONS
# default linker flags
-LINKFLAGSDEFS*=#-Wl,-z,defs
-LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'
-LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
- #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
-LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
-LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
-LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
-LINKFLAGSRUNPATH_OXT=
-LINKFLAGSRUNPATH_BOXT=-Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\'
-LINKFLAGSRUNPATH_NONE=
-# flag -Wl,-z,noexecstack sets the NX bit on the stack
-LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS)
-.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"
-LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
-.ENDIF
-
-# linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
- -Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
- -Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
-
-# linker flags for linking shared libraries
-LINKFLAGSSHLGUI= -shared
-LINKFLAGSSHLCUI= -shared
-
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=-g
-LINKFLAGSOPT=
-
-# linker flags for optimization (symbol hashtable)
-# for now, applied to symbol scoped libraries, only
-LINKFLAGSOPTIMIZE*=-Wl,-O1
-LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-
-SONAME_SWITCH=-Wl,-h
-
-# Sequence of libs does matter !
-
-STDLIBCPP=-lstdc++
-
-# default objectfilenames to link
-STDOBJVCL=$(L)$/salmain.o
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-
-.IF "$(HAVE_LD_HASH_STYLE)" == "TRUE"
-LINKFLAGS += -Wl,--hash-style=both
-.ELSE
-LINKFLAGS += -Wl,-zdynsort
-.ENDIF
-
-# libraries for linking applications
-STDLIBGUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
-STDLIBCUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
-# libraries for linking shared libraries
-STDSHLGUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
-STDSHLCUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
-
-X11LINK_DYNAMIC = -Wl,--as-needed -lXext -lX11 -Wl,--no-as-needed
-
-LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-
-.IF "$(USE_STLP_DEBUG)" != ""
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlportstlg
-LIBSTLPORTST=$(STATIC) -lstlportstlg $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
-LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
-.ENDIF
-.ELSE # "$(USE_STLP_DEBUG)" != ""
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlport
-LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-.ENDIF
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-
-#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
-
-# name of library manager
-LIBMGR*=ar
-LIBFLAGS=-r
-
-# tool for generating import libraries
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=irc
-RCFLAGS=-fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
+LINKFLAGSDEFS:=
# platform specific identifier for shared libs
-DLLPRE=lib
-DLLPOST=.so
DLLPOSTFIX=ob
-PCHPOST=.gch
commit 652c3b75bb078d65cfed006a3790dceb234c2ea2
Author: sb <sb at openoffice.org>
Date: Wed Nov 17 15:17:56 2010 +0100
sb136: #i114155# partially revert fix for i108776 to avoid ABI incompatibility of jvmaccess library
diff --git a/solenv/bin/addsym.awk b/solenv/bin/addsym.awk
index 52efcb4..621ca2e 100644
--- a/solenv/bin/addsym.awk
+++ b/solenv/bin/addsym.awk
@@ -26,16 +26,29 @@
#*************************************************************************
# Add certain symbol patterns to the first global section.
+#
+# The below code fails with 'perverted' mapfiles (using a strange line layout,
+# or containing version UDK_3_0_0 without a global section, ...).
BEGIN { state = 0 }
-/\{/ && state == 1 { exit 1 } #TODO: print error explanation to stderr?
-/^[\t ]*UDK_3_0_0[\t ]*\{/ && state == 0 { state = 1 }
-/^[\t ]*global[\t ]*:/ && state == 1 { state = 2 }
-{ print }
+END {
+ if (state == 0) {
+ print "# Weak RTTI symbols for C++ exceptions:"
+ print "UDK_3_0_0 {"
+ print "global:"
+ print "_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
+ if (ENVIRON["USE_SYSTEM_STL"] != "YES")
+ print "_ZN4_STL7num_put*; # for STLport"
+ print "};"
+ }
+}
state == 2 {
print "_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
if (ENVIRON["USE_SYSTEM_STL"] != "YES")
print "_ZN4_STL7num_put*; # for STLport"
state = 3
}
-END { if (state != 3) exit 1 } #TODO: print error explanation to stderr?
+# #i66636# - ???
+/^[\t ]*UDK_3_0_0[\t ]*\{/ { state = 1 }
+/^[\t ]*global[\t ]*:/ && state == 1 { state = 2 }
+{ print }
commit 61e8f69f87b0b51a4a020276e272b601498ce116
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Nov 17 13:13:18 2010 +0200
Add missing names and descriptions for some language packs
Should fix fdo#30797.
diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf
index 3127cdd..d81aa81 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -690,3 +690,33 @@ en-US = "Burmese"
[STR_DESC_MODULE_LANGPACK_MY]
en-US = "Installs Burmese (Myanmar) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BO]
+en-US = "Tibetan"
+
+[STR_DESC_MODULE_LANGPACK_BO]
+en-US = "Installs Tibetan support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_OC]
+en-US = "Occitan"
+
+[STR_DESC_MODULE_LANGPACK_OC]
+en-US = "Installs Occitan support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_OM]
+en-US = "Oromo"
+
+[STR_DESC_MODULE_LANGPACK_OM]
+en-US = "Installs Oromo support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SI]
+en-US = "Sinhala"
+
+[STR_DESC_MODULE_LANGPACK_SI]
+en-US = "Installs Sinhala support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UG]
+en-US = "Uyghur"
+
+[STR_DESC_MODULE_LANGPACK_UG]
+en-US = "Installs Uyghur support in %PRODUCTNAME %PRODUCTVERSION"
commit 012be493bb1510f5fb83e2b734b833f1ccee4a29
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Nov 16 13:55:28 2010 +0100
Use the new stable libwp* releases as default
diff --git a/configure.in b/configure.in
index 7fe61eb..f03ca25 100644
--- a/configure.in
+++ b/configure.in
@@ -3971,7 +3971,7 @@ if test -n "$with_system_libwpd" -o -n "$with_system_libs" && \
test "$with_system_libwpd" != "no"; then
AC_MSG_RESULT([external])
SYSTEM_LIBWPD=YES
- PKG_CHECK_MODULES( LIBWPD, libwpd-0.8 )
+ PKG_CHECK_MODULES( LIBWPD, libwpd-0.9 libwpd-stream-0.9 )
else
AC_MSG_RESULT([internal])
SYSTEM_LIBWPD=NO
@@ -4018,7 +4018,7 @@ if test -n "$with_system_libwps" -o -n "$with_system_libs" && \
test "$with_system_libwps" != "no"; then
AC_MSG_RESULT([external])
SYSTEM_LIBWPS=YES
- PKG_CHECK_MODULES( LIBWPS, libwps-0.1 )
+ PKG_CHECK_MODULES( LIBWPS, libwps-0.2 )
else
AC_MSG_RESULT([internal])
SYSTEM_LIBWPS=NO
@@ -4036,7 +4036,7 @@ if test -n "$with_system_libwpg" -o -n "$with_system_libs" && \
test "$with_system_libwpg" != "no"; then
AC_MSG_RESULT([external])
SYSTEM_LIBWPG=YES
- PKG_CHECK_MODULES( LIBWPG, libwpg-0.1 )
+ PKG_CHECK_MODULES( LIBWPG, libwpg-0.2 )
else
AC_MSG_RESULT([internal])
SYSTEM_LIBWPG=NO
diff --git a/ooo.lst b/ooo.lst
index 59b247f..802a85a 100644
--- a/ooo.lst
+++ b/ooo.lst
@@ -77,11 +77,9 @@ debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz
e3738abd0d3ce1870dc1fd1f22bba5b1-icu4c-4_2_1-src.tgz
0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz
71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz
-http://download.go-oo.org/SRC680
-799fc3b835a79adce8c88a3fee0150c1-libwps-0.1.2.tar.gz
-db556b750bf3eac8481a4cc5e29e5af1-libwpg-0.1.3.tar.gz
-http://download.go-oo.org/libwpd
-64d66018897d759358f454010b6e75d2-libwpd-0.8.14.tar.gz
+5ba6a61a2f66dfd5fee8cdd4cd262a37-libwpg-0.2.0.tar.bz2
+86e390f015e505dd71a66f0123c62f09-libwpd-0.9.0.tar.bz2
+9e436bff44c60dc8b97cba0c7fc11a5c-libwps-0.2.0.tar.bz2
http://download.go-oo.org/extern
185d60944ea767075d27247c3162b3bc-unowinreg.dll
http://www.numbertext.org/linux
More information about the Libreoffice-commits
mailing list