Attachment #77070 for issue #118662

View | Details | Raw Unified | Return to issue 118662
Collapse All | Expand All

Lines 1-348 Link Here

(-)a/main/berkeleydb/db-4.7.25-mingw.patch

Lines 1-1048 Link Here

(-)a/main/berkeleydb/db-4.7.25.patch




#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# 
# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License version 3
# only, as published by the Free Software Foundation.
#
# OpenOffice.org is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU Lesser General Public License version 3 for more details
# (a copy is included in the LICENSE file that accompanied this code).
#
# You should have received a copy of the GNU Lesser General Public License
# version 3 along with OpenOffice.org.  If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
#*************************************************************************

PRJ=.

PRJNAME=so_berkeleydb
TARGET=so_berkeleydb

# --- Settings -----------------------------------------------------

.INCLUDE :	settings.mk

.IF "$(SYSTEM_DB)" == "YES"
all:
	@echo "An already available installation of db should exist on your system."
	@echo "Therefore the version provided here does not need to be built in addition."
.ENDIF

# --- Files --------------------------------------------------------

TARFILE_NAME=db-4.7.25.NC-custom
TARFILE_MD5=d70951c80dabecc2892c919ff5d07172
TARFILE_ROOTDIR=db-4.7.25.NC

ADDITIONAL_FILES= \
    makefile.mk btree$/makefile.mk clib$/makefile.mk common$/makefile.mk \
    cxx$/makefile.mk db$/makefile.mk dbm$/makefile.mk dbreg$/makefile.mk \
    env$/makefile.mk fileops$/makefile.mk hash$/makefile.mk hmac$/makefile.mk \
    hsearch$/makefile.mk lock$/makefile.mk log$/makefile.mk mp$/makefile.mk \
    mutex$/makefile.mk os$/makefile.mk os_windows$/makefile.mk \
    qam$/makefile.mk rep$/makefile.mk repmgr$/makefile.mk \
    sequence$/makefile.mk txn$/makefile.mk xa$/makefile.mk \
    db_4_7_gcc4.map

# not needed for win32. comment out when causing problems...
.IF "$(GUI)$(COM)"=="WNTGCC"
PATCH_FILES=db-4.7.25-mingw.patch
.ELSE
PATCH_FILES=db-4.7.25.patch
.ENDIF

# clean compiler flags
CFLAGS:=
CXXFLAGS:=

# disable aliasing for all GCC platforms, at least GCC 4.x needs it if
# optimization level >= 2
.IF "$(COM)"=="GCC"
CFLAGS:=-fno-strict-aliasing $(EXTRA_CFLAGS)
CXXFLAGS:=-fno-strict-aliasing $(EXTRA_CFLAGS)
.ENDIF

.IF "$(GUI)"=="UNX"
.IF "$(OS)$(COM)"=="LINUXGCC"
LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN'
.EXPORT: LDFLAGS
#The current dir when linking is unxlngi6.pro/misc/build/db-4.2.52.NC/out
# the map file is in  unxlngi6.pro/misc/build/db-4.2.52.NC
LDFLAGSVERSION:= -Wl,--version-script=../db_4_7_gcc4.map
.EXPORT: LDFLAGSVERSION
.ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
.IF "$(OS)$(COM)"=="SOLARISC52"
#.IF "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)"
#CC:=$(COMPATH)$/bin$/cc
#CXX:=$(COMPATH)$/bin$/CC
#.ENDIF          # "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)"
LDFLAGS:=$(ARCH_FLAGS) -R\''$$$$ORIGIN'\'
.EXPORT: LDFLAGS
.ENDIF                  # "$(OS)$(COM)"=="SOLARISC52"

CONFIGURE_DIR=out
#relative to CONFIGURE_DIR
CONFIGURE_ACTION= \
	..$/dist$/configure
CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185 CC='$(CC) $(SOLARLIB)'
.IF "$(OS)"==FREEBSD && "$(COM)$(CPU)"=="GCCX"
CONFIGURE_FLAGS+=--with-mutex=x86/gcc-assembly
.ENDIF
.IF "$(OS)"=="MACOSX"
CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
.ENDIF
# just pass ARCH_FLAGS to native build
CFLAGS+:=$(ARCH_FLAGS)
CXXFLAGS+:=$(ARCH_FLAGS)
.EXPORT : CFLAGS CXXFLAGS

BUILD_DIR=$(CONFIGURE_DIR)
BUILD_DIR_OUT=$(CONFIGURE_DIR)
BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)

OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST)
OUT2INC= \
	$(BUILD_DIR)$/db.h

.ENDIF			# "$(GUI)"=="UNX"

.IF "$(GUI)"=="WNT"
.IF "$(COM)"=="GCC"
CONFIGURE_DIR=out
#relative to CONFIGURE_DIR
# TODO needs clean up
CFLAGS+=-nostdinc
db_CC=$(CC) -mthreads
db_CXX=$(CXX) -mthreads
.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
db_CC+=-shared-libgcc
db_CXX+=-shared-libgcc
.ENDIF
db_LDFLAGS=-no-undefined -L$(SOLARVER)/$(INPATH)/lib -L$(SOLARVER)/$(INPATH)/bin
.IF "$(USE_MINGW)"=="cygwin"
db_LDFLAGS+=-L$(COMPATH)/lib/mingw -L$(COMPATH)/lib/w32api
.ENDIF
db_LDFLAGS+=-L$(COMPATH)/lib -L$(MINGW_CLIB_DIR)
db_LIBS=
.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
CFLAGS+=-D_GLIBCXX_DLL
db_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
.ENDIF
db_LIBXSO_LIBS=$(LIBSTLPORT) $(db_LIBS)
.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
db_LIBXSO_LIBS+=-lgcc_s
.ENDIF
CONFIGURE_ACTION=..$/dist$/configure
CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --build=i586-pc-mingw32 --host=i586-pc-mingw32 --enable-mingw CC="$(db_CC)" CXX="$(db_CXX)" LN_S=ln NM="$(WRAPCMD) nm" OBJDUMP="$(WRAPCMD) objdump" JAVA="$(WRAPCMD) -env java" JAVAC="$(WRAPCMD) -env javac" CFLAGS="$(CFLAGS)" CPPFLAGS="$(INCLUDE)" LDFLAGS="$(db_LDFLAGS)" LIBS="$(db_LIBS)" LIBSO_LIBS="$(db_LIBS)" LIBJSO_LIBS="$(db_LIBS)" LIBXSO_LIBS="$(db_LIBXSO_LIBS)"

BUILD_DIR=$(CONFIGURE_DIR)
BUILD_DIR_OUT=$(CONFIGURE_DIR)
BUILD_ACTION=make

OUT2LIB=$(BUILD_DIR)$/.libs$/libdb47.dll.a
OUT2BIN=$(BUILD_DIR)$/.libs$/libdb47.dll

OUT2INC= \
	$(BUILD_DIR)$/db.h
.IF "$(GUI)$(COM)"=="WNTGCC"
.EXPORT : PWD
.ENDIF

.ELSE
# make use of stlport headerfiles
EXT_USE_STLPORT=TRUE

BUILD_DIR=
BUILD_ACTION=dmake

BUILD_DIR_OUT=build_windows
#OUT2LIB= \
#	$(BUILD_DIR_OUT)$/Release$/libdb42.lib
#OUT2BIN=$(BUILD_DIR_OUT)$/Release$/libdb42.dll
OUT2INC= \
	$(BUILD_DIR_OUT)$/db.h
.ENDIF
.ENDIF			# "$(GUI)"=="WNT"

# --- Targets ------------------------------------------------------

.INCLUDE : set_ext.mk
.INCLUDE :	target.mk
.INCLUDE :	tg_ext.mk



Lines 1-3 Link Here

(-)a/main/berkeleydb/prj/build.lst (-3 lines)
1	db berkeleydb : external stlport NULL
2	db berkeleydb nmake - u as_mkout NULL
3	db berkeleydb nmake - w,vc7 as_mkout NULL




mkdir: %_DEST%\inc%_EXT%\berkeleydb

..\%__SRC%\inc\db.h %_DEST%\inc%_EXT%\berkeleydb\db.h

..\%__SRC%\lib\libdb47.lib %_DEST%\lib%_EXT%\libdb47.lib

..\%__SRC%\lib\libdb-4.7.so %_DEST%\lib%_EXT%\libdb-4.7.so

..\%__SRC%\lib\libdb-4.7.dylib %_DEST%\lib%_EXT%\libdb-4.7.dylib

..\%__SRC%\lib\libdb47.dll.a %_DEST%\lib%_EXT%\libdb-4.7.a

..\%__SRC%\bin\libdb47.dll %_DEST%\bin%_EXT%\libdb47.dll






AC_ARG_WITH(system-poppler,
[  --with-system-poppler   Use poppler already on system
],,)
AC_ARG_WITH(system-db,
[  --with-system-db        Use berkeley db already on system
],,)
AC_ARG_WITH(system-lucene,
[  --with-system-lucene    Use lucene already on system
],,)

AC_SUBST(HOME)

dnl ===================================================================
dnl Check for system berkley db
dnl ===================================================================
AC_MSG_CHECKING([which db to use])
if test -n "$with_system_db" -o -n "$with_system_libs" && \
	test "$with_system_db" != "no"; then
    SYSTEM_DB=YES
    AC_MSG_RESULT([external])
    AC_CHECK_HEADER(db.h, [ DB_INCLUDES=/usr/include ],
        [
             CFLAGS=-I/usr/include/db4
             AC_CHECK_HEADER(db4/db.h,
             [ DB_INCLUDES=/usr/include/db4 ],
             [ AC_MSG_ERROR(no. install the db4 libraries) ], []+             )
        ], []
    )
    AC_MSG_CHECKING([whether db is at least 4.1])
    AC_TRY_RUN([
#include <db.h>

int main(int argc, char **argv) {
       if(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)) return 0;
       else return 1;
}
    ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no. you need at least db 4.1])])
    AC_HAVE_LIBRARY(db, [],
      [AC_MSG_ERROR([db not installed or functional])], [])
    SCPDEFS="$SCPDEFS -DSYSTEM_DB"
else
    AC_MSG_RESULT([internal])
    SYSTEM_DB=NO
    BUILD_TYPE="$BUILD_TYPE BERKELEYDB"
fi
AC_SUBST(SYSTEM_DB)
AC_SUBST(DB_VERSION)
AC_SUBST(DB_INCLUDES)
AC_SUBST(DB_JAR)

dnl ===================================================================
dnl Check for system lucene
dnl ===================================================================
AC_MSG_CHECKING([which lucene to use])

Lines 8-15 my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANA Link Here

(-)a/main/helpcontent2/settings.pmk (-4 lines)
8	my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-analyzers-2.3.jar	8	my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-analyzers-2.3.jar
9	.ENDIF	9	.ENDIF
10		10
11	.IF "$(SYSTEM_DB)" != "YES"
12	JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
13	.ENDIF
14
15	aux_alllangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j $i $(NULL))))	11	aux_alllangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j $i $(NULL))))

Lines 30-39 LINKALLADDEDDEPS=$(foreach,i,$(aux_alllangiso) $(subst,LANGUAGE,$i $(LINKADDEDDP Link Here

(-)a/main/helpcontent2/util/target.pmk (-4 lines)
30		30
31	ALLTAR : $(LINKALLTARGETS)	31	ALLTAR : $(LINKALLTARGETS)
32		32
33	.IF "$(SYSTEM_DB)" != "YES"
34	JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
35	.ENDIF
36
37	XSL_DIR*:=$(SOLARBINDIR)	33	XSL_DIR*:=$(SOLARBINDIR)
38		34
39	$(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag	35	$(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag

Lines 40-47 c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz Link Here

(-)a/main/ooo.lst (-4 lines)
40	ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz	40	ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz
41	377a60170e5185eb63d3ed2fae98e621-README_silgraphite-2.3.1.txt	41	377a60170e5185eb63d3ed2fae98e621-README_silgraphite-2.3.1.txt
42	d35724900f6a4105550293686688bbb3-silgraphite-2.3.1.tar.gz	42	d35724900f6a4105550293686688bbb3-silgraphite-2.3.1.tar.gz
43	d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz
44	e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt
45	e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2	43	e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2
46	e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz	44	e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz
47	ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz	45	ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
Lines 61-66 c735eab2d659a96e5a594c9e8541ad63-zlib-1.2.5.tar.gz Link Here
61		59
62	# Temporary	60	# Temporary
63	http://hg.services.openoffice.org/binaries/	61	http://hg.services.openoffice.org/binaries/
64	d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz
65	e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt
66	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip	62	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip

Lines 159-165 jvmfwk3.dll 0x0000000062330000 0x00020000 Link Here

(-)a/main/postprocess/rebase/coffbase.txt (-1 lines)
159	ldapbe2.uno.dll 0x0000000062300000 0x00020000	159	ldapbe2.uno.dll 0x0000000062300000 0x00020000
160	legacy_binfiltersmi.dll 0x00000000622d0000 0x00020000	160	legacy_binfiltersmi.dll 0x00000000622d0000 0x00020000
161	libcurl.dll 0x0000000062290000 0x00030000	161	libcurl.dll 0x0000000062290000 0x00030000
162	libdb47.dll 0x00000000621f0000 0x00090000
163	libeay32.dll 0x00000000620d0000 0x00110000	162	libeay32.dll 0x00000000620d0000 0x00110000
164	libexslt.dll 0x00000000620a0000 0x00020000	163	libexslt.dll 0x00000000620a0000 0x00020000
165	librdf.dll 0x0000000062070000 0x00020000	164	librdf.dll 0x0000000062070000 0x00020000





#endif

#ifndef SYSTEM_DB

File gid_File_Lib_Db
    TXT_FILE_BODY;
    Styles = (PACKED);
    Dir = SCP2_OOO_BIN_DIR;
  #ifdef UNX
    Name = STRING(CONCAT2(libdb-4.7,UNXSUFFIX));
  #else
    Name = "libdb47.dll";
  #endif
End

#endif

#ifdef UNX
#ifdef ENABLE_GTK
#ifdef ENABLE_SYSTRAY_GTK

Lines 120-129 SCPDEFS+=-DSYSTEM_LIBXSLT Link Here

(-)a/main/scp2/source/ooo/makefile.mk (-4 lines)
120	SCPDEFS+=-DLIBXSLT_MAJOR=$(LIBXSLT_MAJOR)	120	SCPDEFS+=-DLIBXSLT_MAJOR=$(LIBXSLT_MAJOR)
121	.ENDIF	121	.ENDIF
122		122
123	.IF "$(SYSTEM_DB)" == "YES"
124	SCPDEFS+=-DSYSTEM_DB
125	.ENDIF
126
127	.IF "$(USE_SYSTEM_STL)" == "YES" \|\| "$(STLPORT4)" != "NO_STLPORT4"	123	.IF "$(USE_SYSTEM_STL)" == "YES" \|\| "$(STLPORT4)" != "NO_STLPORT4"
128	SCPDEFS+=-DUSE_SYSTEM_STL	124	SCPDEFS+=-DUSE_SYSTEM_STL
129	.ENDIF	125	.ENDIF

Lines 1929-1937 ToFile( "USE_FT_EMBOLDEN", "@USE_FT_EMBOLDEN@", "e" ); Link Here

(-)a/main/set_soenv.in (-3 lines)
1929	ToFile( "LIBXML_CFLAGS", "@LIBXML_CFLAGS@", "e" );	1929	ToFile( "LIBXML_CFLAGS", "@LIBXML_CFLAGS@", "e" );
1930	ToFile( "LIBXML_LIBS", "@LIBXML_LIBS@", "e" );	1930	ToFile( "LIBXML_LIBS", "@LIBXML_LIBS@", "e" );
1931	ToFile( "SYSTEM_EXPAT", "@SYSTEM_EXPAT@", "e" );	1931	ToFile( "SYSTEM_EXPAT", "@SYSTEM_EXPAT@", "e" );
1932	ToFile( "SYSTEM_DB", "@SYSTEM_DB@", "e" );
1933	ToFile( "DB_VERSION", "@DB_VERSION@", "e" );
1934	ToFile( "DB_INCLUDES", "@DB_INCLUDES@", "e" );
1935	ToFile( "ENABLE_MYSQLC", "@ENABLE_MYSQLC@", "e" );	1932	ToFile( "ENABLE_MYSQLC", "@ENABLE_MYSQLC@", "e" );
1936	ToFile( "SYSTEM_MYSQL", "@SYSTEM_MYSQL@", "e" );	1933	ToFile( "SYSTEM_MYSQL", "@SYSTEM_MYSQL@", "e" );
1937	ToFile( "SYSTEM_MYSQL_CPPCONN","@SYSTEM_MYSQL_CPPCONN@","e" );	1934	ToFile( "SYSTEM_MYSQL_CPPCONN","@SYSTEM_MYSQL_CPPCONN@","e" );




my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-analyzers-2.3.jar
.ENDIF
 
.IF "$(SYSTEM_DB)" != "YES"
JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
.ENDIF 

#aux_alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j  $i $(NULL))))
aux_alllangiso*:=$(alllangiso)



ALLTAR : $(HELPLINKALLTARGETS)

.IF "$(SYSTEM_DB)" != "YES"
JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
.ENDIF

XSL_DIR*:=$(SOLARBINDIR)
XHPLINKSRC*:=$(XHPDEST)
STY_SWITCH:= -sty $(XSL_DIR)/embed.xsl




.ELSE
NEON3RDLIB=-lneon
.ENDIF
.IF "$(SYSTEM_DB)" == "YES"
BERKELEYLIB=-ldb
.ELSE
BERKELEYLIB=-ldb-4.7
.ENDIF
CURLLIB=-lcurl
SFX2LIB=-lsfx$(DLLPOSTFIX)
SFXLIB=-lsfx$(DLLPOSTFIX)

ZLIB3RDLIB=zlib.lib
JPEG3RDLIB=jpeglib.lib
NEON3RDLIB=ineon.lib
BERKELEYLIB=libdb47.lib
CURLLIB=libcurl.lib
CHAOSLIB=ichaos.lib
UUILIB=iuui.lib

Lines 224-230 Link Here

(-)a/main/toolkit/src2xml/include.lst (-1 lines)
224	../../regexp/unxlngi6.pro/inc	224	../../regexp/unxlngi6.pro/inc
225	../../ucbhelper/inc	225	../../ucbhelper/inc
226	../../ucbhelper/unxlngi6.pro/inc	226	../../ucbhelper/unxlngi6.pro/inc
227	../../berkeleydb/unxlngi6.pro/inc
228	../../UnoControls/inc	227	../../UnoControls/inc
229	../../UnoControls/source/inc	228	../../UnoControls/source/inc
230	../../UnoControls/unxlngi6.pro/inc	229	../../UnoControls/unxlngi6.pro/inc

Return to issue 118662

Lines 370-378 AC_ARG_WITH(system-icu, Link Here

(-)a/main/configure.in (-41 lines)
370	AC_ARG_WITH(system-poppler,	370	AC_ARG_WITH(system-poppler,
371	[ --with-system-poppler Use poppler already on system	371	[ --with-system-poppler Use poppler already on system
372	],,)	372	],,)
373	AC_ARG_WITH(system-db,
374	[ --with-system-db Use berkeley db already on system
375	],,)
376	AC_ARG_WITH(system-lucene,	373	AC_ARG_WITH(system-lucene,
377	[ --with-system-lucene Use lucene already on system	374	[ --with-system-lucene Use lucene already on system
378	],,)	375	],,)
Lines 3895-3938 HOME=`echo $HOME \| sed 's:\\\\:/:g'` Link Here
3895	AC_SUBST(HOME)	3892	AC_SUBST(HOME)
3896		3893
3897	dnl ===================================================================	3894	dnl ===================================================================
3898	dnl Check for system berkley db
3899	dnl ===================================================================
3900	AC_MSG_CHECKING([which db to use])
3901	if test -n "$with_system_db" -o -n "$with_system_libs" && \
3902	test "$with_system_db" != "no"; then
3903	SYSTEM_DB=YES
3904	AC_MSG_RESULT([external])
3905	AC_CHECK_HEADER(db.h, [ DB_INCLUDES=/usr/include ],
3906	[
3907	CFLAGS=-I/usr/include/db4
3908	AC_CHECK_HEADER(db4/db.h,
3909	[ DB_INCLUDES=/usr/include/db4 ],
3910	[ AC_MSG_ERROR(no. install the db4 libraries) ], []+ )
3911	], []
3912	)
3913	AC_MSG_CHECKING([whether db is at least 4.1])
3914	AC_TRY_RUN([
3915	#include <db.h>
3916
3917	int main(int argc, char **argv) {
3918	if(DB_VERSION_MAJOR > 4 \|\| (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)) return 0;
3919	else return 1;
3920	}
3921	], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no. you need at least db 4.1])])
3922	AC_HAVE_LIBRARY(db, [],
3923	[AC_MSG_ERROR([db not installed or functional])], [])
3924	SCPDEFS="$SCPDEFS -DSYSTEM_DB"
3925	else
3926	AC_MSG_RESULT([internal])
3927	SYSTEM_DB=NO
3928	BUILD_TYPE="$BUILD_TYPE BERKELEYDB"
3929	fi
3930	AC_SUBST(SYSTEM_DB)
3931	AC_SUBST(DB_VERSION)
3932	AC_SUBST(DB_INCLUDES)
3933	AC_SUBST(DB_JAR)
3934
3935	dnl ===================================================================
3936	dnl Check for system lucene	3895	dnl Check for system lucene
3937	dnl ===================================================================	3896	dnl ===================================================================
3938	AC_MSG_CHECKING([which lucene to use])	3897	AC_MSG_CHECKING([which lucene to use])

Lines 1-185 Link Here

(-)a/main/berkeleydb/makefile.mk (-185 lines)
1	#*************************************************************************
2	#
3	# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	#
5	# Copyright 2000, 2010 Oracle and/or its affiliates.
6	#
7	# OpenOffice.org - a multi-platform office productivity suite
8	#
9	# This file is part of OpenOffice.org.
10	#
11	# OpenOffice.org is free software: you can redistribute it and/or modify
12	# it under the terms of the GNU Lesser General Public License version 3
13	# only, as published by the Free Software Foundation.
14	#
15	# OpenOffice.org is distributed in the hope that it will be useful,
16	# but WITHOUT ANY WARRANTY; without even the implied warranty of
17	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18	# GNU Lesser General Public License version 3 for more details
19	# (a copy is included in the LICENSE file that accompanied this code).
20	#
21	# You should have received a copy of the GNU Lesser General Public License
22	# version 3 along with OpenOffice.org. If not, see
23	# <http://www.openoffice.org/license.html>
24	# for a copy of the LGPLv3 License.
25	#
26	#*************************************************************************
27
28	PRJ=.
29
30	PRJNAME=so_berkeleydb
31	TARGET=so_berkeleydb
32
33	# --- Settings -----------------------------------------------------
34
35	.INCLUDE : settings.mk
36
37	.IF "$(SYSTEM_DB)" == "YES"
38	all:
39	@echo "An already available installation of db should exist on your system."
40	@echo "Therefore the version provided here does not need to be built in addition."
41	.ENDIF
42
43	# --- Files --------------------------------------------------------
44
45	TARFILE_NAME=db-4.7.25.NC-custom
46	TARFILE_MD5=d70951c80dabecc2892c919ff5d07172
47	TARFILE_ROOTDIR=db-4.7.25.NC
48
49	ADDITIONAL_FILES= \
50	makefile.mk btree$/makefile.mk clib$/makefile.mk common$/makefile.mk \
51	cxx$/makefile.mk db$/makefile.mk dbm$/makefile.mk dbreg$/makefile.mk \
52	env$/makefile.mk fileops$/makefile.mk hash$/makefile.mk hmac$/makefile.mk \
53	hsearch$/makefile.mk lock$/makefile.mk log$/makefile.mk mp$/makefile.mk \
54	mutex$/makefile.mk os$/makefile.mk os_windows$/makefile.mk \
55	qam$/makefile.mk rep$/makefile.mk repmgr$/makefile.mk \
56	sequence$/makefile.mk txn$/makefile.mk xa$/makefile.mk \
57	db_4_7_gcc4.map
58
59	# not needed for win32. comment out when causing problems...
60	.IF "$(GUI)$(COM)"=="WNTGCC"
61	PATCH_FILES=db-4.7.25-mingw.patch
62	.ELSE
63	PATCH_FILES=db-4.7.25.patch
64	.ENDIF
65
66	# clean compiler flags
67	CFLAGS:=
68	CXXFLAGS:=
69
70	# disable aliasing for all GCC platforms, at least GCC 4.x needs it if
71	# optimization level >= 2
72	.IF "$(COM)"=="GCC"
73	CFLAGS:=-fno-strict-aliasing $(EXTRA_CFLAGS)
74	CXXFLAGS:=-fno-strict-aliasing $(EXTRA_CFLAGS)
75	.ENDIF
76
77	.IF "$(GUI)"=="UNX"
78	.IF "$(OS)$(COM)"=="LINUXGCC"
79	LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN'
80	.EXPORT: LDFLAGS
81	#The current dir when linking is unxlngi6.pro/misc/build/db-4.2.52.NC/out
82	# the map file is in unxlngi6.pro/misc/build/db-4.2.52.NC
83	LDFLAGSVERSION:= -Wl,--version-script=../db_4_7_gcc4.map
84	.EXPORT: LDFLAGSVERSION
85	.ENDIF # "$(OS)$(COM)"=="LINUXGCC"
86	.IF "$(OS)$(COM)"=="SOLARISC52"
87	#.IF "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)"
88	#CC:=$(COMPATH)$/bin$/cc
89	#CXX:=$(COMPATH)$/bin$/CC
90	#.ENDIF # "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)"
91	LDFLAGS:=$(ARCH_FLAGS) -R\''$$$$ORIGIN'\'
92	.EXPORT: LDFLAGS
93	.ENDIF # "$(OS)$(COM)"=="SOLARISC52"
94
95	CONFIGURE_DIR=out
96	#relative to CONFIGURE_DIR
97	CONFIGURE_ACTION= \
98	..$/dist$/configure
99	CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185 CC='$(CC) $(SOLARLIB)'
100	.IF "$(OS)"==FREEBSD && "$(COM)$(CPU)"=="GCCX"
101	CONFIGURE_FLAGS+=--with-mutex=x86/gcc-assembly
102	.ENDIF
103	.IF "$(OS)"=="MACOSX"
104	CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
105	.ENDIF
106	# just pass ARCH_FLAGS to native build
107	CFLAGS+:=$(ARCH_FLAGS)
108	CXXFLAGS+:=$(ARCH_FLAGS)
109	.EXPORT : CFLAGS CXXFLAGS
110
111	BUILD_DIR=$(CONFIGURE_DIR)
112	BUILD_DIR_OUT=$(CONFIGURE_DIR)
113	BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
114
115	OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST)
116	OUT2INC= \
117	$(BUILD_DIR)$/db.h
118
119	.ENDIF # "$(GUI)"=="UNX"
120
121	.IF "$(GUI)"=="WNT"
122	.IF "$(COM)"=="GCC"
123	CONFIGURE_DIR=out
124	#relative to CONFIGURE_DIR
125	# TODO needs clean up
126	CFLAGS+=-nostdinc
127	db_CC=$(CC) -mthreads
128	db_CXX=$(CXX) -mthreads
129	.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
130	db_CC+=-shared-libgcc
131	db_CXX+=-shared-libgcc
132	.ENDIF
133	db_LDFLAGS=-no-undefined -L$(SOLARVER)/$(INPATH)/lib -L$(SOLARVER)/$(INPATH)/bin
134	.IF "$(USE_MINGW)"=="cygwin"
135	db_LDFLAGS+=-L$(COMPATH)/lib/mingw -L$(COMPATH)/lib/w32api
136	.ENDIF
137	db_LDFLAGS+=-L$(COMPATH)/lib -L$(MINGW_CLIB_DIR)
138	db_LIBS=
139	.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
140	CFLAGS+=-D_GLIBCXX_DLL
141	db_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
142	.ENDIF
143	db_LIBXSO_LIBS=$(LIBSTLPORT) $(db_LIBS)
144	.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
145	db_LIBXSO_LIBS+=-lgcc_s
146	.ENDIF
147	CONFIGURE_ACTION=..$/dist$/configure
148	CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --build=i586-pc-mingw32 --host=i586-pc-mingw32 --enable-mingw CC="$(db_CC)" CXX="$(db_CXX)" LN_S=ln NM="$(WRAPCMD) nm" OBJDUMP="$(WRAPCMD) objdump" JAVA="$(WRAPCMD) -env java" JAVAC="$(WRAPCMD) -env javac" CFLAGS="$(CFLAGS)" CPPFLAGS="$(INCLUDE)" LDFLAGS="$(db_LDFLAGS)" LIBS="$(db_LIBS)" LIBSO_LIBS="$(db_LIBS)" LIBJSO_LIBS="$(db_LIBS)" LIBXSO_LIBS="$(db_LIBXSO_LIBS)"
149
150	BUILD_DIR=$(CONFIGURE_DIR)
151	BUILD_DIR_OUT=$(CONFIGURE_DIR)
152	BUILD_ACTION=make
153
154	OUT2LIB=$(BUILD_DIR)$/.libs$/libdb47.dll.a
155	OUT2BIN=$(BUILD_DIR)$/.libs$/libdb47.dll
156
157	OUT2INC= \
158	$(BUILD_DIR)$/db.h
159	.IF "$(GUI)$(COM)"=="WNTGCC"
160	.EXPORT : PWD
161	.ENDIF
162
163	.ELSE
164	# make use of stlport headerfiles
165	EXT_USE_STLPORT=TRUE
166
167	BUILD_DIR=
168	BUILD_ACTION=dmake
169
170	BUILD_DIR_OUT=build_windows
171	#OUT2LIB= \
172	# $(BUILD_DIR_OUT)$/Release$/libdb42.lib
173	#OUT2BIN=$(BUILD_DIR_OUT)$/Release$/libdb42.dll
174	OUT2INC= \
175	$(BUILD_DIR_OUT)$/db.h
176	.ENDIF
177	.ENDIF # "$(GUI)"=="WNT"
178
179	# --- Targets ------------------------------------------------------
180
181	.INCLUDE : set_ext.mk
182	.INCLUDE : target.mk
183	.INCLUDE : tg_ext.mk
184
185

Lines 1-15 Link Here

(-)a/main/berkeleydb/prj/d.lst (-15 lines)
1	mkdir: %_DEST%\inc%_EXT%\berkeleydb
2
3	..\%__SRC%\inc\db.h %_DEST%\inc%_EXT%\berkeleydb\db.h
4
5	..\%__SRC%\lib\libdb47.lib %_DEST%\lib%_EXT%\libdb47.lib
6
7	..\%__SRC%\lib\libdb-4.7.so %_DEST%\lib%_EXT%\libdb-4.7.so
8
9	..\%__SRC%\lib\libdb-4.7.dylib %_DEST%\lib%_EXT%\libdb-4.7.dylib
10
11	..\%__SRC%\lib\libdb47.dll.a %_DEST%\lib%_EXT%\libdb-4.7.a
12
13	..\%__SRC%\bin\libdb47.dll %_DEST%\bin%_EXT%\libdb47.dll
14
15

Lines 193-213 End Link Here

(-)a/main/scp2/source/ooo/file_library_ooo.scp (-15 lines)
193		193
194	#endif	194	#endif
195		195
196	#ifndef SYSTEM_DB
197
198	File gid_File_Lib_Db
199	TXT_FILE_BODY;
200	Styles = (PACKED);
201	Dir = SCP2_OOO_BIN_DIR;
202	#ifdef UNX
203	Name = STRING(CONCAT2(libdb-4.7,UNXSUFFIX));
204	#else
205	Name = "libdb47.dll";
206	#endif
207	End
208
209	#endif
210
211	#ifdef UNX	196	#ifdef UNX
212	#ifdef ENABLE_GTK	197	#ifdef ENABLE_GTK
213	#ifdef ENABLE_SYSTRAY_GTK	198	#ifdef ENABLE_SYSTRAY_GTK

Lines 33-42 my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANA Link Here

(-)a/main/solenv/inc/extension_helplink.mk (-8 lines)
33	my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-analyzers-2.3.jar	33	my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-analyzers-2.3.jar
34	.ENDIF	34	.ENDIF
35		35
36	.IF "$(SYSTEM_DB)" != "YES"
37	JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
38	.ENDIF
39
40	#aux_alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j $i $(NULL))))	36	#aux_alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j $i $(NULL))))
41	aux_alllangiso*:=$(alllangiso)	37	aux_alllangiso*:=$(alllangiso)
42		38
Lines 48-57 HELPLINKALLADDEDDEPS=$(foreach,i,$(aux_alllangiso) $(subst,LANGUAGE,$i $(LINKADD Link Here
48		44
49	ALLTAR : $(HELPLINKALLTARGETS)	45	ALLTAR : $(HELPLINKALLTARGETS)
50		46
51	.IF "$(SYSTEM_DB)" != "YES"
52	JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
53	.ENDIF
54
55	XSL_DIR*:=$(SOLARBINDIR)	47	XSL_DIR*:=$(SOLARBINDIR)
56	XHPLINKSRC*:=$(XHPDEST)	48	XHPLINKSRC*:=$(XHPDEST)
57	STY_SWITCH:= -sty $(XSL_DIR)/embed.xsl	49	STY_SWITCH:= -sty $(XSL_DIR)/embed.xsl

Lines 224-234 NEON3RDLIB=$(SOLARLIBDIR)/libneon.dylib Link Here

(-)a/main/solenv/inc/libs.mk (-6 lines)
224	.ELSE	224	.ELSE
225	NEON3RDLIB=-lneon	225	NEON3RDLIB=-lneon
226	.ENDIF	226	.ENDIF
227	.IF "$(SYSTEM_DB)" == "YES"
228	BERKELEYLIB=-ldb
229	.ELSE
230	BERKELEYLIB=-ldb-4.7
231	.ENDIF
232	CURLLIB=-lcurl	227	CURLLIB=-lcurl
233	SFX2LIB=-lsfx$(DLLPOSTFIX)	228	SFX2LIB=-lsfx$(DLLPOSTFIX)
234	SFXLIB=-lsfx$(DLLPOSTFIX)	229	SFXLIB=-lsfx$(DLLPOSTFIX)
Lines 449-455 EXPATASCII3RDLIB=expat_xmltok.lib ascii_expat_xmlparse.lib Link Here
449	ZLIB3RDLIB=zlib.lib	444	ZLIB3RDLIB=zlib.lib
450	JPEG3RDLIB=jpeglib.lib	445	JPEG3RDLIB=jpeglib.lib
451	NEON3RDLIB=ineon.lib	446	NEON3RDLIB=ineon.lib
452	BERKELEYLIB=libdb47.lib
453	CURLLIB=libcurl.lib	447	CURLLIB=libcurl.lib
454	CHAOSLIB=ichaos.lib	448	CHAOSLIB=ichaos.lib
455	UUILIB=iuui.lib	449	UUILIB=iuui.lib