[ooo-build-commit] .: 214 commits - afms/download afms/makefile.mk afms/prj agg/prj agg/source apple_remote/AppleRemote.m apple_remote/makefile2.pmk apple_remote/makefile.mk apple_remote/prj AUTHORS autogen.sh beanshell/bsh-2.0b1-src.patch beanshell/download beanshell/makefile.mk beanshell/prj buildenv.in build/prj build/src build/stamp ChangeLog configure.in COPYING cppunit/cppunit-1.8.0-r1.patch cppunit/download cppunit/ldflags.patch cppunit/makefile.mk cppunit/ooo-cppunit_dll.mk cppunit/ooo-DllPlugInTester.mk cppunit/prj cppunit/solarisfinite.patch cppunit/warnings.patch cppunit/windows.patch epm/download epm/epm-3.7.patch epm/makefile.mk epm/prj external/download external/gcc3_specific external/glibc external/glibc-2.1.3.patch external/gpc external/mingwheaders external/prj external/StAX fondu/download fondu/makefile.mk fondu/prj .gitignore hsqldb/download hsqldb/makefile.mk hsqldb/patches hsqldb/prj hyphen/download hyphen/hyphen-2.4.patch hyphen/makefile.mk hyphen/prj icc/download icc/makefile.mk icc/prj icc/README icc/SampleICC-1.3.2-bendian.patch icc/SampleICC-1.3.2.patch icc/source INSTALL libegg/prj libegg/source libtextcat/data libtextcat/download libtextcat/libtextcat-2.2.patch libtextcat/makefile.mk libtextcat/prj libwpd/download libwpd/makefile.mk libwpd/prj libxmlsec/download libxmlsec/makefile.mk libxmlsec/prj libxmlsec/readme.txt libxmlsec/xmlsec1-1.2.6.patch libxmlsec/xmlsec1-configure-libxml-libxslt.patch libxmlsec/xmlsec1-configure.patch libxmlsec/xmlsec1-customkeymanage.patch libxmlsec/xmlsec1-mingw32.patch libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch libxmlsec/xmlsec1-noverify.patch libxmlsec/xmlsec1-nssdisablecallbacks.patch libxmlsec/xmlsec1-nssmangleciphers.patch libxmlsec/xmlsec1-olderlibxml2.patch libxmlsec/xmlsec1-update-config-sub-and-guess.patch lpsolve/download lpsolve/lp_solve_5.5.patch lpsolve/lp_solve_5.5-windows.patch lpsolve/makefile.mk lpsolve/prj lucene/download lucene/makefile.mk lucene/prj lucene/version.mk Makefile .am mdds/makefile.mk mdds/prj msfontextract/download msfontextract/makefile.mk msfontextract/msfontextract.patch msfontextract/prj mysqlcppconn/cppconn_config.pmk mysqlcppconn/makefile.mk mysqlcppconn/mysql_config.pmk mysqlcppconn/mysql-connector-cpp.patch mysqlcppconn/patches mysqlcppconn/prj mythes/makefile.mk mythes/mythes-1.2.0-makefile-mk.diff mythes/mythes-1.2.0-vanilla-th-gen-idx.patch mythes/prj NEWS np_sdk/mozsrc np_sdk/prj openssl/download openssl/makefile.mk openssl/openssllnx.patch openssl/opensslmacosx.patch openssl/opensslmingw.patch openssl/openssl.patch openssl/opensslsol.patch openssl/prj openssl/version.mk README redland/download redland/prj redland/raptor redland/raptor-1.4.17.patch redland/rasqal redland/rasqal-0.9.15.patch redland/README redland/redland redland/redland-1.0.7.patch redland/redlandversion.mk rhino/download rhino/makefile.mk rhino/prj rhino/rhino1_5R5-find_swing.patch rhino/rhino1_5R5.patch sane/prj twain/prj twain/util unixODBC/inc unixODB C/prj vigra/download vigra/makefile.mk vigra/prj x11_extensions/prj xsltml/download xsltml/makefile.mk xsltml/prj
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Aug 18 10:01:58 PDT 2010
.gitignore | 21
AUTHORS | 1
COPYING | 165
ChangeLog | 1
INSTALL | 237
Makefile.am | 34
README | 11
afms/makefile.mk | 15
afms/prj/build.lst | 2
agg/prj/build.lst | 2
agg/source/makefile.mk | 13
apple_remote/AppleRemote.m | 29
apple_remote/makefile.mk | 7
apple_remote/makefile2.pmk | 35
apple_remote/prj/build.lst | 2
autogen.sh | 11
beanshell/bsh-2.0b1-src.patch | 8
beanshell/makefile.mk | 7
beanshell/prj/build.lst | 2
build/prj/build.lst | 1
build/src/.gitignore | 1
build/src/OpenOffice.org-libs-extern.pc.in | 7
build/stamp/.gitignore | 3
build/stamp/README.txt | 1
buildenv.in | 10
configure.in | 19
cppunit/cppunit-1.8.0-r1.patch | 9830 ----------
cppunit/ldflags.patch | 10
cppunit/makefile.mk | 277
cppunit/ooo-DllPlugInTester.mk | 50
cppunit/ooo-cppunit_dll.mk | 100
cppunit/prj/build.lst | 5
cppunit/prj/d.lst | 90
cppunit/solarisfinite.patch | 14
cppunit/warnings.patch | 22
cppunit/windows.patch | 12
dev/null |binary
epm/epm-3.7.patch | 1454 -
epm/makefile.mk | 7
epm/prj/build.lst | 2
external/StAX/README_jsr173_1.0_api.jar | 3
external/gcc3_specific/makefile.mk | 30
external/glibc-2.1.3.patch | 24
external/glibc/makefile.mk | 22
external/gpc/makefile.mk | 57
external/mingwheaders/makefile.mk | 212
external/mingwheaders/mingw_headers.patch | 2129 --
external/prj/build.lst | 3
external/prj/d.lst | 15
fondu/makefile.mk | 73
fondu/prj/build.lst | 2
fondu/prj/d.lst | 2
hsqldb/makefile.mk | 21
hsqldb/patches/accumulated_patches.patch | 104
hsqldb/patches/i103528.patch | 11
hsqldb/patches/i104901.patch | 27
hsqldb/patches/i96823.patch | 94
hsqldb/patches/i97032.patch | 10
hsqldb/patches/index.txt | 17
hsqldb/prj/build.lst | 2
hyphen/hyphen-2.4.patch | 9
hyphen/makefile.mk | 13
hyphen/prj/build.lst | 2
icc/README | 8
icc/SampleICC-1.3.2-bendian.patch | 5133 -----
icc/SampleICC-1.3.2.patch | 96
icc/makefile.mk | 14
icc/prj/build.lst | 2
icc/source/create_sRGB_profile/create_sRGB_profile.cpp | 5
libegg/prj/build.lst | 2
libegg/source/eggtrayicon.c | 48
libegg/source/makefile.mk | 12
libtextcat/data/new_fingerprints/fpdb.conf | 1
libtextcat/data/new_fingerprints/lm/zulu.lm | 400
libtextcat/libtextcat-2.2.patch | 2503 ++
libtextcat/makefile.mk | 9
libtextcat/prj/build.lst | 2
libwpd/makefile.mk | 7
libwpd/prj/build.lst | 2
libxmlsec/makefile.mk | 66
libxmlsec/prj/build.lst | 2
libxmlsec/readme.txt | 50
libxmlsec/xmlsec1-1.2.6.patch |15363 -----------------
libxmlsec/xmlsec1-configure-libxml-libxslt.patch | 40
libxmlsec/xmlsec1-configure.patch | 747
libxmlsec/xmlsec1-customkeymanage.patch | 6065 ++++++
libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch | 62
libxmlsec/xmlsec1-mingw32.patch | 257
libxmlsec/xmlsec1-noverify.patch | 59
libxmlsec/xmlsec1-nssdisablecallbacks.patch | 36
libxmlsec/xmlsec1-nssmangleciphers.patch | 1134 +
libxmlsec/xmlsec1-olderlibxml2.patch | 23
libxmlsec/xmlsec1-update-config-sub-and-guess.patch | 2314 ++
lpsolve/lp_solve_5.5-windows.patch | 4
lpsolve/lp_solve_5.5.patch | 5
lpsolve/makefile.mk | 16
lpsolve/prj/build.lst | 2
lucene/makefile.mk | 7
lucene/prj/build.lst | 2
lucene/version.mk | 6
mdds/makefile.mk | 66
mdds/prj/build.lst | 3
mdds/prj/d.lst | 5
msfontextract/makefile.mk | 65
msfontextract/msfontextract.patch | 261
msfontextract/prj/build.lst | 2
msfontextract/prj/d.lst | 4
mysqlcppconn/cppconn_config.pmk | 33
mysqlcppconn/makefile.mk | 91
mysqlcppconn/mysql-connector-cpp.patch | 385
mysqlcppconn/mysql_config.pmk | 49
mysqlcppconn/patches/default_to_protocol_tcp.patch | 12
mysqlcppconn/prj/build.lst | 3
mysqlcppconn/prj/d.lst | 15
mythes/makefile.mk | 114
mythes/mythes-1.2.0-makefile-mk.diff | 94
mythes/mythes-1.2.0-vanilla-th-gen-idx.patch | 97
mythes/prj/build.lst | 3
mythes/prj/d.lst | 7
np_sdk/mozsrc/makefile.mk | 10
np_sdk/mozsrc/npunix.c | 54
np_sdk/mozsrc/npwin.cpp | 6
np_sdk/prj/build.lst | 2
openssl/makefile.mk | 55
openssl/openssl.patch | 66
openssl/openssllnx.patch | 71
openssl/opensslmacosx.patch | 14
openssl/opensslmingw.patch | 100
openssl/opensslsol.patch | 78
openssl/prj/build.lst | 2
openssl/version.mk | 12
redland/README | 17
redland/prj/build.lst | 2
redland/prj/d.lst | 9
redland/raptor-1.4.17.patch | 624
redland/raptor/makefile.mk | 51
redland/raptor/raptor-1.4.18.patch.autotools | 46
redland/raptor/raptor-1.4.18.patch.dmake | 124
redland/raptor/raptor-1.4.18.patch.legal | 18
redland/raptor/raptor-1.4.18.patch.mingw | 30
redland/raptor/raptor-1.4.18.patch.ooo_build | 43
redland/raptor/raptor-1.4.18.patch.win32 | 78
redland/raptor/raptor2.map | 2
redland/rasqal-0.9.15.patch | 419
redland/rasqal/makefile.mk | 46
redland/rasqal/rasqal-0.9.16.patch.autotools | 38
redland/rasqal/rasqal-0.9.16.patch.dmake | 98
redland/rasqal/rasqal-0.9.16.patch.legal | 18
redland/rasqal/rasqal-0.9.16.patch.ooo_build | 56
redland/rasqal/rasqal-0.9.16.patch.win32 | 43
redland/rasqal/rasqal2.map | 2
redland/redland-1.0.7.patch | 1018 -
redland/redland/makefile.mk | 50
redland/redland/redland-1.0.8.patch.autotools | 58
redland/redland/redland-1.0.8.patch.dmake | 115
redland/redland/redland-1.0.8.patch.legal | 54
redland/redland/redland-1.0.8.patch.ooo_build | 22
redland/redland/redland-1.0.8.patch.win32 | 154
redland/redland/redland2.map | 2
redland/redlandversion.mk | 32
rhino/makefile.mk | 10
rhino/prj/build.lst | 2
rhino/rhino1_5R5-find_swing.patch | 20
rhino/rhino1_5R5.patch | 7
sane/prj/build.lst | 2
twain/prj/build.lst | 2
twain/util/makefile.mk | 6
unixODBC/inc/sql.h | 337
unixODBC/inc/sqlext.h | 171
unixODBC/inc/sqltypes.h | 263
unixODBC/inc/sqlucode.h | 789
unixODBC/prj/build.lst | 2
unixODBC/prj/d.lst | 4
vigra/makefile.mk | 7
vigra/prj/build.lst | 2
x11_extensions/prj/build.lst | 2
xsltml/makefile.mk | 7
xsltml/prj/build.lst | 2
178 files changed, 19491 insertions(+), 37096 deletions(-)
New commits:
commit 0ca10e0baec316591e8f4e949d82e6530708bcd6
Merge: 2fabaea... d37c350...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Aug 18 18:07:00 2010 +0200
Merge commit 'ooo/OOO330_m4'
commit 2fabaea7074e41a161c9dbabca35bdb8ecba78d0
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Aug 18 18:06:12 2010 +0200
Split build: Revert it for now.
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 7a7ce93..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,21 +0,0 @@
-/Makefile
-/Makefile.in
-/aclocal.m4
-/autom4te.cache
-/buildenv
-/config.log
-/config.parms
-/config.status
-/configure
-/install-sh
-/logfile.log
-/missing
-/OpenOffice
-/solver
-
-/*/unxlng??.pro
-
-localize.sdf
-
-# temp files
-.*.swp
diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index 120da2f..0000000
--- a/AUTHORS
+++ /dev/null
@@ -1 +0,0 @@
-http://www.openoffice.org/welcome/credits.html
diff --git a/COPYING b/COPYING
deleted file mode 100644
index cca7fc2..0000000
--- a/COPYING
+++ /dev/null
@@ -1,165 +0,0 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
- This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
- 0. Additional Definitions.
-
- As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
- "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
- An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
- A "Combined Work" is a work produced by combining or linking an
-Application with the Library. The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
- The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
- The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
- 1. Exception to Section 3 of the GNU GPL.
-
- You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
- 2. Conveying Modified Versions.
-
- If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
- a) under this License, provided that you make a good faith effort to
- ensure that, in the event an Application does not supply the
- function or data, the facility still operates, and performs
- whatever part of its purpose remains meaningful, or
-
- b) under the GNU GPL, with none of the additional permissions of
- this License applicable to that copy.
-
- 3. Object Code Incorporating Material from Library Header Files.
-
- The object code form of an Application may incorporate material from
-a header file that is part of the Library. You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
- a) Give prominent notice with each copy of the object code that the
- Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the object code with a copy of the GNU GPL and this license
- document.
-
- 4. Combined Works.
-
- You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
- a) Give prominent notice with each copy of the Combined Work that
- the Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the Combined Work with a copy of the GNU GPL and this license
- document.
-
- c) For a Combined Work that displays copyright notices during
- execution, include the copyright notice for the Library among
- these notices, as well as a reference directing the user to the
- copies of the GNU GPL and this license document.
-
- d) Do one of the following:
-
- 0) Convey the Minimal Corresponding Source under the terms of this
- License, and the Corresponding Application Code in a form
- suitable for, and under terms that permit, the user to
- recombine or relink the Application with a modified version of
- the Linked Version to produce a modified Combined Work, in the
- manner specified by section 6 of the GNU GPL for conveying
- Corresponding Source.
-
- 1) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (a) uses at run time
- a copy of the Library already present on the user's computer
- system, and (b) will operate properly with a modified version
- of the Library that is interface-compatible with the Linked
- Version.
-
- e) Provide Installation Information, but only if you would otherwise
- be required to provide such information under section 6 of the
- GNU GPL, and only to the extent that such information is
- necessary to install and execute a modified version of the
- Combined Work produced by recombining or relinking the
- Application with a modified version of the Linked Version. (If
- you use option 4d0, the Installation Information must accompany
- the Minimal Corresponding Source and Corresponding Application
- Code. If you use option 4d1, you must provide the Installation
- Information in the manner specified by section 6 of the GNU GPL
- for conveying Corresponding Source.)
-
- 5. Combined Libraries.
-
- You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
- a) Accompany the combined library with a copy of the same work based
- on the Library, uncombined with any other library facilities,
- conveyed under the terms of this License.
-
- b) Give prominent notice with the combined library that part of it
- is a work based on the Library, and explaining where to find the
- accompanying uncombined form of the same work.
-
- 6. Revised Versions of the GNU Lesser General Public License.
-
- The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
- If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 73c8beb..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1 +0,0 @@
-Please see the output of git log.
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index d3c5b40..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,237 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007 Free Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package. The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
-
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
- It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
- If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
- The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system.
-
- Running `configure' might take a while. While running, it prints
- some messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
- 3. Optionally, type `make check' to run any self-tests that come with
- the package.
-
- 4. Type `make install' to install the programs and any data files and
- documentation.
-
- 5. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
- 6. Often, you can also type `make uninstall' to remove the installed
- files again.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
-
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
-
- ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
- *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory. To do this, you can use GNU `make'. `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
- With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory. After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc. You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
- You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files. If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
- For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
- CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
- OS KERNEL-OS
-
- See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
- If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
- If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'. However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost. In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'. For example:
-
- ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug. Until the bug is fixed you can use this workaround:
-
- CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
- Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
-
-`--cache-file=FILE'
- Enable the cache: use and save the results of the tests in FILE,
- traditionally `config.cache'. FILE defaults to `/dev/null' to
- disable caching.
-
-`--config-cache'
-`-C'
- Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
- Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
-
-`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options. Run
-`configure --help' for more details.
-
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 1365716..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-# few needed variables
-
-stampdir = $(top_builddir)/build/stamp
-pkgconfigdir = $(libdir)/pkgconfig
-ooo_prefix = @OOO_PREFIX@
-solenvdir = $(ooo_prefix)/solenv
-solverdir = $(ooo_prefix)/solver
-buildsolverdir = "@abs_builddir@/solver"
-
-# the predefined rules
-
-include $(solverdir)/Makefile.common
-
-# what to add to the package
-
-# TODO
-EXTRA_DIST =
-
-dist-hook: dist-hook-common
-
-# rules to execute
-
-all-local: $(stampdir)/all
-
-# TODO
-clean-local:
-
-# TODO
-distclean-local:
-
-install-data-local: $(stampdir)/all install-data-common
- $(INSTALL_DATA) $(top_builddir)/build/src/OpenOffice.org-libs-extern.pc $(DESTDIR)$(pkgconfigdir)/
-
-$(stampdir)/all: buildenv all-common
diff --git a/NEWS b/NEWS
deleted file mode 100644
index e69de29..0000000
diff --git a/README b/README
deleted file mode 100644
index 1da9de6..0000000
--- a/README
+++ /dev/null
@@ -1,11 +0,0 @@
-OpenOffice.org - split build
-============================
-
-This package provides the possibility to build OpenOffice.org by pieces. This
-one contains the 3rd party libraries needed for the OOo build.
-
-To build, do the usual
-
-./autogen.sh or ./configure
-make
-make install
diff --git a/afms/prj/build.lst b/afms/prj/build.lst
index ec184cc..ed3d01f 100644
--- a/afms/prj/build.lst
+++ b/afms/prj/build.lst
@@ -1,3 +1,3 @@
-af afms : NULL
+af afms : solenv NULL
af afms usr1 - all af_mkout NULL
af afms nmake - all af_fonts NULL
diff --git a/agg/prj/build.lst b/agg/prj/build.lst
index 533977d..d1456c6 100755
--- a/agg/prj/build.lst
+++ b/agg/prj/build.lst
@@ -1,4 +1,4 @@
-ag agg : xml2cmp NULL
+ag agg : sal xml2cmp soltools NULL
ag agg usr1 - all ag_mkout NULL
ag agg\inc get - all ag_inc NULL
ag agg\prj get - all ag_prj NULL
diff --git a/apple_remote/prj/build.lst b/apple_remote/prj/build.lst
index 455eeec..ff4ee57 100644
--- a/apple_remote/prj/build.lst
+++ b/apple_remote/prj/build.lst
@@ -1,2 +1,2 @@
-apr apple_remote : NULL
+apr apple_remote : solenv soltools NULL
apr apple_remote nmake - u apr_aprem NULL
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 8183a7f..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-aclocal $ACLOCAL_FLAGS || exit 1
-automake --gnu --add-missing --copy || exit 1
-autoconf || exit 1
-
-if test "x$NOCONFIGURE" = "x"; then
- ./configure "$@"
-else
- echo "Skipping configure process."
-fi
diff --git a/beanshell/prj/build.lst b/beanshell/prj/build.lst
index ea40e29..2a1401b 100644
--- a/beanshell/prj/build.lst
+++ b/beanshell/prj/build.lst
@@ -1,3 +1,3 @@
-be beanshell : NULL
+be beanshell : solenv NULL
be beanshell usr1 - all be_mkout NULL
be beanshell nmake - all be_beanshell NULL
diff --git a/build/prj/build.lst b/build/prj/build.lst
deleted file mode 100644
index a4120e4..0000000
--- a/build/prj/build.lst
+++ /dev/null
@@ -1 +0,0 @@
-be build : afms AGG:agg BSH:beanshell cppunit EPM:epm external fondu HSQLDB:hsqldb hyphen icc SYSTRAY_GTK:libegg libtextcat LIBWPD:libwpd LIBXMLSEC:libxmlsec LPSOLVE:lpsolve LUCENE:lucene MSFONTEXTRACT:msfontextract np_sdk OPENSSL:openssl REDLAND:redland rhino SANE:sane TWAIN:twain UNIXODBC:unixODBC VIGRA:vigra xsltml X11_EXTENSIONS:x11_extensions NULL
diff --git a/build/src/.gitignore b/build/src/.gitignore
deleted file mode 100644
index 840ea15..0000000
--- a/build/src/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/OpenOffice.org-*.pc
diff --git a/build/src/OpenOffice.org-libs-extern.pc.in b/build/src/OpenOffice.org-libs-extern.pc.in
deleted file mode 100644
index e7aeeca..0000000
--- a/build/src/OpenOffice.org-libs-extern.pc.in
+++ /dev/null
@@ -1,7 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-
-Name: OpenOffice.org 3rd party system libraries
-Description: OpenOffice.org 3rd party system libraries package
-Version: @PACKAGE_VERSION@
diff --git a/build/stamp/.gitignore b/build/stamp/.gitignore
deleted file mode 100644
index a9a95e9..0000000
--- a/build/stamp/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/*
-!/README.txt
-!/.gitignore
diff --git a/build/stamp/README.txt b/build/stamp/README.txt
deleted file mode 100644
index a28c9d7..0000000
--- a/build/stamp/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-This directory is for storing the stamps generated by the toplevel Makefile.
diff --git a/buildenv.in b/buildenv.in
deleted file mode 100644
index 6c6c26e..0000000
--- a/buildenv.in
+++ /dev/null
@@ -1,10 +0,0 @@
-# Source this if you want to use build.pl directly, like:
-# . buildenv
-# or
-# source buildenv
-
-ooo_prefix="@OOO_PREFIX@"
-solverdir="$ooo_prefix/solver"
-buildsolverdir="@abs_builddir@/solver"
-
-. "$solverdir"/buildenv-common
diff --git a/configure.in b/configure.in
deleted file mode 100644
index b42b655..0000000
--- a/configure.in
+++ /dev/null
@@ -1,19 +0,0 @@
-dnl Version X.Y.A.M
-dnl X.Y - version
-dnl A - minor, or 97 for devel, 98 for alpha, 99 for beta
-dnl M - milestone, or micro version
-AC_INIT(OpenOffice.org-libs-extern-sys,3.1.97.50)
-
-AM_INIT_AUTOMAKE([1.8b tar-ustar])
-PKG_PROG_PKG_CONFIG
-
-dnl Where should be the OOo installed
-PKG_CHECK_MODULES(OOO_BOOTSTRAP,OpenOffice.org-bootstrap)
-OOO_PREFIX=$($PKG_CONFIG --variable=ooo_prefix OpenOffice.org-bootstrap)
-AC_SUBST(OOO_PREFIX)
-
-dnl OpenOffice.org build dependencies
-PKG_CHECK_MODULES(OOO_URE,OpenOffice.org-ure)
-
-dnl Create what is necessary
-AC_OUTPUT([Makefile buildenv build/src/OpenOffice.org-libs-extern.pc])
diff --git a/cppunit/prj/build.lst b/cppunit/prj/build.lst
index 19b8cde..a1cce90 100644
--- a/cppunit/prj/build.lst
+++ b/cppunit/prj/build.lst
@@ -1,3 +1,3 @@
-c5t cppunit : NULL
+c5t cppunit : sal NULL
c5t cppunit usr1 - all c5t_mkout NULL
c5t cppunit nmake - all c5t_make NULL
diff --git a/epm/prj/build.lst b/epm/prj/build.lst
index 4a0d9cc..1086d14 100644
--- a/epm/prj/build.lst
+++ b/epm/prj/build.lst
@@ -1,2 +1,2 @@
-ep epm : NULL
+ep epm : solenv NULL
ep epm nmake - u ep_mkout NULL
diff --git a/external/prj/build.lst b/external/prj/build.lst
index 1a77354..b187daf 100644
--- a/external/prj/build.lst
+++ b/external/prj/build.lst
@@ -1,4 +1,4 @@
-el external : SO:external_so NULL
+el external : SO:external_so soltools NULL
el external usr1 - all el_mkout NULL
el external\glibc nmake - all el_glibc NULL
el external\gpc nmake - all el_gpc NULL
diff --git a/fondu/prj/build.lst b/fondu/prj/build.lst
index bef4227..d99a2c2 100644
--- a/fondu/prj/build.lst
+++ b/fondu/prj/build.lst
@@ -1,2 +1,2 @@
-fd fondu : NULL
+fd fondu : solenv NULL
fd fondu nmake - u fd_fondu NULL
diff --git a/hsqldb/prj/build.lst b/hsqldb/prj/build.lst
index 6dec1e9..a7c0623 100755
--- a/hsqldb/prj/build.lst
+++ b/hsqldb/prj/build.lst
@@ -1,2 +1,2 @@
-hs hsqldb : NULL
+hs hsqldb : solenv NULL
hs hsqldb nmake - all hs_mkout NULL
diff --git a/hyphen/prj/build.lst b/hyphen/prj/build.lst
index b58cf25..dbb21f3 100644
--- a/hyphen/prj/build.lst
+++ b/hyphen/prj/build.lst
@@ -1,3 +1,3 @@
-hyp hyphen : NULL
+hyp hyphen : solenv sal NULL
hyp hyphen usr1 - all hyp_mkout NULL
hyp hyphen nmake - all hyp_hyphen NULL
diff --git a/icc/prj/build.lst b/icc/prj/build.lst
index 4e05748..7ce035b 100644
--- a/icc/prj/build.lst
+++ b/icc/prj/build.lst
@@ -1,3 +1,3 @@
-ip icc : external NULL
+ip icc : solenv external NULL
ip icc usr1 - all ip_mkout NULL
ip icc nmake - all ip_icc NULL
diff --git a/libegg/prj/build.lst b/libegg/prj/build.lst
index a8d2334..a4cb56a 100644
--- a/libegg/prj/build.lst
+++ b/libegg/prj/build.lst
@@ -1,2 +1,2 @@
-eg libegg : NULL
+eg libegg : soltools NULL
eg libegg\source nmake - u eg_src NULL
diff --git a/libtextcat/prj/build.lst b/libtextcat/prj/build.lst
index 8a5efd1..e4bc4af 100644
--- a/libtextcat/prj/build.lst
+++ b/libtextcat/prj/build.lst
@@ -1,3 +1,3 @@
-ltc libtextcat : NULL
+ltc libtextcat : solenv sal NULL
ltc libtextcat usr1 - all ltc_mkout NULL
ltc libtextcat nmake - all ltc_libtextcat NULL
diff --git a/libwpd/prj/build.lst b/libwpd/prj/build.lst
index fe5f5bc..1da425b 100644
--- a/libwpd/prj/build.lst
+++ b/libwpd/prj/build.lst
@@ -1,3 +1,3 @@
-lw libwpd : NULL
+lw libwpd : soltools NULL
lw libwpd usr1 - all lw_mkout NULL
lw libwpd nmake - all lw_libwpd NULL
diff --git a/libxmlsec/prj/build.lst b/libxmlsec/prj/build.lst
index 11fa021..b557aa3 100644
--- a/libxmlsec/prj/build.lst
+++ b/libxmlsec/prj/build.lst
@@ -1,3 +1,3 @@
-ls libxmlsec : LIBXML2:libxml2 MOZ:moz SO:moz_prebuilt NULL
+ls libxmlsec : stlport soltools LIBXML2:libxml2 MOZ:moz SO:moz_prebuilt sal NULL
ls libxmlsec usr1 - all ls_mkout NULL
ls libxmlsec nmake - all ls_xmlsec1 NULL
diff --git a/lpsolve/prj/build.lst b/lpsolve/prj/build.lst
index b438993..516f37a 100644
--- a/lpsolve/prj/build.lst
+++ b/lpsolve/prj/build.lst
@@ -1,3 +1,3 @@
-lps lpsolve : NULL
+lps lpsolve : sal NULL
lps lpsolve usr1 - all lps_mkout NULL
lps lpsolve nmake - all lps_lpsolve NULL
diff --git a/lucene/prj/build.lst b/lucene/prj/build.lst
index a370550..9f51b60 100644
--- a/lucene/prj/build.lst
+++ b/lucene/prj/build.lst
@@ -1,3 +1,3 @@
-xh lucene : EXPAT:expat NULL
+xh lucene : soltools EXPAT:expat NULL
xh lucene usr1 - all xh_mkout NULL
xh lucene nmake - all xh_lucene NULL
diff --git a/msfontextract/prj/build.lst b/msfontextract/prj/build.lst
index 26469f4..7b52864 100644
--- a/msfontextract/prj/build.lst
+++ b/msfontextract/prj/build.lst
@@ -1,2 +1,2 @@
-mf msfontextract : NULL
+mf msfontextract : soltools sal NULL
mf msfontextract nmake - all mf_mkout NULL
diff --git a/np_sdk/prj/build.lst b/np_sdk/prj/build.lst
index af15fed..01dbd7b 100644
--- a/np_sdk/prj/build.lst
+++ b/np_sdk/prj/build.lst
@@ -1,3 +1,3 @@
-np np_sdk : NULL
+np np_sdk : soltools NULL
np np_sdk usr1 - all np_sdk NULL
np np_sdk\mozsrc nmake - all np_mozsrc NULL
diff --git a/openssl/prj/build.lst b/openssl/prj/build.lst
index 0a8f192..756d0ed 100644
--- a/openssl/prj/build.lst
+++ b/openssl/prj/build.lst
@@ -1,3 +1,3 @@
-ssl openssl : external EXPAT:expat NULL
+ssl openssl : soltools external EXPAT:expat NULL
ssl openssl usr1 - all ssl_mkout NULL
ssl openssl nmake - all ssl_openssl NULL
diff --git a/redland/prj/build.lst b/redland/prj/build.lst
index 2420ec9..a5653f0 100644
--- a/redland/prj/build.lst
+++ b/redland/prj/build.lst
@@ -1,4 +1,4 @@
-rld redland : ZLIB:zlib LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL
+rld redland : sal soltools ZLIB:zlib LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL
rld redland usr1 - all rld_mkout NULL
rld redland\raptor nmake - all rld_raptor NULL
rld redland\rasqal nmake - all rld_rasqal rld_raptor NULL
diff --git a/redland/prj/d.lst b/redland/prj/d.lst
index 9fd8969..03bbd21 100644
--- a/redland/prj/d.lst
+++ b/redland/prj/d.lst
@@ -15,3 +15,4 @@ symlink: %_DEST%\lib%_EXT%\librdf.0.dylib %_DEST%\lib%_EXT%\librdf.dylib
..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%
..\%__SRC%\lib\lib*.dll.a %_DEST%\lib%_EXT%\lib*.a
..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%
+..\redlandversion.mk %_DEST%\inc%_EXT%\redlandversion.mk
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index ee4d7e6..12479a3 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -46,7 +46,7 @@ all:
# --- Files --------------------------------------------------------
-.INCLUDE : redlandversion.mk
+.INCLUDE : ../redlandversion.mk
RAPTORVERSION=$(RAPTOR_MAJOR).4.17
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index 353b08e..e739671 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -46,7 +46,7 @@ all:
# --- Files --------------------------------------------------------
-.INCLUDE : redlandversion.mk
+.INCLUDE : ../redlandversion.mk
RASQALVERSION=0.9.15
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index 9280e85..e8b4737 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -46,7 +46,7 @@ all:
# --- Files --------------------------------------------------------
-.INCLUDE : redlandversion.mk
+.INCLUDE : ../redlandversion.mk
REDLANDVERSION=1.0.7
diff --git a/redland/redlandversion.mk b/redland/redlandversion.mk
new file mode 100644
index 0000000..9b7f736
--- /dev/null
+++ b/redland/redlandversion.mk
@@ -0,0 +1,37 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: redlandversion.mk,v $
+#
+# $Revision: 1.1 $
+#
+# 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.
+#
+#*************************************************************************
+
+RAPTOR_MAJOR=1
+# rasqal has no stable abi
+RASQAL_MAJOR=0
+# redland has no stable abi
+REDLAND_MAJOR=0
+
diff --git a/rhino/prj/build.lst b/rhino/prj/build.lst
index 04ebecb..d23bc36 100644
--- a/rhino/prj/build.lst
+++ b/rhino/prj/build.lst
@@ -1,3 +1,3 @@
-xh rhino : NULL
+xh rhino : soltools NULL
xh rhino usr1 - all xh_mkout NULL
xh rhino nmake - all xh_rhino NULL
diff --git a/sane/prj/build.lst b/sane/prj/build.lst
index 83bfa7f..c1c6fb9 100644
--- a/sane/prj/build.lst
+++ b/sane/prj/build.lst
@@ -1,3 +1,3 @@
-sa sane : NULL
+sa sane : solenv NULL
sa sane usr1 - all sa_mkout NULL
sa sane\prj get - all sa_prj NULL
diff --git a/twain/prj/build.lst b/twain/prj/build.lst
index 44a83f2..cfeab25 100644
--- a/twain/prj/build.lst
+++ b/twain/prj/build.lst
@@ -1,3 +1,3 @@
-tw twain : NULL
+tw twain : solenv NULL
tw twain usr1 - all tw_mkout NULL
tw twain\util nmake - n tw_util NULL
diff --git a/unixODBC/prj/build.lst b/unixODBC/prj/build.lst
index 6a5dd6e..2adf385 100644
--- a/unixODBC/prj/build.lst
+++ b/unixODBC/prj/build.lst
@@ -1,3 +1,3 @@
-uo unixODBC : NULL
+uo unixODBC : solenv NULL
uo unixODBC usr1 - all uo_mkout NULL
uo unixODBC\prj get - all uo_prj NULL
diff --git a/vigra/prj/build.lst b/vigra/prj/build.lst
index 5c29164..47f7eee 100644
--- a/vigra/prj/build.lst
+++ b/vigra/prj/build.lst
@@ -1,3 +1,3 @@
-vi vigra : NULL
+vi vigra : solenv NULL
vi vigra usr1 - all vi_mkout NULL
vi vigra nmake - all vi_vigra NULL
diff --git a/x11_extensions/prj/build.lst b/x11_extensions/prj/build.lst
index 4c9b6a3..c4d6b1d 100644
--- a/x11_extensions/prj/build.lst
+++ b/x11_extensions/prj/build.lst
@@ -1,3 +1,3 @@
-x1 x11_extensions : NULL
+x1 x11_extensions : solenv NULL
x1 x11_extensions usr1 - u x11_mkout NULL
diff --git a/xsltml/prj/build.lst b/xsltml/prj/build.lst
index 0c04a34..fe09f17 100755
--- a/xsltml/prj/build.lst
+++ b/xsltml/prj/build.lst
@@ -1,3 +1,3 @@
-xm xsltml : external NULL
+xm xsltml : solenv external NULL
xm xsltml usr1 - all xm_mkout NULL
xm xsltml nmake - all xm_xsltml NULL
commit d37c350287cf601dd69ddac857a2fb6aeeb4249d
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date: Mon Jul 26 18:27:06 2010 +0200
OOO330 masterfix: dictionaries needs thesaurus generated idx
diff --git a/mythes/makefile.mk b/mythes/makefile.mk
index 0aa8f2f..f373a5d 100644
--- a/mythes/makefile.mk
+++ b/mythes/makefile.mk
@@ -47,6 +47,8 @@ PATCH_FILES=mythes-1.2.0-vanilla-th-gen-idx.patch \
.IF "$(GUI)"=="UNX"
CONFIGURE_DIR=$(BUILD_DIR)
+.IF "$(SYSTEM_MYTHES)" != "YES"
+
.IF "$(SYSTEM_HUNSPELL)" != "YES"
HUNSPELL_CFLAGS +:= -I$(SOLARINCDIR)$/hunspell
HUNSPELL_LIBS +:= -L$(SOLARLIBDIR) -lhunspell-1.2
@@ -74,14 +76,9 @@ CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
CONFIGURE_FLAGS+=CFLAGS='$(LCL_CONFIGURE_CFLAGS)'
.ENDIF
-.IF "$(SYSTEM_MYTHES)" == "YES"
- at all:
- echo "Nothing to do here."
-.ELSE
BUILD_ACTION=make
OUT2INC += mythes.hxx
.ENDIF
-
.ENDIF # "$(GUI)"=="UNX"
commit 71f7763646fb7d031c6094b31eae2072404dfbc9
Merge: a2586b7... 7d53e8c...
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date: Thu Jul 22 13:08:24 2010 +0200
CWS-TOOLING: integrate CWS dba33g
commit a2586b79a6ff01cfae888b636a1df4e4c3805632
Merge: ece1aae... f268818...
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date: Wed Jul 21 16:23:13 2010 +0200
CWS-TOOLING: integrate CWS solaris10u8_OOO330
commit ece1aae5c6f102e04ed78ac16639303f1496b3c2
Merge: fdb1333... a9644a5...
Author: Kurt Zenker <kz at openoffice.org>
Date: Tue Jul 13 14:04:59 2010 +0200
CWS-TOOLING: integrate CWS mingwport31_OOO330
commit fdb1333d801da829c9d7edfbfcb098f1fa6e7c61
Merge: 8e1cf06... 738b71f...
Author: Kurt Zenker <kz at openoffice.org>
Date: Tue Jul 13 14:03:52 2010 +0200
CWS-TOOLING: integrate CWS jl153_OOO330
commit 8e1cf06094d9f1165654f834c020516d0a15afab
Merge: a40bdc3... 3108ebe...
Author: Kurt Zenker <kz at openoffice.org>
Date: Tue Jul 13 13:58:14 2010 +0200
CWS-TOOLING: integrate CWS configure25_OOO330
commit f26881851688e42f03f9aad7199e8c28d4f30348
Author: Michael Stahl <mst at openoffice.org>
Date: Mon Jul 12 15:57:50 2010 +0200
solaris10u8: #i112480#: fix libxmlsec configure:
xmlsec1-configure-libxml-libxslt.patch: do not prepend /bin to $PATH.
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index 1f0e597..c3a604c 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -48,6 +48,7 @@ TARFILE_NAME=$(PRJNAME)-$(XMLSEC1VERSION)
TARFILE_MD5=1f24ab1d39f4a51faf22244c94a6203f
#xmlsec1-configure.patch: Set up the build. Straightforward configuration
+#xmlsec1-configure-libxml-libxslt.patch: empty "$with_libxml" prepends /bin :-(
#xmlsec1-olderlibxml2.patch: Allow build against older libxml2, for macosx
#xmlsec1-nssdisablecallbacks.patch: Disable use of smime3 so don't need to package it
#xmlsec1-customkeymanage.patch: Could we do this alternatively outside xmlsec
@@ -57,6 +58,7 @@ TARFILE_MD5=1f24ab1d39f4a51faf22244c94a6203f
#xmlsec1-mingw-customkeymanage-addmscrypto.patch builds the custom keymanager on mingw
PATCH_FILES=\
xmlsec1-configure.patch \
+ xmlsec1-configure-libxml-libxslt.patch \
xmlsec1-olderlibxml2.patch \
xmlsec1-nssdisablecallbacks.patch \
xmlsec1-customkeymanage.patch \
diff --git a/libxmlsec/xmlsec1-configure-libxml-libxslt.patch b/libxmlsec/xmlsec1-configure-libxml-libxslt.patch
new file mode 100644
index 0000000..fdf39ad
--- /dev/null
+++ b/libxmlsec/xmlsec1-configure-libxml-libxslt.patch
@@ -0,0 +1,40 @@
+--- misc/xmlsec1-1.2.14/configure Wed Jun 30 11:55:36 2010
++++ misc/build/xmlsec1-1.2.14/configure Wed Jun 30 11:57:28 2010
+@@ -12077,7 +12077,7 @@
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-as_dummy="$with_libxml/bin:$PATH"
++as_dummy="$with_libxml${with_libxml:+/bin:}$PATH"
+ for as_dir in $as_dummy
+ do
+ IFS=$as_save_IFS
+@@ -12258,7 +12258,7 @@
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-as_dummy="$with_libxslt/bin:$PATH"
++as_dummy="$with_libxslt${with_libxslt:+/bin:}$PATH"
+ for as_dir in $as_dummy
+ do
+ IFS=$as_save_IFS
+--- misc/xmlsec1-1.2.14/configure.in Wed Jun 30 11:55:37 2010
++++ misc/build/xmlsec1-1.2.14/configure.in Wed Jun 30 11:53:55 2010
+@@ -231,7 +231,7 @@
+ if test "z$LIBXML_FOUND" = "zno" ; then
+ if test "z$with_libxml" != "zyes" ; then
+ AC_PATH_PROG([LIBXML_CONFIG], [$LIBXML_CONFIG], [],
+- [$with_libxml/bin:$PATH])
++ [$with_libxml${with_libxml:+/bin:}$PATH])
+ fi
+ AC_MSG_CHECKING([libxml2 $LIBXML_CONFIG ])
+ if ! LIBXML_VERSION=`$LIBXML_CONFIG --version 2>/dev/null`; then
+@@ -296,7 +296,7 @@
+ if test "z$LIBXSLT_FOUND" = "zno" ; then
+ if test "z$with_libxslt" != "zyes" ; then
+ AC_PATH_PROG([LIBXSLT_CONFIG], [$LIBXSLT_CONFIG], [],
+- [$with_libxslt/bin:$PATH])
++ [$with_libxslt${with_libxslt:+/bin:}:$PATH])
+ fi
+ AC_MSG_CHECKING(for libxslt libraries >= $LIBXSLT_MIN_VERSION)
+ if ! LIBXSLT_VERSION=`$LIBXSLT_CONFIG --version 2>/dev/null`; then
commit 7d53e8c27858c62d7ee6af0718eea6d9d21d940c
Author: Ocke Janssen [oj] <Ocke.Janssen at sun.com>
Date: Thu Jul 8 10:08:55 2010 +0200
dba33g: #i111828# * is handled differently
diff --git a/hsqldb/patches/i96823.patch b/hsqldb/patches/i96823.patch
index a48f61b..bea4a2b 100644
--- a/hsqldb/patches/i96823.patch
+++ b/hsqldb/patches/i96823.patch
@@ -9,10 +9,9 @@
+ return buf.toString();
case COUNT :
-- buf.append(' ').append(Token.T_COUNT).append('(');
+ buf.append(' ').append(Token.T_COUNT).append('(');
- break;
-+ buf.append(' ').append(Token.T_COUNT).append(left);
-+ return buf.toString();
++ if ( "(*)".equals(left))buf.append('*');else buf.append(left); buf.append(')'); return buf.toString();
case SUM :
buf.append(' ').append(Token.T_SUM).append('(');
commit 6792f02020fb5cf2a7f566db8fd633d3a08dad48
Author: Ocke Janssen [oj] <Ocke.Janssen at sun.com>
Date: Wed Jul 7 08:52:16 2010 +0200
dba33g:#i111828# add lft part to count function
diff --git a/hsqldb/patches/i96823.patch b/hsqldb/patches/i96823.patch
index 9803bc6..a48f61b 100644
--- a/hsqldb/patches/i96823.patch
+++ b/hsqldb/patches/i96823.patch
@@ -9,8 +9,9 @@
+ return buf.toString();
case COUNT :
- buf.append(' ').append(Token.T_COUNT).append('(');
+- buf.append(' ').append(Token.T_COUNT).append('(');
- break;
++ buf.append(' ').append(Token.T_COUNT).append(left);
+ return buf.toString();
case SUM :
commit a9644a552580cb3dcc0bf8274f4067cb67360322
Author: tono <tono at openoffice.org>
Date: Sat Jul 3 00:08:49 2010 +0900
i#112678: DEV300_m84 MinGW mythes build failure
diff --git a/mythes/makefile.mk b/mythes/makefile.mk
index 77d88bc..0aa8f2f 100644
--- a/mythes/makefile.mk
+++ b/mythes/makefile.mk
@@ -88,7 +88,9 @@ OUT2INC += mythes.hxx
.IF "$(GUI)"=="WNT"
.IF "$(COM)"=="GCC"
CONFIGURE_ACTION=configure
-CONFIGURE_FLAGS= --disable-shared --with-pic
+CONFIGURE_FLAGS= --disable-shared --with-pic \
+ HUNSPELL_CFLAGS=-I$(SOLARINCDIR)$/hunspell \
+ HUNSPELL_LIBS="-L$(SOLARLIBDIR) -lhunspell-1.2"
BUILD_ACTION=make
commit a40bdc39be306e0165accab8a3ebae8235d75fd2
Author: obo <obo at openoffice.org>
Date: Thu Jun 24 07:09:54 2010 +0200
masterfix: #i10000# change fileheader
diff --git a/mdds/makefile.mk b/mdds/makefile.mk
index 353fa99..ea89676 100644
--- a/mdds/makefile.mk
+++ b/mdds/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
commit ed3e3233ce5b2ca85233c8390d0d0b5d1bd9872c
Author: obo <obo at openoffice.org>
Date: Wed Jun 23 13:38:34 2010 +0200
koheirowlimitperf: #i109369# #i109373# #i109384# #i109385# #i109386# #i109387# #i109388# #i109389# #i109391# #i109934# #i109935# #i110116# #i111531# #i111887# #i112190# #i30215# increased the row limit to 1 million, and integrated lots of speed optimization and bug fixes to ensure Calc remains usable after the row limit increase.
diff --git a/mdds/makefile.mk b/mdds/makefile.mk
new file mode 100644
index 0000000..353fa99
--- /dev/null
+++ b/mdds/makefile.mk
@@ -0,0 +1,70 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.5 $
+#
+# 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.
+#
+#*************************************************************************
+
+PRJ=.
+
+PRJNAME=mdds
+TARGET=mdds
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=mdds_0.3.0
+TARFILE_MD5=cf8a6967f7de535ae257fa411c98eb88
+PATCH_FILES=
+
+CONFIGURE_DIR=
+CONFIGURE_ACTION=
+
+BUILD_DIR=
+BUILD_ACTION=
+BUILD_FLAGS=
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+.INCLUDE : tg_ext.mk
+
+# --- post-build ---------------------------------------------------
+
+NORMALIZE_FLAG_FILE=so_normalized_$(TARGET)
+
+$(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
+ -@$(MKDIRHIER) $(INCCOM)
+ @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/inc$/mdds $(INCCOM)
+ @$(TOUCH) $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
+
+$(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
+
diff --git a/mdds/prj/build.lst b/mdds/prj/build.lst
new file mode 100644
index 0000000..da7d095
--- /dev/null
+++ b/mdds/prj/build.lst
@@ -0,0 +1,3 @@
+mdd mdds : solenv BOOST:boost NULL
+mdd mdds usr1 - all mdd_mkout NULL
+mdd mdds nmake - all mdd_mdds NULL
diff --git a/mdds/prj/d.lst b/mdds/prj/d.lst
new file mode 100644
index 0000000..65cafee
--- /dev/null
+++ b/mdds/prj/d.lst
@@ -0,0 +1,5 @@
+mkdir: %_DEST%\inc%_EXT%\mdds
+
+..\%__SRC%\inc\mdds\* %_DEST%\inc%_EXT%\mdds
+
+
commit 3108ebe536f21d395e60926900c3f96ed3d0a218
Author: Rene Engelhard <rene at openoffice.org>
Date: Tue Jun 22 22:56:36 2010 +0200
configure25: per request of QA: external/StAX -> stax/download
diff --git a/external/StAX/README_jsr173_1.0_api.jar b/external/StAX/README_jsr173_1.0_api.jar
deleted file mode 100644
index 7df7eb0..0000000
--- a/external/StAX/README_jsr173_1.0_api.jar
+++ /dev/null
@@ -1,3 +0,0 @@
-The JSR173 is the XML pull API used at build time for the saxon9 XSLT processor, it has become part of OpenJDK 6.
-When using an older JDK, get the API from <https://stax-utils.dev.java.net/source/browse/*checkout*/stax-utils/lib/jars/jsr173_1.0_api.jar>
-located at the StAS Java site <https://sjsxp.dev.java.net/> and put it into external/StAX.
\ No newline at end of file
commit b8c5ebc35df5733305d6beb043429cb4700b79a4
Merge: 432af34... 2fe6e15...
Author: obo <obo at openoffice.org>
Date: Tue Jun 22 16:02:44 2010 +0200
CWS-TOOLING: integrate CWS mingwport30
commit 432af3435cde285c69aa74a682ba559672f25562
Merge: 2c2be5a... 5febb42...
Author: obo <obo at openoffice.org>
Date: Tue Jun 22 15:46:16 2010 +0200
CWS-TOOLING: integrate CWS cmcfixes75
commit 2c2be5adda316751f0e5cc5a37110176f1811427
Merge: e1c8c83... d5b93de...
Author: obo <obo at openoffice.org>
Date: Tue Jun 22 12:09:13 2010 +0200
CWS-TOOLING: integrate CWS mythes12
commit e1c8c8396bb4c2021f1f7817eb3a39b0d3082449
Merge: 4adf833... 5c8143e...
Author: obo <obo at openoffice.org>
Date: Mon Jun 21 15:14:37 2010 +0200
CWS-TOOLING: integrate CWS systemlibc
commit 2fe6e152e2949e6f2baf9d991d298d57c3a7ae3b
Author: tono <tono at openoffice.org>
Date: Sun Jun 20 01:08:33 2010 +0900
i#111958: MinGW port enhancement: runtime-pseude-reloc-v2 more relevant fix
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 883a83f..aae2d45 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -74,8 +74,44 @@ $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE): ooo-cppunit_dll.mk ooo-DllPlugInTester.mk
.IF "$(COM)" == "GCC"
EXTRA_CFLAGS += -mthreads
LDFLAGS += -Wl,--enable-runtime-pseudo-reloc-v2
+
+.IF "$(USE_SYSTEM_STL)" != "YES"
+
+OOO_STLPORT_CXXFLAGS = -I$(SOLARINCDIR)/stl
+.IF "$(USE_STLP_DEBUG)" == "TRUE"
+OOO_STLPORT_CXXFLAGS += -D_STLP_DEBUG
+.END
+OOO_STLPORT_CXXFLAGS += -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH)
+
+OOO_STLPORT_LDFLAGS = -L$(SOLARLIBDIR)
+OOO_STLPORT_LIBS = $(LIBSTLPORT)
+
+.END
+
+CONFIGURE_ACTION = ./configure
+CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \
+ pwd $(PWDFLAGS))/$(TARFILE_ROOTDIR)/ooo-install \
+ --disable-dependency-tracking --disable-static --disable-doxygen \
+ --disable-html-docs --disable-latex-docs CC='$(CC)' CXX='$(CXX)' \
+ CXXFLAGS='$(EXTRA_CFLAGS) $(OOO_STLPORT_CXXFLAGS)' \
+ LDFLAGS='$(LDFLAGS) $(OOO_STLPORT_LDFLAGS)' \
+ LIBS='$(OOO_STLPORT_LIBS) $(MY_LIBS)'
+
+BUILD_ACTION = $(GNUMAKE)
+BUILD_FLAGS = install
+
+OUTDIR2INC = ooo-install/include/cppunit
+
+OUT2BIN = ooo-install/bin/DllPlugInTester.exe \
+ ooo-install/bin/cygcppunit-1-12-1.dll
+
+.INCLUDE: set_ext.mk
+.INCLUDE: target.mk
+.INCLUDE: tg_ext.mk
+
.ENDIF # "$(COM)" == "GCC"
.ENDIF # "$(COM)" == "MSC"
+
.ELSE
.IF "$(USE_SYSTEM_STL)" != "YES"
@@ -139,10 +175,6 @@ BUILD_FLAGS = install
OUTDIR2INC = ooo-install/include/cppunit
-.IF "$(OS)" == "WNT"
-OUT2BIN = ooo-install/bin/DllPlugInTester.exe \
- ooo-install/bin/cygcppunit-1-12-1.dll
-.ELSE
OUT2BIN = ooo-install/bin/DllPlugInTester
.IF "$(OS)" == "MACOSX"
OUT2LIB = ooo-install/lib/libcppunit-1.12.1.dylib
@@ -150,7 +182,6 @@ EXTRPATH = NONE
.ELSE
OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1
.END
-.END
.INCLUDE: set_ext.mk
.INCLUDE: target.mk
commit d5b93debfe12c5a63098ea17678121b8a50ad0c1
Author: Caolán McNamara <cmc at openoffice.org>
Date: Fri Jun 18 16:05:00 2010 +0100
mythes12: #i111612# use a TARGET definition of mythes not mythes-1.2 in order to generate a libmythes.lib as in solenv/libs.mk and not libmythes-1.2.lib
diff --git a/mythes/mythes-1.2.0-makefile-mk.diff b/mythes/mythes-1.2.0-makefile-mk.diff
index ac6ff8f..30cdf46 100644
--- a/mythes/mythes-1.2.0-makefile-mk.diff
+++ b/mythes/mythes-1.2.0-makefile-mk.diff
@@ -67,7 +67,7 @@
+PRJ = ../../../..
+
+PRJNAME = mythes
-+TARGET = mythes-1.2
++TARGET = mythes
+LIBTARGET=YES
+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
+
commit 350800a44c3731f49c4f6695010558dedbf56685
Author: Rene Engelhard <rene at openoffice.org>
Date: Thu Jun 17 11:26:12 2010 +0200
mythes12: also change the source to libmythes.lib
diff --git a/mythes/prj/d.lst b/mythes/prj/d.lst
index a6dd7ea..417855e 100644
--- a/mythes/prj/d.lst
+++ b/mythes/prj/d.lst
@@ -1,4 +1,4 @@
-..\%__SRC%\slb\mythes.lib %_DEST%\lib%_EXT%\libmythes.lib
+..\%__SRC%\slb\libmythes.lib %_DEST%\lib%_EXT%\libmythes.lib
..\%__SRC%\inc\mythes.hxx %_DEST%\inc%_EXT%\mythes.hxx
..\%__SRC%\misc\build\mythes-1.2.0\.libs\libmythes-1.2.a %_DEST%\lib%_EXT%\libmythes-1.2.a
commit 5c8143e8eee8f0cdd4c4185973478f96a98bc583
Author: Mathias Bauer <mba at openoffice.org>
Date: Wed Jun 16 19:57:33 2010 +0200
CWS systemlibc: #i69033#: some fixes for Windows
diff --git a/external/glibc-2.1.3.patch b/external/glibc-2.1.3.patch
index a9c7e7b..dddc22a 100644
--- a/external/glibc-2.1.3.patch
+++ b/external/glibc-2.1.3.patch
@@ -76,7 +76,7 @@
extern int getopt ();
--- misc/glibc-2.1.3/posix/makefile.mk Mon Mar 31 09:43:50 2008
+++ misc/build/glibc-2.1.3/posix/makefile.mk Mon Mar 31 09:43:38 2008
-@@ -1 +1,69 @@
+@@ -1 +1,70 @@
-dummy
+#*************************************************************************
+#
@@ -132,7 +132,7 @@
+LIB1OBJFILES=$(OBJFILES)
+.ENDIF
+
-+.IF "$(HAVE_READDIR_R)" != "YES"
++.IF "$(HAVE_READDIR_R)" != "YES" && "$(OS)" != "WNT"
+TARGET2=gnu_readdir_r
+OBJFILES+= $(OBJ)$/readdir_r.obj
+LIB2TARGET=$(SLB)$/$(TARGET2).lib
diff --git a/external/glibc/makefile.mk b/external/glibc/makefile.mk
index 084752f..04e2ff5 100644
--- a/external/glibc/makefile.mk
+++ b/external/glibc/makefile.mk
@@ -52,6 +52,11 @@ CONFIGURE_ACTION=
BUILD_DIR=posix
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
+
+OUT2INC= \
+ posix/getopt.h \
+ posix/config.h
+
.ELSE
@all:
@echo "Nothing to do here."
diff --git a/external/prj/d.lst b/external/prj/d.lst
index 2c50c4c..5153d4a 100644
--- a/external/prj/d.lst
+++ b/external/prj/d.lst
@@ -12,6 +12,8 @@ mkdir: %_DEST%\inc%_EXT%\external\mingw\include\sys
..\%__SRC%\lib\libgnu_getopt.a %_DEST%\lib%_EXT%\libgnu_getopt.a
..\%__SRC%\lib\libgnu_getopt_static.a %_DEST%\lib%_EXT%\libgnu_getopt_static.a
+..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\glibc\*.h
+
..\%__SRC%\misc\mingw\include\*.h %_DEST%\inc%_EXT%\external\mingw\include\*
..\%__SRC%\misc\mingw\include\atl\*.h %_DEST%\inc%_EXT%\external\mingw\include\atl\*
..\%__SRC%\misc\mingw\include\sys\*.h %_DEST%\inc%_EXT%\external\mingw\include\sys\*
commit 738b71f38741eb900b9232cd871886c6e5ec6272
Merge: 67c3697... 4adf833...
Author: Joachim Lingner <jl at openoffice.org>
Date: Wed Jun 16 16:20:29 2010 +0200
jl153 merge with DEV300_m82
diff --cc openssl/makefile.mk
index a6f040e,0816807..6fabd1c
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@@ -65,12 -67,20 +67,20 @@@ UNAME=$(shell uname
.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
PATCH_FILES=openssllnx.patch
ADDITIONAL_FILES:= \
- libcrypto_OOo_0_9_8l.map \
- libssl_OOo_0_9_8l.map
+ libcrypto_OOo_0_9_8o.map \
+ libssl_OOo_0_9_8o.map
.IF "$(CPU)" == "I"
- CONFIGURE_ACTION=Configure linux-elf
+ .IF "$(UNAME)" == "GNU/kFreeBSD"
+ CONFIGURE_ACTION=Configure debian-kfreebsd-i386
+ .ELSE
+ CONFIGURE_ACTION=Configure linux-elf
+ .ENDIF
.ELIF "$(BUILD64)" == "1"
- CONFIGURE_ACTION=Configure linux-generic64
+ .IF "$(UNAME)" == "GNU/kFreeBSD"
+ CONFIGURE_ACTION=Configure debian-kfreebsd-amd64
+ .ELSE
+ CONFIGURE_ACTION=Configure linux-generic64
+ .ENDIF
.ELSE
CONFIGURE_ACTION=Configure linux-generic32
.ENDIF
diff --cc openssl/openssllnx.patch
index bb3d72c,7f26b99..abd1006
--- a/openssl/openssllnx.patch
+++ b/openssl/openssllnx.patch
@@@ -1,5 -1,48 +1,17 @@@
- --- misc/openssl-0.9.8o/config 2010-03-09 18:08:24.000000000 +0100
- +++ misc/build/openssl-0.9.8o/config 2010-03-26 15:21:12.049659235 +0100
---- misc/build/openssl-0.9.8l/Configure-old 2010-04-17 13:51:42.000000000 +0200
-+++ misc/build/openssl-0.9.8l/Configure 2010-04-17 13:52:03.000000000 +0200
-@@ -382,6 +382,9 @@
++--- misc/build/openssl-0.9.8o/Configure-old 2010-04-17 13:51:42.000000000 +0200
+++++ misc/build/openssl-0.9.8o/Configure 2010-04-17 13:52:03.000000000 +0200
++@@ -388,6 +388,9 @@
+
+ "bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+
+ +"debian-kfreebsd-amd64","gcc:-m64 -DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ +"debian-kfreebsd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ +
+ "nextstep", "cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
+ "nextstep3.3", "cc:-O3 -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
+
---- misc/openssl-0.9.8l/test/Makefile 2009-03-25 11:59:22.000000000 +0100
-+++ misc/build/openssl-0.9.8l/test/Makefile 2009-03-30 12:51:00.210108929 +0200
-@@ -408,7 +408,7 @@
- LIBRARIES="$(LIBCRYPTO)"; \
- fi; \
- $(MAKE) -f $(TOP)/Makefile.shared -e \
-- CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
-+ CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
- LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- link_app.$${shlib_target}
-
-@@ -421,7 +421,7 @@
- fi; \
- [ "$(FIPSCANLIB)" = "libfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \
- $(MAKE) -f $(TOP)/Makefile.shared -e \
-- CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
-+ CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
- LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- link_app.$${shlib_target}
-
---- misc/openssl-0.9.8l/apps/Makefile 2008-11-19 17:03:48.000000000 +0100
-+++ misc/build/openssl-0.9.8l/apps/Makefile 2009-03-30 12:50:56.332719825 +0200
-@@ -158,7 +158,7 @@
- LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \
- [ "x$(FIPSCANLIB)" = "xlibfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \
- $(MAKE) -f $(TOP)/Makefile.shared -e \
-- CC=$${CC} APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
-+ CC="$${CC}" APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
- LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- link_app.$${shlib_target}
- -(cd ..; \
---- misc/openssl-0.9.8l/config 2009-02-16 09:43:41.000000000 +0100
-+++ misc/build/openssl-0.9.8l/config 2009-03-30 08:59:09.588448000 +0200
++--- misc/openssl-0.9.8o/config 2009-02-16 09:43:41.000000000 +0100
+++++ misc/build/openssl-0.9.8o/config 2009-03-30 08:59:09.588448000 +0200
@@ -399,27 +399,21 @@
# this is where the translation occurs into SSLeay terms
# ---------------------------------------------------------------------------
commit 21a58defa41c4428312e0069b6a2bc9398e51e06
Author: Rene Engelhard <rene at openoffice.org>
Date: Wed Jun 16 11:47:43 2010 +0200
mythes12: deliver mythes.lib correctly as libmythes.lib
diff --git a/mythes/prj/d.lst b/mythes/prj/d.lst
index 5372b5b..a6dd7ea 100644
--- a/mythes/prj/d.lst
+++ b/mythes/prj/d.lst
@@ -1,4 +1,4 @@
-..\%__SRC%\slb\mythes.lib %_DEST%\lib%_EXT%\mythes.lib
+..\%__SRC%\slb\mythes.lib %_DEST%\lib%_EXT%\libmythes.lib
..\%__SRC%\inc\mythes.hxx %_DEST%\inc%_EXT%\mythes.hxx
..\%__SRC%\misc\build\mythes-1.2.0\.libs\libmythes-1.2.a %_DEST%\lib%_EXT%\libmythes-1.2.a
commit 6800e14eac234de1e2f4376c566721a615e2c754
Author: tono <tono at openoffice.org>
Date: Tue Jun 15 22:33:46 2010 +0900
i#111958: MinGW port enhancement: runtime-pseude-reloc-v2 relevant fix
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 0ec7fcb..883a83f 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -40,7 +40,8 @@ PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch
# warnings.patch: see <https://sourceforge.net/tracker/?func=detail&
# aid=2912630&group_id=11795&atid=311795>
-.IF "$(OS)" == "WNT" && "$(COM)" == "MSC"
+.IF "$(OS)" == "WNT"
+.IF "$(COM)" == "MSC"
# On Windows, CppUnit appears to support either the Unix-style configure/make
# approach with cygwin and gcc (and libtool fails miserably if gcc is replaced
@@ -70,11 +71,12 @@ OUTDIR2INC = include/cppunit
$(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE): ooo-cppunit_dll.mk ooo-DllPlugInTester.mk
.ELSE
-
-.IF "$(OS)" == "WNT"
+.IF "$(COM)" == "GCC"
EXTRA_CFLAGS += -mthreads
LDFLAGS += -Wl,--enable-runtime-pseudo-reloc-v2
-.ENDIF
+.ENDIF # "$(COM)" == "GCC"
+.ENDIF # "$(COM)" == "MSC"
+.ELSE
.IF "$(USE_SYSTEM_STL)" != "YES"
commit 55ef01e3291ebe574b7101809c7954b4d473a9aa
Author: Rene Engelhard <rene at openoffice.org>
Date: Tue Jun 15 14:55:18 2010 +0200
mythes12: fix build without pkg-config/hunspell on system
diff --git a/mythes/makefile.mk b/mythes/makefile.mk
index 94fa611..77d88bc 100644
--- a/mythes/makefile.mk
+++ b/mythes/makefile.mk
@@ -47,6 +47,11 @@ PATCH_FILES=mythes-1.2.0-vanilla-th-gen-idx.patch \
.IF "$(GUI)"=="UNX"
CONFIGURE_DIR=$(BUILD_DIR)
+.IF "$(SYSTEM_HUNSPELL)" != "YES"
+HUNSPELL_CFLAGS +:= -I$(SOLARINCDIR)$/hunspell
+HUNSPELL_LIBS +:= -L$(SOLARLIBDIR) -lhunspell-1.2
+.ENDIF
+
#relative to CONFIGURE_DIR
# still needed also in system-mythes case as it creates the makefile
CONFIGURE_ACTION=configure
@@ -104,3 +109,7 @@ OUT2INC += mythes.hxx
.INCLUDE : target.mk
.INCLUDE : tg_ext.mk
+.IF "$(SYSTEM_HUNSPELL)" != "YES"
+.EXPORT: HUNSPELL_LIBS HUNSPELL_CFLAGS
+.ENDIF
+
commit 5febb426c916516bbbf499fad09436147f1edd65
Merge: 1f84fb4... 4adf833...
Author: Caolán McNamara <cmc at openoffice.org>
Date: Fri Jun 11 20:07:01 2010 +0100
cmcfixes75: merge with DEV300 m81
commit 67c36971d29f0cd4e78514c1b800a3625d8bd6eb
Merge: d3ab33e... 090b8be...
Author: Joachim Lingner <jl at openoffice.org>
Date: Fri Jun 11 14:29:40 2010 +0200
jl153 merging heads
commit 4adf8334c99e21a8158c7b3567e73b94f333fe41
Author: obo <obo at openoffice.org>
Date: Thu Jun 10 15:11:12 2010 +0200
masterfix: #i10000# xmlsec1-update-config-sub-and-guess.patch is based on xmlsec1-1.2.12 and doesn't match current version (from CWS kfreebsdport01v2)
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index 211a537..1f0e597 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -63,8 +63,7 @@ PATCH_FILES=\
xmlsec1-nssmangleciphers.patch \
xmlsec1-noverify.patch \
xmlsec1-mingw32.patch \
- xmlsec1-mingw-keymgr-mscrypto.patch \
- xmlsec1-update-config-sub-and-guess.patch
+ xmlsec1-mingw-keymgr-mscrypto.patch
ADDITIONAL_FILES= \
commit cb4e2137a4b86c69e8c10db9fef63782631fb7d7
Merge: 02cd0ba... 2309890...
Author: obo <obo at openoffice.org>
Date: Wed Jun 9 16:35:27 2010 +0200
CWS-TOOLING: integrate CWS tl74
commit 2309890fb980fd84b4a6075f2e18c8e12e876f28
Merge: eea3311... c8e3645...
Author: Thomas Lange [tl] <tl at openoffice.org>
Date: Wed Jun 9 14:50:43 2010 +0200
cws tl74: merge with DEV300_m81
commit 1f84fb4b81a1d4d10ce2be350d29130af1fa3b14
Merge: 8dd4a4b... c8e3645...
Author: Caolán McNamara <cmc at openoffice.org>
Date: Wed Jun 9 11:45:53 2010 +0100
cmcfixes75: merge with DEV300 m81
commit 02cd0bab77729f1db386b2fdbe92665803e7daf8
Merge: c8e3645... 29bb7ff...
Author: obo <obo at openoffice.org>
Date: Wed Jun 9 08:34:10 2010 +0200
CWS-TOOLING: integrate CWS kfreebsdport01v2
diff --cc libxmlsec/makefile.mk
index 1f0e597,98cc871..211a537
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@@ -57,13 -56,13 +57,14 @@@ TARFILE_MD5=1f24ab1d39f4a51faf22244c94a
#xmlsec1-mingw-customkeymanage-addmscrypto.patch builds the custom keymanager on mingw
PATCH_FILES=\
xmlsec1-configure.patch \
+ xmlsec1-olderlibxml2.patch \
+ xmlsec1-nssdisablecallbacks.patch \
xmlsec1-customkeymanage.patch \
xmlsec1-nssmangleciphers.patch \
- xmlsec1-nssdisablecallbacks.patch \
xmlsec1-noverify.patch \
xmlsec1-mingw32.patch \
- xmlsec1-mingw-keymgr-mscrypto.patch
+ xmlsec1-mingw-keymgr-mscrypto.patch \
+ xmlsec1-update-config-sub-and-guess.patch
ADDITIONAL_FILES= \
commit 090b8be4a8ff1b16ef20f059ad5d0b9b6682907a
Author: Tobias Krause <tkr at openoffice.org>
Date: Mon Jun 7 13:32:25 2010 +0200
jl153: #111875# Update OpenSSL to version 0.9.8o on all platforms except MacOSX (here we are using system openssl)
diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index bfbff09..a6f040e 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# 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
@@ -46,10 +46,10 @@ TARGET=openssl
@echo "openssl disabled...."
.ENDIF
-OPENSSL_NAME=openssl-0.9.8l
+OPENSSL_NAME=openssl-0.9.8o
TARFILE_NAME=$(OPENSSL_NAME)
-TARFILE_MD5=05a0ece1372392a2cf310ebb96333025
+TARFILE_MD5=63ddc5116488985e820075e65fbe6aa4
CONFIGURE_DIR=.
CONFIGURE_ACTION=config
@@ -65,8 +65,8 @@ OUT2INC += include/openssl/*
.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
PATCH_FILES=openssllnx.patch
ADDITIONAL_FILES:= \
- libcrypto_OOo_0_9_8l.map \
- libssl_OOo_0_9_8l.map
+ libcrypto_OOo_0_9_8o.map \
+ libssl_OOo_0_9_8o.map
.IF "$(CPU)" == "I"
CONFIGURE_ACTION=Configure linux-elf
.ELIF "$(BUILD64)" == "1"
@@ -81,8 +81,8 @@ OUT2INC += include/openssl/*
.IF "$(OS)" == "SOLARIS"
PATCH_FILES=opensslsol.patch
ADDITIONAL_FILES:= \
- libcrypto_OOo_0_9_8l.map \
- libssl_OOo_0_9_8l.map
+ libcrypto_OOo_0_9_8o.map \
+ libssl_OOo_0_9_8o.map
#BUILD_ACTION=make 'SHARED_LDFLAGS=-G -dy -z text -M./lib$$$$$$$$(SHLIBDIRS)_OOo_0_9_8e.map'
# Use BUILD64 when 1 to select new specific 64bit Configurations if necessary
@@ -131,11 +131,7 @@ OUT2BIN += out/libeay32.dll
# The env. vars CC and PERL are used by nmake, and nmake insists on '\'s
# If WRAPCMD is set it is prepended before the compiler, don't touch that.
.IF "$(WRAPCMD)"==""
- # relace / with \ first word only
- cc_first_repl = $(subst,/,\ $(normpath,1 $(CC:1)))
- cc_first = $(normpath,1 $(CC:1))
- CC!:=$(subst,$(cc_first),$(cc_first_repl) $(normpath,1 $(CC)))
-# CC!:=$(subst,/,\ $(normpath,1 $(CC)))
+ CC!:=$(subst,/,\ $(normpath,1 $(CC)))
.EXPORT : CC
.ENDIF
PERL_bak:=$(PERL)
diff --git a/openssl/openssl.patch b/openssl/openssl.patch
index 4b976ae..5d245f4 100644
--- a/openssl/openssl.patch
+++ b/openssl/openssl.patch
@@ -1,5 +1,5 @@
---- misc/openssl-0.9.8l/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.000000000 +0100
-+++ misc/build/openssl-0.9.8l/crypto/x509v3/v3_pci.c 2008-03-20 13:30:16.000000000 +0100
+--- misc/openssl-0.9.8o/crypto/x509v3/v3_pci.c 2007-03-05 01:06:47.000000000 +0100
++++ misc/build/openssl-0.9.8o/crypto/x509v3/v3_pci.c 2010-03-26 12:04:20.961547300 +0100
@@ -2,7 +2,7 @@
/* Contributed to the OpenSSL Project 2004
* by Richard Levitte (richard at levitte.org)
@@ -9,8 +9,8 @@
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
---- misc/openssl-0.9.8l/crypto/x509v3/v3_pcia.c 2004-12-28 01:21:33.000000000 +0100
-+++ misc/build/openssl-0.9.8l/crypto/x509v3/v3_pcia.c 2008-03-20 13:30:47.000000000 +0100
+--- misc/openssl-0.9.8o/crypto/x509v3/v3_pcia.c 2004-12-28 01:21:33.000000000 +0100
++++ misc/build/openssl-0.9.8o/crypto/x509v3/v3_pcia.c 2010-03-26 12:04:20.961547300 +0100
@@ -2,7 +2,7 @@
/* Contributed to the OpenSSL Project 2004
* by Richard Levitte (richard at levitte.org)
@@ -20,28 +20,30 @@
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
---- misc/openssl-0.9.8l/ms/do_ms.bat 2005-05-17 02:07:13.000000000 +0200
-+++ misc/build/openssl-0.9.8l/ms/do_ms.bat 2008-03-20 13:27:06.000000000 +0100
-@@ -1,9 +1,8 @@
-+%1 util\mkfiles.pl >MINFO
-+%1 util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak
-+%1 util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak
-+%1 util\mk1mf.pl no-asm VC-CE >ms\ce.mak
-+%1 util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak
+--- misc/openssl-0.9.8o/ms/do_ms.bat 2009-07-28 14:51:19.000000000 +0200
++++ misc/build/openssl-0.9.8o/ms/do_ms.bat 2010-03-26 12:19:19.399047300 +0100
+@@ -1,11 +1,11 @@
-perl util\mkfiles.pl >MINFO
-perl util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak
-perl util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak
++%1 util\mkfiles.pl >MINFO
++%1 util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak
++%1 util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak
+ if x%OSVERSION% == x goto skipce
-perl util\mk1mf.pl no-asm VC-CE >ms\ce.mak
-perl util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak
--
++%1 util\mk1mf.pl no-asm VC-CE >ms\ce.mak
++%1 util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak
+ :skipce
+
-perl util\mkdef.pl 32 libeay > ms\libeay32.def
-perl util\mkdef.pl 32 ssleay > ms\ssleay32.def
+%1 util\mkdef.pl 32 libeay > ms\libeay32.def
+%1 util\mkdef.pl 32 ssleay > ms\ssleay32.def
---- misc/openssl-0.9.8l/util/mk1mf.pl 2007-08-13 00:31:14.000000000 +0200
-+++ misc/build/openssl-0.9.8l/util/mk1mf.pl 2008-03-20 13:27:06.000000000 +0100
-@@ -115,7 +115,7 @@
+--- misc/openssl-0.9.8o/util/mk1mf.pl 2009-09-20 14:46:42.000000000 +0200
++++ misc/build/openssl-0.9.8o/util/mk1mf.pl 2010-03-26 12:04:20.977172300 +0100
+@@ -128,7 +128,7 @@
$inc_def="outinc";
$tmp_def="tmp";
@@ -50,19 +52,19 @@
$mkdir="-mkdir" unless defined $mkdir;
($ssl,$crypto)=("ssl","crypto");
-@@ -277,6 +277,11 @@
- chop;
-
- ($key,$val)=/^([^=]+)=(.*)/;
+@@ -290,6 +290,11 @@
+ chop;
+
+ ($key,$val)=/^([^=]+)=(.*)/;
+
+ # On some Windows machines, $val has linefeeds at the end, which confuses
+ # subsequent code in this file. So we strip all whitespace at the end.
+ $val =~ s/\s+$//;
+
- if ($key eq "RELATIVE_DIRECTORY")
- {
- if ($lib ne "")
-@@ -570,7 +575,7 @@
+ if ($key eq "RELATIVE_DIRECTORY")
+ {
+ if ($lib ne "")
+@@ -730,7 +735,7 @@
printf OUT <<EOF;
#ifdef $platform_cpp_symbol
/* auto-generated/updated by util/mk1mf.pl for crypto/cversion.c */
@@ -71,10 +73,10 @@
#define PLATFORM "$platform"
EOF
printf OUT " #define DATE \"%s\"\n", scalar gmtime();
---- misc/openssl-0.9.8l/util/pl/VC-32.pl 2007-07-19 19:39:07.000000000 +0200
-+++ misc/build/openssl-0.9.8l/util/pl/VC-32.pl 2008-03-20 13:27:06.000000000 +0100
-@@ -28,7 +28,7 @@
- $zlib_lib="zlib1.lib";
+--- misc/openssl-0.9.8o/util/pl/VC-32.pl 2010-02-04 02:10:24.000000000 +0100
++++ misc/build/openssl-0.9.8o/util/pl/VC-32.pl 2010-03-26 12:04:20.977172300 +0100
+@@ -32,7 +32,7 @@
+ $l_flags =~ s/-L(\S+)/\/libpath:$1/g;
# C compiler stuff
-$cc='cl';
@@ -82,7 +84,7 @@
if ($FLAVOR =~ /WIN64/)
{
# Note that we currently don't have /WX on Win64! There is a lot of
-@@ -99,21 +99,21 @@
+@@ -103,21 +103,21 @@
}
$cc='$(CC)';
@@ -102,17 +104,17 @@
$base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8
$base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8
- my $f = $shlib || $fips ?' /MD':' /MT';
-+ my $f = $shlib || $fips ?' -MD':' -MT';
- $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
-+ $lib_cflag='-Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
- $opt_cflags=$f.' /Ox /O2 /Ob2';
- $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
++ my $f = $shlib || $fips ?' -MD':' -MT';
++ $lib_cflag='-Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
+ $opt_cflags=$f.' -Ox -O2 -Ob2';
+ $dbg_cflags=$f.'d -Od -DDEBUG -D_DEBUG';
$lflags="/nologo /subsystem:console /opt:ref";
}
$mlflags='';
-@@ -134,7 +134,7 @@
+@@ -138,7 +138,7 @@
}
$obj='.obj';
@@ -121,7 +123,7 @@
# EXE linking stuff
$link="link";
-@@ -281,7 +281,7 @@
+@@ -298,7 +298,7 @@
$tmp_def='tmp32dll_$(TARGETCPU)';
}
diff --git a/openssl/openssllnx.patch b/openssl/openssllnx.patch
index 2eb9294..bb3d72c 100644
--- a/openssl/openssllnx.patch
+++ b/openssl/openssllnx.patch
@@ -1,40 +1,9 @@
---- misc/openssl-0.9.8l/test/Makefile 2009-03-25 11:59:22.000000000 +0100
-+++ misc/build/openssl-0.9.8l/test/Makefile 2009-03-30 12:51:00.210108929 +0200
-@@ -408,7 +408,7 @@
- LIBRARIES="$(LIBCRYPTO)"; \
- fi; \
- $(MAKE) -f $(TOP)/Makefile.shared -e \
-- CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
-+ CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
- LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- link_app.$${shlib_target}
-
-@@ -421,7 +421,7 @@
- fi; \
- [ "$(FIPSCANLIB)" = "libfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \
- $(MAKE) -f $(TOP)/Makefile.shared -e \
-- CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
-+ CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
- LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- link_app.$${shlib_target}
-
---- misc/openssl-0.9.8l/apps/Makefile 2008-11-19 17:03:48.000000000 +0100
-+++ misc/build/openssl-0.9.8l/apps/Makefile 2009-03-30 12:50:56.332719825 +0200
-@@ -158,7 +158,7 @@
- LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \
- [ "x$(FIPSCANLIB)" = "xlibfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \
- $(MAKE) -f $(TOP)/Makefile.shared -e \
-- CC=$${CC} APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
-+ CC="$${CC}" APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
- LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- link_app.$${shlib_target}
- -(cd ..; \
---- misc/openssl-0.9.8l/config 2009-02-16 09:43:41.000000000 +0100
-+++ misc/build/openssl-0.9.8l/config 2009-03-30 08:59:09.588448000 +0200
+--- misc/openssl-0.9.8o/config 2010-03-09 18:08:24.000000000 +0100
++++ misc/build/openssl-0.9.8o/config 2010-03-26 15:21:12.049659235 +0100
@@ -399,27 +399,21 @@
# this is where the translation occurs into SSLeay terms
# ---------------------------------------------------------------------------
-
+
-GCCVER=`(gcc -dumpversion) 2>/dev/null`
-if [ "$GCCVER" != "" ]; then
- # then strip off whatever prefix egcs prepends the number with...
@@ -73,12 +42,12 @@
+ fi
fi
GCCVER=${GCCVER:-0}
- if [ "$SYSTEM" = "HP-UX" ];then
---- misc/openssl-0.9.8l/libcrypto_OOo_0_9_8l.map Tue Jan 27 19:52:14 2009
-+++ misc/build/openssl-0.9.8l/libcrypto_OOo_0_9_8l.map Tue Jan 27 19:51:04 2009
-@@ -1,1 +1,3295 @@
+ if [ "$SYSTEM" = "HP-UX" ];then
+--- misc/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map 2010-03-26 15:26:55.958495757 +0100
++++ misc/build/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map 2010-03-26 15:31:38.019501422 +0100
+@@ -1 +1,3295 @@
-dummy
-+LIBCRYPTO_OOO_0_9_8l {
++LIBCRYPTO_OOO_0_9_8o {
+ global:
+ACCESS_DESCRIPTION_free;
+ACCESS_DESCRIPTION_it;
@@ -1397,7 +1366,7 @@
+KRB5_TKTBODY_free;
+KRB5_TKTBODY_it;
+KRB5_TKTBODY_new;
-+LIBCRYPTO_OOO_0_9_8l;
++LIBCRYPTO_OOO_0_9_8o;
+LONG_it;
+MD2;
+MD2_Final;
@@ -3373,11 +3342,11 @@
+ local:
+ *;
+};
---- misc/openssl-0.9.8l/libssl_OOo_0_9_8l.map Tue Jan 27 19:52:14 2009
-+++ misc/build/openssl-0.9.8l/libssl_OOo_0_9_8l.map Tue Jan 27 19:51:04 2009
-@@ -1,1 +1,445 @@
+--- misc/openssl-0.9.8o/libssl_OOo_0_9_8o.map 2010-03-26 15:26:55.966057991 +0100
++++ misc/build/openssl-0.9.8o/libssl_OOo_0_9_8o.map 2010-03-26 15:31:58.552966503 +0100
+@@ -1 +1,445 @@
-dummy
-+LIBSSL_OOO_0_9_8l {
++LIBSSL_OOO_0_9_8o {
+ global:
+BIO_f_ssl;
+BIO_new_buffer_ssl_connect;
@@ -3390,7 +3359,7 @@
+DTLSv1_method;
+DTLSv1_server_method;
+ERR_load_SSL_strings;
-+LIBSSL_OOO_0_9_8l;
++LIBSSL_OOO_0_9_8o;
+SSL_CIPHER_description;
+SSL_CIPHER_get_bits;
+SSL_CIPHER_get_name;
diff --git a/openssl/opensslmacosx.patch b/openssl/opensslmacosx.patch
index fb6bf48..4c99853 100644
--- a/openssl/opensslmacosx.patch
+++ b/openssl/opensslmacosx.patch
@@ -1,7 +1,7 @@
---- misc/build/openssl-0.9.8l/libcrypto_OOo_0_9_8l.map 1970-01-01 01:00:00.000000000 +0100
-+++ misc/build/openssl-0.9.8l/libcrypto_OOo_0_9_8l.map 2007-10-16 15:44:13.000000000 +0200
-@@ -0,0 +1,3303 @@
-+LIBCRYPTO_OOO_0_9_8l{
+--- misc/build/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map 1970-01-01 01:00:00.000000000 +0100
++++ misc/build/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map 2007-10-16 15:44:13.000000000 +0200
+@@ -0,1 +1,3304 @@
++LIBCRYPTO_OOO_0_9_8o{
+ global:
+ACCESS_DESCRIPTION_free;
+ACCESS_DESCRIPTION_it;
@@ -3304,10 +3304,10 @@
+ local:
+ *;
+};
---- misc/build/openssl-0.9.8l/libssl_OOo_0_9_8l.map 1970-01-01 01:00:00.000000000 +0100
-+++ misc/build/openssl-0.9.8l/libssl_OOo_0_9_8l.map 2007-10-16 15:44:13.000000000 +0200
+--- misc/build/openssl-0.9.8o/libssl_OOo_0_9_8o.map 1970-01-01 01:00:00.000000000 +0100
++++ misc/build/openssl-0.9.8o/libssl_OOo_0_9_8o.map 2007-10-16 15:44:13.000000000 +0200
@@ -0,0 +1,442 @@
-+LIBSSL_OOO_0_9_8l{
++LIBSSL_OOO_0_9_8o{
+ global:
+BIO_f_ssl;
+BIO_new_buffer_ssl_connect;
diff --git a/openssl/opensslmingw.patch b/openssl/opensslmingw.patch
index 1443763..10b4853 100755
--- a/openssl/opensslmingw.patch
+++ b/openssl/opensslmingw.patch
@@ -1,5 +1,5 @@
---- misc/openssl-0.9.8l/Makefile.shared 2008-09-17 17:56:40.000000000 +0200
-+++ misc/build/openssl-0.9.8l/Makefile.shared 2009-03-30 11:52:53.684538000 +0200
+--- misc/openssl-0.9.8o/Makefile.shared 2008-09-17 17:56:40.000000000 +0200
++++ misc/build/openssl-0.9.8o/Makefile.shared 2009-03-30 11:52:53.684538000 +0200
@@ -254,13 +254,17 @@
base=-Wl,--enable-auto-image-base; \
if expr $(PLATFORM) : 'mingw' > /dev/null; then \
@@ -21,25 +21,8 @@
[ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm apps/$$SHLIB$$SHLIB_SUFFIX; \
[ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm test/$$SHLIB$$SHLIB_SUFFIX; \
$(LINK_SO_A) || exit 1; \
---- misc/openssl-0.9.8l/apps/Makefile 2008-11-20 01:03:48.000000000 +0900
-+++ misc/build/openssl-0.9.8l/apps/Makefile 2009-04-10 19:49:37.006875000 +0900
-@@ -153,12 +153,12 @@
- shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
- shlib_target="$(SHLIB_TARGET)"; \
- elif [ -n "$(FIPSCANLIB)" ]; then \
-- FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
-+ FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
- fi; \
- LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \
- [ "x$(FIPSCANLIB)" = "xlibfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \
- $(MAKE) -f $(TOP)/Makefile.shared -e \
-- CC=$${CC} APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
-+ CC="$${CC}" APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
- LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- link_app.$${shlib_target}
- -(cd ..; \
---- misc/openssl-0.9.8l/e_os2.h 2005-12-19 03:57:07.000000000 +0900
-+++ misc/build/openssl-0.9.8l/e_os2.h 2009-04-04 23:07:15.324250000 +0900
+--- misc/openssl-0.9.8o/e_os2.h 2005-12-19 03:57:07.000000000 +0900
++++ misc/build/openssl-0.9.8o/e_os2.h 2009-04-04 23:07:15.324250000 +0900
@@ -264,7 +264,7 @@
# define OPENSSL_IMPLEMENT_GLOBAL(type,name) \
extern type _hide_##name; \
@@ -49,8 +32,8 @@
# define OPENSSL_DECLARE_GLOBAL(type,name) type *_shadow_##name(void)
# define OPENSSL_GLOBAL_REF(name) (*(_shadow_##name()))
#else
---- misc/openssl-0.9.8l/ms/mingw32.bat 2006-05-05 15:19:32.000000000 +0200
-+++ misc/build/openssl-0.9.8l/ms/mingw32.bat 2009-03-30 11:54:10.000000000 +0200
+--- misc/openssl-0.9.8o/ms/mingw32.bat 2006-05-05 15:19:32.000000000 +0200
++++ misc/build/openssl-0.9.8o/ms/mingw32.bat 2009-03-30 11:54:10.000000000 +0200
@@ -79,15 +79,41 @@
rem copy ms\tlhelp32.h outinc
@@ -96,40 +79,8 @@
echo Done compiling OpenSSL
:end
---- misc/openssl-0.9.8l/test/Makefile 2009-03-25 19:59:22.000000000 +0900
-+++ misc/build/openssl-0.9.8l/test/Makefile 2009-04-10 20:07:21.522500000 +0900
-@@ -402,13 +402,13 @@
- if [ "$(FIPSCANLIB)" = "libfips" ]; then \
- LIBRARIES="-L$(TOP) -lfips"; \
- elif [ -n "$(FIPSCANLIB)" ]; then \
-- FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
-+ FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
- LIBRARIES="$${FIPSLIBDIR:-$(TOP)/fips/}fipscanister.o"; \
- else \
- LIBRARIES="$(LIBCRYPTO)"; \
- fi; \
- $(MAKE) -f $(TOP)/Makefile.shared -e \
-- CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
-+ CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
- LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- link_app.$${shlib_target}
-
-@@ -417,11 +417,11 @@
- fi; \
- LIBRARIES="$(LIBSSL) $(LIBCRYPTO) $(LIBKRB5)"; \
- if [ -z "$(SHARED_LIBS)" -a -n "$(FIPSCANLIB)" ] ; then \
-- FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
-+ FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
- fi; \
- [ "$(FIPSCANLIB)" = "libfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \
- $(MAKE) -f $(TOP)/Makefile.shared -e \
-- CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
-+ CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
- LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- link_app.$${shlib_target}
-
---- misc/openssl-0.9.8l/util/pl/Mingw32.pl 2006-05-05 15:19:34.000000000 +0200
-+++ misc/build/openssl-0.9.8l/util/pl/Mingw32.pl 2009-03-30 11:55:04.000000000 +0200
+--- misc/openssl-0.9.8o/util/pl/Mingw32.pl 2006-05-05 15:19:34.000000000 +0200
++++ misc/build/openssl-0.9.8o/util/pl/Mingw32.pl 2009-03-30 11:55:04.000000000 +0200
@@ -6,11 +6,11 @@
$o='/';
$cp='cp';
diff --git a/openssl/opensslsol.patch b/openssl/opensslsol.patch
index 5ca83a1..cd2d93a 100644
--- a/openssl/opensslsol.patch
+++ b/openssl/opensslsol.patch
@@ -1,18 +1,18 @@
---- misc/openssl-0.9.8l/Configure Mon Feb 16 09:44:22 2009
-+++ misc/build/openssl-0.9.8l/Configure Mon Mar 30 08:17:56 2009
-@@ -206,8 +206,8 @@
- "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-
+--- misc/openssl-0.9.8o/Configure Mon Nov 9 15:14:26 2009
++++ misc/build/openssl-0.9.8o/Configure Fri Mar 26 16:01:32 2010
+@@ -212,8 +212,8 @@
+ "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+
#### Solaris x86 with Sun C setups
-"solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris-x86-cc","cc:-O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris64-x86_64-cc","cc:-xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-
+
#### SPARC Solaris with GNU C setups
"solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
----- misc/openssl-0.9.8l/Makefile.shared Wed Sep 17 17:56:40 2008
-+++ misc/build/openssl-0.9.8l/Makefile.shared Mon Mar 30 08:19:42 2009
+--- misc/openssl-0.9.8o/Makefile.shared Wed Sep 17 17:56:40 2008
++++ misc/build/openssl-0.9.8o/Makefile.shared Fri Mar 26 16:04:41 2010
@@ -93,7 +93,7 @@
LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS)}"; \
LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \
@@ -20,7 +20,7 @@
- LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
+ LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \
$${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} )
-
+
LINK_SO= \
@@ -103,7 +103,7 @@
SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
@@ -31,12 +31,12 @@
$${SHAREDCMD} $${SHAREDFLAGS} \
-o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
$$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \
----- misc/openssl-0.9.8l/config Mon Feb 16 09:43:41 2009
-+++ misc/build/openssl-0.9.8l/config Mon Mar 30 08:22:05 2009
+--- misc/openssl-0.9.8o/config Tue Mar 9 18:08:24 2010
++++ misc/build/openssl-0.9.8o/config Fri Mar 26 16:07:55 2010
@@ -399,28 +399,25 @@
# this is where the translation occurs into SSLeay terms
# ---------------------------------------------------------------------------
-
+
-GCCVER=`(gcc -dumpversion) 2>/dev/null`
-if [ "$GCCVER" != "" ]; then
- # then strip off whatever prefix egcs prepends the number with...
@@ -47,16 +47,10 @@
- # major and minor version numbers.
- # peak single digit before and after first dot, e.g. 2.95.1 gives 29
- GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
--fi
--
--# Only set CC if not supplied already
--if [ -z "$CC" ]; then
--# figure out if gcc is available and if so we use it otherwise
--# we fallback to whatever cc does on the system
+if [ -z "$CC" ];then
+ GCCVER=`(gcc -dumpversion) 2>/dev/null`
- if [ "$GCCVER" != "" ]; then
- CC=gcc
++ if [ "$GCCVER" != "" ]; then
++ CC=gcc
+ # then strip off whatever prefix egcs prepends the number with...
+ # Hopefully, this will work for any future prefixes as well.
+ GCCVER=`echo $GCCVER | LC_ALL=C sed 's/^[a-zA-Z]*\-//'`
@@ -65,21 +59,31 @@
+ # major and minor version numbers.
+ # peak single digit before and after first dot, e.g. 2.95.1 gives 29
+ GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
- else
- CC=cc
- fi
++ else
++ CC=cc
++ fi
+else
+ CC=`echo $CC | sed 's/^[^ ]*\/\(..\).*/\1/'`
fi
-+
+
+-# Only set CC if not supplied already
+-if [ -z "$CC" ]; then
+-# figure out if gcc is available and if so we use it otherwise
+-# we fallback to whatever cc does on the system
+- if [ "$GCCVER" != "" ]; then
+- CC=gcc
+- else
+- CC=cc
+- fi
+-fi
GCCVER=${GCCVER:-0}
if [ "$SYSTEM" = "HP-UX" ];then
- # By default gcc is a ILP32 compiler (with long long == 64).
---- misc/openssl-0.9.8l/libcrypto_OOo_0_9_8l.map Tue Jan 27 19:52:14 2009
-+++ misc/build/openssl-0.9.8l/libcrypto_OOo_0_9_8l.map Tue Jan 27 19:51:04 2009
-@@ -1,1 +1,3295 @@
+ # By default gcc is a ILP32 compiler (with long long == 64).
+--- misc/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map Fri Mar 26 16:13:54 2010
++++ misc/build/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map Fri Mar 26 16:10:09 2010
+@@ -1,1 +1,3296 @@
-dummy
-+LIBCRYPTO_OOO_0_9_8l {
++LIBCRYPTO_OOO_0_9_8o {
+ global:
+ACCESS_DESCRIPTION_free;
+ACCESS_DESCRIPTION_it;
@@ -1398,7 +1402,7 @@
+KRB5_TKTBODY_free;
+KRB5_TKTBODY_it;
+KRB5_TKTBODY_new;
-+LIBCRYPTO_OOO_0_9_8l;
++LIBCRYPTO_OOO_0_9_8o;
+LONG_it;
+MD2;
+MD2_Final;
@@ -3374,11 +3378,12 @@
+ local:
+ *;
+};
---- misc/openssl-0.9.8l/libssl_OOo_0_9_8l.map Tue Jan 27 19:52:14 2009
-+++ misc/build/openssl-0.9.8l/libssl_OOo_0_9_8l.map Tue Jan 27 19:51:04 2009
-@@ -1,1 +1,445 @@
++
+--- misc/openssl-0.9.8o/libssl_OOo_0_9_8o.map Fri Mar 26 16:13:54 2010
++++ misc/build/openssl-0.9.8o/libssl_OOo_0_9_8o.map Fri Mar 26 16:11:27 2010
+@@ -1,1 +1,446 @@
-dummy
-+LIBSSL_OOO_0_9_8l {
++LIBSSL_OOO_0_9_8o {
+ global:
+BIO_f_ssl;
+BIO_new_buffer_ssl_connect;
@@ -3391,7 +3396,7 @@
+DTLSv1_method;
+DTLSv1_server_method;
+ERR_load_SSL_strings;
-+LIBSSL_OOO_0_9_8l;
++LIBSSL_OOO_0_9_8o;
+SSL_CIPHER_description;
+SSL_CIPHER_get_bits;
+SSL_CIPHER_get_name;
@@ -3823,3 +3828,4 @@
+ *;
+};
+
++
diff --git a/openssl/version.mk b/openssl/version.mk
index 6eb8862..613f65a 100644
--- a/openssl/version.mk
+++ b/openssl/version.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# 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
@@ -26,8 +26,8 @@
#*************************************************************************
-OPENSSL_VERSION=0.9.8g
+OPENSSL_VERSION=0.9.8o
.IF "$(OS)" == "SOLARIS"
-OPENSSL_NAME=openssl-0.9.8l
+OPENSSL_NAME=openssl-0.9.8o
.ENDIF
\ No newline at end of file
commit c8e36459cc68f933a79cebe2d72d089a6819ea55
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Mon Jun 7 10:44:47 2010 +0200
masterfix: #i10000# #i112124# build fails in configure fix
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 4b1a7de..5ef6499 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -91,6 +91,8 @@ OOO_STLPORT_LIBS = $(LIBSTLPORT)
# reference to `_rtld_global_ro at GLIBC_PRIVATE'" unless -lm is also specified:
.IF "$(OS)" == "LINUX" && "$(COM)" == "GCC" && "$(CPU)" == "I"
OOO_STLPORT_LIBS += -lm
+# #i112124# furthermore, STLPort seems to require libstdc++
+OOO_STLPORT_LIBS += -lstdc++
.END
# And later, when "checking whether the C compiler works" configure tries to
commit 61386a58cbdfc28a2027548859b2551ee45292aa
Author: tono <tono at openoffice.org>
Date: Sun Jun 6 20:54:55 2010 +0900
i#112159: MinGW port: libxmlsec 1.2.14, libxml2 2.7.6, libxslt 1.1.26
diff --git a/libxmlsec/xmlsec1-customkeymanage.patch b/libxmlsec/xmlsec1-customkeymanage.patch
index d5c771a..8bc97c4 100644
--- a/libxmlsec/xmlsec1-customkeymanage.patch
+++ b/libxmlsec/xmlsec1-customkeymanage.patch
@@ -445,7 +445,7 @@
+
--- misc/xmlsec1-1.2.14/src/mscrypto/akmngr.c 2009-09-21 14:07:19.078910929 +0200
+++ misc/build/xmlsec1-1.2.14/src/mscrypto/akmngr.c 2009-09-21 14:02:48.531281225 +0200
-@@ -1 +1,235 @@
+@@ -1 +1,236 @@
-dummy
+/**
+ * XMLSec library
@@ -459,6 +459,7 @@
+
+#include <xmlsec/xmlsec.h>
+#include <xmlsec/keys.h>
++#include <xmlsec/keysmngr.h>
+#include <xmlsec/transforms.h>
+#include <xmlsec/errors.h>
+
commit c8059ff8216eb7aea14505ac2f6283536826f8e3
Merge: 46ee649... 8b20f59...
Author: tono <tono at openoffice.org>
Date: Sat Jun 5 22:39:55 2010 +0900
mingwport30: merge with DEV300 m80
diff --cc libxmlsec/makefile.mk
index f767155,1f0e597..9b7ea1b
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@@ -96,7 -97,7 +97,7 @@@ xmlsec_LIBS+=-lstdc++_
.ENDIF
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure
- CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozilla_ver=1.7.5 --enable-mscrypto --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xmlsec_CC)" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="$(xmlsec_LIBS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump"
-CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozilla_ver=1.7.5 --enable-mscrypto --disable-crypto-dl --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xmlsec_CC)" CFLAGS="-D_MT" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="$(xmlsec_LIBS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump"
++CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozilla_ver=1.7.5 --enable-mscrypto --disable-crypto-dl --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xmlsec_CC)" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="$(xmlsec_LIBS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump"
.IF "$(SYSTEM_MOZILLA)" != "YES"
CONFIGURE_FLAGS+=--enable-pkgconfig=no
diff --cc libxmlsec/xmlsec1-mingw32.patch
index 78a7f8f,3aaf19f..fd71ddf
--- a/libxmlsec/xmlsec1-mingw32.patch
+++ b/libxmlsec/xmlsec1-mingw32.patch
@@@ -272,8 -221,334 +221,8 @@@
*.$libext)
if test "$pass" = conv; then
deplibs="$deplib $deplibs"
- --- misc/xmlsec1-1.2.12/src/nss/keywrapers.c 2009-09-29 15:55:33.430875248 +0200
- +++ misc/build/xmlsec1-1.2.12/src/nss/keywrapers.c 2009-09-29 15:49:39.749963247 +0200
---- misc/xmlsec1-1.2.14/src/mscrypto/certkeys.c 2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/src/mscrypto/certkeys.c 2009-09-29 15:49:39.643186151 +0200
-@@ -947,7 +947,11 @@
- static void xmlSecMSCryptoKeyDataRsaDebugDump(xmlSecKeyDataPtr data, FILE* output);
- static void xmlSecMSCryptoKeyDataRsaDebugXmlDump(xmlSecKeyDataPtr data, FILE* output);
-
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataKlass xmlSecMSCryptoKeyDataRsaKlass = {
-+#else
- static xmlSecKeyDataKlass xmlSecMSCryptoKeyDataRsaKlass = {
-+#endif
- sizeof(xmlSecKeyDataKlass),
- xmlSecMSCryptoKeyDataSize,
-
-@@ -1658,7 +1662,11 @@
- static void xmlSecMSCryptoKeyDataDsaDebugXmlDump(xmlSecKeyDataPtr data,
- FILE* output);
-
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataKlass xmlSecMSCryptoKeyDataDsaKlass = {
-+#else
- static xmlSecKeyDataKlass xmlSecMSCryptoKeyDataDsaKlass = {
-+#endif
- sizeof(xmlSecKeyDataKlass),
- xmlSecMSCryptoKeyDataSize,
-
---- misc/xmlsec1-1.2.14/src/mscrypto/ciphers.c 2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/src/mscrypto/ciphers.c 2009-09-29 15:49:39.652528324 +0200
-@@ -802,7 +802,11 @@
- * AES CBC cipher transforms
- *
- ********************************************************************/
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecMSCryptoAes128CbcKlass = {
-+#else
- static xmlSecTransformKlass xmlSecMSCryptoAes128CbcKlass = {
-+#endif
- /* klass/object sizes */
- sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */
- xmlSecMSCryptoBlockCipherSize, /* xmlSecSize objSize */
-@@ -841,7 +845,11 @@
- return(&xmlSecMSCryptoAes128CbcKlass);
- }
-
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecMSCryptoAes192CbcKlass = {
-+#else
- static xmlSecTransformKlass xmlSecMSCryptoAes192CbcKlass = {
-+#endif
- /* klass/object sizes */
- sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */
- xmlSecMSCryptoBlockCipherSize, /* xmlSecSize objSize */
-@@ -880,7 +888,11 @@
- return(&xmlSecMSCryptoAes192CbcKlass);
- }
-
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecMSCryptoAes256CbcKlass = {
-+#else
- static xmlSecTransformKlass xmlSecMSCryptoAes256CbcKlass = {
-+#endif
- /* klass/object sizes */
- sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */
- xmlSecMSCryptoBlockCipherSize, /* xmlSecSize objSize */
-@@ -923,7 +935,11 @@
-
-
- #ifndef XMLSEC_NO_DES
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecMSCryptoDes3CbcKlass = {
-+#else
- static xmlSecTransformKlass xmlSecMSCryptoDes3CbcKlass = {
-+#endif
- /* klass/object sizes */
- sizeof(xmlSecTransformKlass), /* size_t klassSize */
- xmlSecMSCryptoBlockCipherSize, /* size_t objSize */
---- misc/xmlsec1-1.2.14/src/mscrypto/digests.c 2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/src/mscrypto/digests.c 2009-09-29 15:49:39.660554904 +0200
-@@ -329,7 +329,11 @@
- * SHA1
- *
- *****************************************************************************/
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecMSCryptoSha1Klass = {
-+#else
- static xmlSecTransformKlass xmlSecMSCryptoSha1Klass = {
-+#endif
- /* klass/object sizes */
- sizeof(xmlSecTransformKlass), /* size_t klassSize */
- xmlSecMSCryptoDigestSize, /* size_t objSize */
---- misc/xmlsec1-1.2.14/src/mscrypto/keysstore.c 2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/src/mscrypto/keysstore.c 2009-09-29 15:49:39.667289994 +0200
-@@ -66,7 +66,11 @@
- const xmlChar* name,
- xmlSecKeyInfoCtxPtr keyInfoCtx);
-
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyStoreKlass xmlSecMSCryptoKeysStoreKlass = {
-+#else
- static xmlSecKeyStoreKlass xmlSecMSCryptoKeysStoreKlass = {
-+#endif
- sizeof(xmlSecKeyStoreKlass),
- xmlSecMSCryptoKeysStoreSize,
-
---- misc/xmlsec1-1.2.14/src/mscrypto/kt_rsa.c 2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/src/mscrypto/kt_rsa.c 2009-09-29 15:49:39.674284044 +0200
-@@ -66,7 +66,11 @@
- static int xmlSecMSCryptoRsaPkcs1Process (xmlSecTransformPtr transform,
- xmlSecTransformCtxPtr transformCtx);
-
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecMSCryptoRsaPkcs1Klass = {
-+#else
- static xmlSecTransformKlass xmlSecMSCryptoRsaPkcs1Klass = {
-+#endif
- /* klass/object sizes */
- sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */
- xmlSecMSCryptoRsaPkcs1Size, /* xmlSecSize objSize */
---- misc/xmlsec1-1.2.14/src/mscrypto/signatures.c 2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/src/mscrypto/signatures.c 2009-09-29 15:49:39.682580497 +0200
-@@ -524,7 +524,11 @@
- * RSA-SHA1 signature transform
- *
- ***************************************************************************/
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecMSCryptoRsaSha1Klass = {
-+#else
- static xmlSecTransformKlass xmlSecMSCryptoRsaSha1Klass = {
-+#endif
- /* klass/object sizes */
- sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */
- xmlSecMSCryptoSignatureSize, /* xmlSecSize objSize */
-@@ -572,7 +576,11 @@
- *
- ***************************************************************************/
-
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecTransformKlass xmlSecMSCryptoDsaSha1Klass = {
-+#else
- static xmlSecTransformKlass xmlSecMSCryptoDsaSha1Klass = {
-+#endif
- /* klass/object sizes */
- sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */
- xmlSecMSCryptoSignatureSize, /* xmlSecSize objSize */
---- misc/xmlsec1-1.2.14/src/mscrypto/symkeys.c 2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/src/mscrypto/symkeys.c 2009-09-29 15:49:39.691081347 +0200
-@@ -72,7 +72,11 @@
- * <xmlsec:AESKeyValue> processing
- *
- *************************************************************************/
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataKlass xmlSecMSCryptoKeyDataAesKlass = {
-+#else
- static xmlSecKeyDataKlass xmlSecMSCryptoKeyDataAesKlass = {
-+#endif
- sizeof(xmlSecKeyDataKlass),
- xmlSecKeyDataBinarySize,
-
-@@ -153,7 +157,11 @@
- * <xmlsec:DESKeyValue> processing
- *
- *************************************************************************/
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataKlass xmlSecMSCryptoKeyDataDesKlass = {
-+#else
- static xmlSecKeyDataKlass xmlSecMSCryptoKeyDataDesKlass = {
-+#endif
- sizeof(xmlSecKeyDataKlass),
- xmlSecKeyDataBinarySize,
-
---- misc/xmlsec1-1.2.14/src/mscrypto/x509.c 2009-06-25 22:53:18.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/src/mscrypto/x509.c 2009-09-29 15:49:39.699931741 +0200
-@@ -243,7 +243,11 @@
-
-
-
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataKlass xmlSecMSCryptoKeyDataX509Klass = {
-+#else
- static xmlSecKeyDataKlass xmlSecMSCryptoKeyDataX509Klass = {
-+#endif
- sizeof(xmlSecKeyDataKlass),
- xmlSecMSCryptoX509DataSize,
-
-@@ -2159,7 +2163,11 @@
- xmlSecSize bufSize,
- xmlSecKeyInfoCtxPtr keyInfoCtx);
-
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
-+static struct _xmlSecKeyDataKlass xmlSecMSCryptoKeyDataRawX509CertKlass = {
-+#else
- static xmlSecKeyDataKlass xmlSecMSCryptoKeyDataRawX509CertKlass = {
-+#endif
- sizeof(xmlSecKeyDataKlass),
- sizeof(xmlSecKeyData),
-
---- misc/xmlsec1-1.2.14/src/mscrypto/x509vfy.c 2009-09-29 15:55:33.502779834 +0200
-+++ misc/build/xmlsec1-1.2.14/src/mscrypto/x509vfy.c 2009-09-29 15:49:39.708831697 +0200
-@@ -67,7 +67,11 @@
- static int xmlSecMSCryptoX509StoreInitialize (xmlSecKeyDataStorePtr store);
- static void xmlSecMSCryptoX509StoreFinalize (xmlSecKeyDataStorePtr store);
-
-+#ifdef __MINGW32__ // for runtime-pseudo-reloc
... etc. - the rest is truncated
More information about the ooo-build-commit
mailing list