ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

dung out berkeleydb gnumake / configure bits ...

Browse Source
This commit is contained in:
Michael Meeks
2012-11-21 14:52:49 +00:00
parent f78a2bcce8
commit d04ac66578
26 changed files with 3 additions and 2079 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Library_merged.mk
-6
View File
@@ -76,12 +76,6 @@ $(eval $(call gb_Library_use_externals,merged,\
))
endif
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Library_use_externals,merged,\
berkeleydb \
))
endif
ifneq ($(OS),IOS)
$(eval $(call gb_Library_use_libraries,merged,\
jvmaccess \
Makefile.top
-1
View File
@@ -216,7 +216,6 @@ xsltml\
zlib\
dmake_modules:=\
berkeleydb\
cppunit\
crashrep\
external\
RepositoryExternal.mk
-45
View File
@@ -1415,51 +1415,6 @@ define gb_LinkTarget__use_pixbuf
$(error gb_LinkTarget__use_pixbuf should not be used any more)
endef
ifeq ($(SYSTEM_DB),YES)
define gb_LinkTarget__use_berkeleydb
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$(filter -I%,$(SYSTEM_DB_CFLAGS)) \
)
$(call gb_LinkTarget_add_defs,$(1),\
$(filter -D%,$(SYSTEM_DB_CFLAGS)) \
)
$(call gb_LinkTarget_add_libs,$(1),\
-l$(DB_LIB) \
)
endef
else # !SYSTEM_DB
ifneq ($(OS),WNT)
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
db-4.7 \
))
else
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
db47 \
))
endif
define gb_LinkTarget__use_berkeleydb
ifneq ($(OS),WNT)
$(call gb_LinkTarget_use_libraries,$(1),\
db-4.7 \
)
else
$(call gb_LinkTarget_use_libraries,$(1),\
db47 \
)
endif
endef
endif # SYSTEM_DB
ifeq ($(SYSTEM_LIBPNG),YES)
define gb_LinkTarget__use_png
berkeleydb/README
-5
View File
@@ -1,5 +0,0 @@
The Berkeley database.
This code is used primarily for legacy UNO component registration in
the users' directory, for some small bits in xmlhelp, and for the help
compiler.
berkeleydb/db-4.7.25-mingw.patch
-348
View File
@@ -1,348 +0,0 @@
--- misc/db-4.7.25.NC/dist/Makefile.in 2008-05-06 12:03:36.000000000 +0900
+++ misc/build/db-4.7.25.NC/dist/Makefile.in 2009-07-11 13:38:07.419875000 +0900
@@ -44,7 +44,7 @@
SOLINK= @MAKEFILE_SOLINK@ @CFLAGS@
SOFLAGS= @SOFLAGS@
LIBMAJOR= @DB_VERSION_MAJOR@
-LIBVERSION= @DB_VERSION_MAJOR@.@DB_VERSION_MINOR@
+LIBVERSION= @DB_VERSION_MAJOR@@DB_VERSION_MINOR@
CPPFLAGS= -I$(builddir) -I$(srcdir) @CPPFLAGS@
@@ -62,18 +62,18 @@
libdb_base= libdb
libdb= $(libdb_base).a
-libdb_version= $(libdb_base)-$(LIBVERSION).a
-libso= $(libdb_base)-$(LIBVERSION)@SOSUFFIX@
-libso_target= $(libdb_base)-$(LIBVERSION).la
+libdb_version= $(libdb_base)$(LIBVERSION).a
+libso= $(libdb_base)$(LIBVERSION)@SOSUFFIX@
+libso_target= $(libdb_base)$(LIBVERSION).la
libso_default= $(libdb_base)@SOSUFFIX@
-libso_major= $(libdb_base)-$(LIBMAJOR)@SOSUFFIX@
+libso_major= $(libdb_base)$(LIBMAJOR)@SOSUFFIX@
##################################################
# C++ API.
#
# C++ support is optional, and can be built with static or shared libraries.
##################################################
-CXXFLAGS= -c $(CPPFLAGS) @CXXFLAGS@
+CXXFLAGS= -c $(SOLARINC) $(CPPFLAGS) -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) @CXXFLAGS@
CXX= @MAKEFILE_CXX@
CXXLINK= @MAKEFILE_CXXLINK@ @CXXFLAGS@
XSOLINK= @MAKEFILE_XSOLINK@ @CXXFLAGS@
@@ -81,11 +81,11 @@
libcxx_base= libdb_cxx
libcxx= $(libcxx_base).a
-libcxx_version= $(libcxx_base)-$(LIBVERSION).a
-libxso= $(libcxx_base)-$(LIBVERSION)@SOSUFFIX@
-libxso_target= $(libcxx_base)-$(LIBVERSION).la
+libcxx_version= $(libcxx_base)$(LIBVERSION).a
+libxso= $(libcxx_base)$(LIBVERSION)@SOSUFFIX@
+libxso_target= $(libcxx_base)$(LIBVERSION).la
libxso_default= $(libcxx_base)@SOSUFFIX@
-libxso_major= $(libcxx_base)-$(LIBMAJOR)@SOSUFFIX@
+libxso_major= $(libcxx_base)$(LIBMAJOR)@SOSUFFIX@
##################################################
# Java API.
@@ -108,12 +108,12 @@
libj_jarfile= db.jar
libj_exjarfile= dbexamples.jar
libjso_base= libdb_java
-libjso= $(libjso_base)-$(LIBVERSION)@JMODSUFFIX@
-libjso_static= $(libjso_base)-$(LIBVERSION).a
-libjso_target= $(libjso_base)-$(LIBVERSION).la
+libjso= $(libjso_base)$(LIBVERSION)@JMODSUFFIX@
+libjso_static= $(libjso_base)$(LIBVERSION).a
+libjso_target= $(libjso_base)$(LIBVERSION).la
libjso_default= $(libjso_base)@JMODSUFFIX@
-libjso_major= $(libjso_base)-$(LIBMAJOR)@JMODSUFFIX@
-libjso_g= $(libjso_base)-$(LIBVERSION)_g@JMODSUFFIX@
+libjso_major= $(libjso_base)$(LIBMAJOR)@JMODSUFFIX@
+libjso_g= $(libjso_base)$(LIBVERSION)_g@JMODSUFFIX@
##################################################
# TCL API.
@@ -123,11 +123,11 @@
TCL_INCLUDE_SPEC= @TCL_INCLUDE_SPEC@
LIBTSO_LIBS= @LIBTSO_LIBS@ @LIBSO_LIBS@
libtso_base= libdb_tcl
-libtso= $(libtso_base)-$(LIBVERSION)@MODSUFFIX@
-libtso_static= $(libtso_base)-$(LIBVERSION).a
-libtso_target= $(libtso_base)-$(LIBVERSION).la
+libtso= $(libtso_base)$(LIBVERSION)@MODSUFFIX@
+libtso_static= $(libtso_base)$(LIBVERSION).a
+libtso_target= $(libtso_base)$(LIBVERSION).la
libtso_default= $(libtso_base)@MODSUFFIX@
-libtso_major= $(libtso_base)-$(LIBMAJOR)@MODSUFFIX@
+libtso_major= $(libtso_base)$(LIBMAJOR)@MODSUFFIX@
##################################################
# db_dump185 UTILITY
@@ -756,7 +756,7 @@
# Shared Java library.
$(libjso_target): $(JAVA_OBJS) $(C_OBJS)
- $(SOLINK) -shrext @JMODSUFFIX@ $(SOFLAGS) $(LDFLAGS) \
+ $(SOLINK) -shrext @JMODSUFFIX@ -add-underscore $(SOFLAGS) $(LDFLAGS) \
-o $@ $(JAVA_OBJS) $(C_OBJS) $(LIBJSO_LIBS)
# Shared Tcl library.
--- misc/db-4.7.25.NC/dist/configure 2008-05-16 06:12:41.000000000 +0900
+++ misc/build/db-4.7.25.NC/dist/configure 2009-07-11 16:00:39.255625000 +0900
@@ -9488,7 +9488,7 @@
export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ archive_cmds='$DLLTOOL $add_underscore --export-all-symbols --dllname $soname --output-lib $lib --output-exp $output_objdir/$soname.exp $libobjs; $CC -shared $output_objdir/$soname.exp $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base ${wl}--image-base=0x10000000'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
@@ -9497,7 +9497,7 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ $DLLTOOL $add_underscore --dllname $soname --output-lib $lib --output-exp $output_objdir/$soname.exp --input-def $output_objdir/$soname.def; $CC -shared $output_objdir/$soname.exp $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base ${wl}--image-base=0x10000000'
else
ld_shlibs=no
fi
@@ -13680,15 +13680,15 @@
if test "$pre_test_object_deps_done" = no; then
if test -z "$predep_objects_CXX"; then
- predep_objects_CXX="$p"
+ predep_objects_CXX=`cygpath -m "$p"`
else
- predep_objects_CXX="$predep_objects_CXX $p"
+ predep_objects_CXX="$predep_objects_CXX "`cygpath -m "$p"`
fi
else
if test -z "$postdep_objects_CXX"; then
- postdep_objects_CXX="$p"
+ postdep_objects_CXX=`cygpath -m "$p"`
else
- postdep_objects_CXX="$postdep_objects_CXX $p"
+ postdep_objects_CXX="$postdep_objects_CXX "`cygpath -m "$p"`
fi
fi
;;
@@ -22371,6 +22371,154 @@
+case "$host_os" in
+mingw*)
+for ac_header in execinfo.h sys/time.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ---------------------------------------------------------- ##
+## Report this to Oracle Technology Network Berkeley DB forum ##
+## ---------------------------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+;;
+*)
for ac_header in execinfo.h sys/select.h sys/socket.h sys/time.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -22515,6 +22663,8 @@
done
+;;
+esac
{ echo "$as_me:$LINENO: checking for struct stat.st_blksize" >&5
echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6; }
if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then
@@ -27697,6 +27847,18 @@
+ac_cv_sizeof_char_p=`echo $ac_cv_sizeof_char_p | tr -d '\015'`
+ac_cv_sizeof_unsigned_int=`echo $ac_cv_sizeof_unsigned_int | tr -d '\015'`
+ac_cv_sizeof_unsigned_char=`echo $ac_cv_sizeof_unsigned_char | tr -d '\015'`
+ac_cv_sizeof_unsigned_short=`echo $ac_cv_sizeof_unsigned_short | tr -d '\015'`
+ac_cv_sizeof_unsigned_long=`echo $ac_cv_sizeof_unsigned_long | tr -d '\015'`
+ac_cv_sizeof_unsigned_long_long=`echo $ac_cv_sizeof_unsigned_long_long | tr -d '\015'`
+ac_cv_sizeof_int=`echo $ac_cv_sizeof_int | tr -d '\015'`
+ac_cv_sizeof_char=`echo $ac_cv_sizeof_char | tr -d '\015'`
+ac_cv_sizeof_short=`echo $ac_cv_sizeof_short | tr -d '\015'`
+ac_cv_sizeof_long=`echo $ac_cv_sizeof_long | tr -d '\015'`
+ac_cv_sizeof_long_long=`echo $ac_cv_sizeof_long_long | tr -d '\015'`
+
# We look for u_char, u_short, u_int, u_long -- if we can't find them,
# we create our own.
--- misc/db-4.7.25.NC/dist/ltmain.sh 2006-06-27 10:03:33.000000000 +0900
+++ misc/build/db-4.7.25.NC/dist/ltmain.sh 2009-07-11 13:38:07.388625000 +0900
@@ -1103,6 +1103,7 @@
lib_search_path=`pwd`
inst_prefix_dir=
+ add_underscore=
avoid_version=no
dlfiles=
dlprefiles=
@@ -1435,6 +1436,11 @@
prevarg="$arg"
case $arg in
+ -add-underscore)
+ add_underscore="--add-underscore"
+ continue
+ ;;
+
-all-static)
if test -n "$link_static_flag"; then
compile_command="$compile_command $link_static_flag"
@@ -4869,7 +4875,7 @@
esac
# test for cygwin because mv fails w/o .exe extensions
case $host in
- *cygwin*)
+ *cygwin* | *mingw*)
exeext=.exe
outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
*) exeext= ;;
berkeleydb/db-4.7.25.NC-mingw32hack.patch
-11
View File
@@ -1,11 +0,0 @@
--- misc/db-4.7.25.NC/dist/configure 2012-03-30 00:25:17.456408946 +0200
+++ misc/build/db-4.7.25.NC/dist/configure 2012-03-30 00:24:44.344633205 +0200
@@ -34776,7 +34776,7 @@
no | unknown) ;;
*)
cat >>confdefs.h <<_ACEOF
-#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
+#define _FILE_OFFSET_BITS 32
_ACEOF
;;
esac
berkeleydb/db-4.7.25.patch
-1104
View File
File diff suppressed because it is too large Load Diff
berkeleydb/db-aix.patch
-205
View File
@@ -1,205 +0,0 @@
--- misc/db-4.7.25.NC/dist/config.guess 2010-08-19 03:29:33.000000000 -0500
+++ misc/build/db-4.7.25.NC/dist/config.guess 2010-08-19 03:32:57.000000000 -0500
@@ -532,7 +532,7 @@
echo rs6000-ibm-aix3.2
fi
exit ;;
- *:AIX:*:[456])
+ *:AIX:*:[4567])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
@@ -544,6 +544,9 @@
else
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
+ if [ "$IBM_REV" == "V7BETA" ]; then
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ fi
echo ${IBM_ARCH}-ibm-aix${IBM_REV}
exit ;;
*:AIX:*:*)
--- misc/db-4.7.25.NC/dist/configure 2010-09-15 10:06:54.000000000 -0500
+++ misc/build/db-4.7.25.NC/dist/configure 2010-09-15 10:12:41.000000000 -0500
@@ -3701,7 +3701,7 @@
# Don't override anything if it's already set from the environment.
optimize_debug="-O"
case "$host_os" in
-aix4.3.*|aix5*)
+aix[4-9]*)
case "$host_os" in
aix4.3.*)
CPPFLAGS="$CPPFLAGS -D_LINUX_SOURCE_COMPAT";;
@@ -6452,7 +6452,7 @@
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
-aix4* | aix5*)
+aix[4-9]*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -9439,7 +9439,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
- aix3* | aix4* | aix5*)
+ aix[4-9]*)
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs=no
@@ -9649,7 +9649,7 @@
fi
;;
- aix4* | aix5*)
+ aix[4-9]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -9669,7 +9669,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
@@ -10410,7 +10410,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
-aix4* | aix5*)
+aix[4-9]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -11826,7 +11826,7 @@
fi
;;
-aix4* | aix5*)
+aix[4-9]*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
@@ -12670,7 +12670,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
- aix4* | aix5*)
+ aix[4-9]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -12683,7 +12683,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
@@ -13805,7 +13805,7 @@
esac
else
case $host_os in
- aix4* | aix5*)
+ aix[4-9]*)
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
@@ -14201,7 +14201,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
- aix4* | aix5*)
+ aix[4-9]*)
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
@@ -14334,7 +14334,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
-aix4* | aix5*)
+aix[4-9]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -15455,7 +15455,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
-aix4* | aix5*)
+aix[4-9]*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
@@ -15966,7 +15966,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
- aix3* | aix4* | aix5*)
+ aix[3-9]*)
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_F77=no
@@ -16176,7 +16176,7 @@
fi
;;
- aix4* | aix5*)
+ aix[4-9]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -16917,7 +16917,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
-aix4* | aix5*)
+aix[4-9]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -18540,7 +18540,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
- aix3* | aix4* | aix5*)
+ aix[3-9]*)
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_GCJ=no
@@ -18750,7 +18750,7 @@
fi
;;
- aix4* | aix5*)
+ aix[4-9]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -19511,7 +19511,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
-aix4* | aix5*)
+aix[4-9]*)
version_type=linux
need_lib_prefix=no
need_version=no
--- misc/db-4.7.25.NC/dist/configure.ac 2010-09-15 10:06:54.000000000 -0500
+++ misc/build/db-4.7.25.NC/dist/configure.ac 2010-09-15 10:08:45.000000000 -0500
@@ -154,7 +154,7 @@
# Don't override anything if it's already set from the environment.
optimize_debug="-O"
case "$host_os" in
-aix4.3.*|aix5*)
+aix[4-9]*)
case "$host_os" in
aix4.3.*)
CPPFLAGS="$CPPFLAGS -D_LINUX_SOURCE_COMPAT";;
berkeleydb/makefile.mk
-197
View File
@@ -1,197 +0,0 @@
#*************************************************************************
#
# 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
PATCH_FILES += db-4.7.25.NC-mingw32hack.patch
# otherwise, db-4.7.25.NC/dist/configure decides for _FILE_OFFSET_BITS=64,
# which causes /usr/i686-w64-mingw32/sys-root/mingw/include/_mingw.h to not
# define _USE_32BIT_TIME_T, so that berkeleydb uses a 64 bit time_t while
# the rest of LibreOffice uses a 32 bit time_t, which causes problems as
# there is e.g. a member time_t timestamp of struct __db in db.h; see
# <http://sourceforge.net/support/tracker.php?aid=3513251> "_mingw.h: size
# of time_t depends on _FILE_OFFSET_BITS"
.ELSE
PATCH_FILES=\
db-4.7.25.patch \
db-aix.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)
.IF "$(ENABLE_SYMBOLS)"!="" && "$(ENABLE_SYMBOLS)"!="FALSE"
CFLAGS+=-g
CXXFLAGS+=-g
.ENDIF
.ENDIF
.IF "$(GUI)"=="UNX"
.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
LDFLAGS:=-Wl,-z,origin -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" || "$(OS)$(COM)"=="FREEBSDGCC"
.IF "$(OS)$(COM)"=="SOLARISC52"
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-compat185 CC='$(CC) $(SOLARLIB)'
.IF "$(OS)"=="IOS"
CONFIGURE_FLAGS+= --disable-shared
.ELSE
CONFIGURE_FLAGS+= --enable-shared
.ENDIF
.IF "$(OS)"=="MACOSX"
CONFIGURE_FLAGS += \
--prefix=/@.__________________________________________________$(EXTRPATH) \
CPPFLAGS="$(EXTRA_CDEFS)"
.ENDIF
.IF "$(CROSS_COMPILING)"=="YES"
CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.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)
.IF "$(OS)"=="IOS"
OUT2LIB=$(BUILD_DIR)$/libdb*.a
.ELSE
OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST)
.ENDIF
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
db_CC=$(CC) -mthreads
db_CXX=$(CXX) -mthreads
.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
db_CC+=-shared-libgcc
db_CXX+=-shared-libgcc
.ENDIF
db_LDFLAGS=-L$(SOLARVER)/$(INPATH)/lib -L$(SOLARVER)/$(INPATH)/bin
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=$(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=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --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
BUILD_DIR=
BUILD_ACTION=dmake
BUILD_DIR_OUT=build_windows
OUT2INC= \
$(BUILD_DIR_OUT)$/db.h
.ENDIF
.ENDIF # "$(GUI)"=="WNT"
# --- Targets ------------------------------------------------------
.INCLUDE : set_ext.mk
.INCLUDE : target.mk
.INCLUDE : tg_ext.mk
berkeleydb/prj/build.lst
-3
View File
@@ -1,3 +0,0 @@
db berkeleydb : external NULL
db berkeleydb nmake - u as_mkout NULL
db berkeleydb nmake - w,vc7 as_mkout NULL
berkeleydb/prj/d.lst
-12
View File
@@ -1,12 +0,0 @@
mkdir: %_DEST%\inc\berkeleydb
..\%__SRC%\inc\db.h %_DEST%\inc\berkeleydb\db.h
..\%__SRC%\lib\libdb47.lib %_DEST%\lib\libdb47.lib
..\%__SRC%\lib\libdb-4.7.a %_DEST%\lib\libdb-4.7.a
..\%__SRC%\lib\libdb-4.7.so %_DEST%\lib\libdb-4.7.so
..\%__SRC%\lib\libdb-4.7.dylib %_DEST%\lib\libdb-4.7.dylib
..\%__SRC%\lib\libdb47.dll.a %_DEST%\lib\libdb47.dll.a
..\%__SRC%\bin\libdb47.dll %_DEST%\bin\libdb47.dll
berkeleydb/prj/dmake
View File
config_host.mk.in
-6
View File
@@ -38,7 +38,6 @@ export ATL_INCLUDE=@ATL_INCLUDE@
export ATL_LIB=@ATL_LIB@
export AWTLIB=@AWTLIB@
export BARCODE_EXTENSION_PACK=@BARCODE_EXTENSION_PACK@
export BERKELEYDB_TARBALL=@BERKELEYDB_TARBALL@
export BOOST_CPPFLAGS=@BOOST_CPPFLAGS@
export BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@
export BOOST_LDFLAGS=@BOOST_LDFLAGS@
@@ -103,8 +102,6 @@ export DBUSMENUGTK_CFLAGS=$(gb_SPACE)@DBUSMENUGTK_CFLAGS@
export DBUSMENUGTK_LIBS=$(gb_SPACE)@DBUSMENUGTK_LIBS@
export DBUS_CFLAGS=$(gb_SPACE)@DBUS_CFLAGS@
export DBUS_LIBS=$(gb_SPACE)@DBUS_LIBS@
export DB_CPPLIB=@DB_CPPLIB@
export DB_LIB=@DB_LIB@
export debug=@ENABLE_DEBUG@
export DEFAULT_MOZILLA_TOOLKIT=@MOZILLA_TOOLKIT@
export DEFAULT_TO_ENGLISH_FOR_PACKING=yes
@@ -373,7 +370,6 @@ export MINGW_CAIRO_DLL=@MINGW_CAIRO_DLL@
export MINGW_CLIB_DIR=@MINGW_CLIB_DIR@
export MINGW_CRYPTO_DLL=@MINGW_CRYPTO_DLL@
export MINGW_CURL_DLL=@MINGW_CURL_DLL@
export MINGW_DB_DLL=@MINGW_DB_DLL@
export MINGW_EXPAT_DLL=@MINGW_EXPAT_DLL@
export MINGW_FONTCONFIG_DLL=@MINGW_FONTCONFIG_DLL@
export MINGW_FREETYPE_DLL=@MINGW_FREETYPE_DLL@
@@ -585,8 +581,6 @@ export SYSTEM_CAIRO=@SYSTEM_CAIRO@
export SYSTEM_CLUCENE=@SYSTEM_CLUCENE@
export SYSTEM_CPPUNIT=@SYSTEM_CPPUNIT@
export SYSTEM_CURL=@SYSTEM_CURL@
export SYSTEM_DB=@SYSTEM_DB@
export SYSTEM_DB_CFLAGS=@SYSTEM_DB_CFLAGS@
export SYSTEM_DICTS=@SYSTEM_DICTS@
export SYSTEM_EXPAT=@SYSTEM_EXPAT@
export SYSTEM_GENBRK=@SYSTEM_GENBRK@
configure.ac
-77
View File
@@ -1379,11 +1379,6 @@ AC_ARG_WITH(system-poppler,
[Use system poppler. (only needed for pdfimport extension)]),,
[with_system_poppler="$with_system_libs"])
AC_ARG_WITH(system-db,
AS_HELP_STRING([--with-system-db],
[Use Berkeley db already on system.]),,
[with_system_db="$with_system_libs"])
AC_ARG_WITH(system-apache-commons,
AS_HELP_STRING([--with-system-apache-commons],
[Use Apache commons libraries already on system.]),,
@@ -2208,10 +2203,6 @@ AC_ARG_WITH(system-cppunit-for-build,
AS_HELP_STRING([--with-system-cppunit-for-build],
[Use cppunit already on system for build tools (cross-compilation only).]))
AC_ARG_WITH(system-db-for-build,
AS_HELP_STRING([--with-system-db-for-build],
[Use db already on system for build tools (cross-compilation only).]))
AC_ARG_WITH(system-expat-for-build,
AS_HELP_STRING([--with-system-expat-for-build],
[Use expat already on system for build tools (cross-compilation only).]))
@@ -4090,7 +4081,6 @@ if test "$cross_compiling" = "yes"; then
test -n "${with_solver_and_workdir_root}" && sub_conf_opts="$sub_conf_opts --with-solver-and-workdir-root=${with_solver_and_workdir_root}"
test -n "$with_system_boost_for_build" && sub_conf_opts="$sub_conf_opts --with-system-boost"
test -n "$with_system_cppunit_for_build" && sub_conf_opts="$sub_conf_opts --with-system-cppunit"
test -n "$with_system_db_for_build" && sub_conf_opts="$sub_conf_opts --with-system-db"
test -n "$with_system_expat_for_build" && sub_conf_opts="$sub_conf_opts --with-system-expat"
test "$with_system_icu_for_build" = "yes" -o "$with_system_icu_for_build" = "force" && sub_conf_opts="$sub_conf_opts --with-system-icu"
test -n "$with_system_libxml_for_build" && sub_conf_opts="$sub_conf_opts --with-system-libxml"
@@ -7440,71 +7430,6 @@ AC_SUBST([MINGW_TERMCAP_DLL])
AC_SUBST(MINGW_PYVERSION)
AC_SUBST(MINGW_PYTHON_MAJOR_VERSION)
dnl ===================================================================
dnl Check for system Berkeley db
dnl ===================================================================
AC_MSG_CHECKING([which db to use])
if test "$with_system_db" = "yes"; then
SYSTEM_DB=YES
AC_MSG_RESULT([external])
db_header=
for dbver in 5.3 5.1 5.0 5 4.8 4.7 4; do
for dash in - ''; do
AC_CHECK_HEADER([db$dash$dbver/db.h],
[ db_header="db$dash$dbver/db.h"; break 2 ])
done
done
if test -z "$db_header"; then
AC_CHECK_HEADER([db/db.h], [db_header='db/db.h'; dbver=''])
fi
if test -z "$db_header"; then
AC_CHECK_HEADER(db.h, [ db_header='db.h'; dbver='' ])
fi
if test -z "$db_header"; then
AC_MSG_ERROR([db.h not found. Use the correct -I flag, or install the Berkeley db development package.])
fi
AC_MSG_CHECKING([whether db is at least 4.1])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <$db_header>]], [[int array[(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1))-1];]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([no. you need at least db 4.1])])
SYSTEM_DB_CFLAGS="-DSYSTEM_DB_HEADER='<$db_header>'"
DB_LIB=
dnl At least on OpenBSD and RHEL-6 dbver is not appended to the library
dnl even though the headers are in a versioned dir
for suffix in '' '-$dbver' '$dbver' ''; do
AC_CHECK_LIB(db$suffix, dbopen,
[ DB_LIB="db$suffix"; DB_CPPLIB="db_cxx$suffix"; break ])
AC_CHECK_LIB(db$suffix, __db185_open,
[ DB_LIB="db$suffix"; DB_CPPLIB="db_cxx$suffix"; break ])
done
if test -z "$DB_LIB"; then
AC_MSG_ERROR([db library not found. Use the correct -L flag,
or install the Berkeley db development package.])
fi
SCPDEFS="$SCPDEFS -DSYSTEM_DB"
libo_MINGW_CHECK_DLL([DB], [libdb])
elif test $_os != iOS -a $_os != Android; then
AC_MSG_RESULT([internal])
SYSTEM_DB=NO
BERKELEYDB_TARBALL="d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz"
BUILD_TYPE="$BUILD_TYPE BERKELEYDB"
else
AC_MSG_RESULT([none])
fi
AC_SUBST(SYSTEM_DB)
AC_SUBST(SYSTEM_DB_CFLAGS)
AC_SUBST(DB_LIB)
AC_SUBST(DB_CPPLIB)
AC_SUBST(BERKELEYDB_TARBALL)
AC_SUBST([MINGW_DB_DLL])
AC_MSG_CHECKING([whether to build the MySQL Connector extension])
if test "x$enable_ext_mysql_connector" = "xyes" -a "x$enable_extension_integration" != "xno"; then
AC_MSG_RESULT([yes])
@@ -12423,8 +12348,6 @@ AC_SUBST(LO_PATH)
BUILD_TARBALLS=
# Ugly hack to get what we need for build platform into ooo.lst
if test "$CROSS_COMPILING" = "YES" ; then
# BERKELEYDB_TARBALL
BUILD_TARBALLS="$BUILD_TARBALLS d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz"
# ICU_DATA_SUBSET_ZIP
BUILD_TARBALLS="$BUILD_TARBALLS fc188d2ed5c2cbcf7a021b34b9f88478-icudt49l-subset.zip"
fi
cross_tail_build/prj/build.lst
+1 -1
View File
@@ -1,2 +1,2 @@
ctb cross_tail_build :: BERKELEYDB:berkeleydb CPPUNIT:cppunit EXPAT:expat external ICU:icu LIBXML2:libxml2 LIBXSLT:libxslt solenv soltools NULL
ctb cross_tail_build :: CPPUNIT:cppunit EXPAT:expat external ICU:icu LIBXML2:libxml2 LIBXSLT:libxslt solenv soltools NULL
ctb tail_build\prj nmake - all ctb_prj NULL
external/mingw-dlls/makefile.mk
Vendored
-1
View File
@@ -46,7 +46,6 @@ MINGW_DLLS:= \
$(MINGW_CAIRO_DLL) \
$(MINGW_CRYPTO_DLL) \
$(MINGW_CURL_DLL) \
$(MINGW_DB_DLL) \
$(MINGW_EXPAT_DLL) \
$(MINGW_FONTCONFIG_DLL) \
$(MINGW_FREETYPE_DLL) \
ooo.lst.in
-2
View File
@@ -1,5 +1,4 @@
http://dev-www.libreoffice.org/src
@BUILD_TARBALLS@
18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz
c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
@@ -9,7 +8,6 @@ c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
@APACHE_COMMONS_HTTPCLIENT_TARBALL@
@APACHE_COMMONS_LANG_TARBALL@
@APACHE_COMMONS_LOGGING_TARBALL@
@BERKELEYDB_TARBALL@
@BOOST_TARBALL@
@BSH_TARBALL@
@CAIRO_TARBALL@
python/Python-2.6.1-cross.berkeleydb.patch
-15
View File
@@ -1,15 +0,0 @@
--- misc/build/Python-2.6.1/Modules/Setup.dist (revision 74955)
+++ misc/build/Python-2.6.1/Modules/Setup.dist (working copy)
@@ -413,9 +413,9 @@
# and the subdirectory of PORT where you built it.
DB=$(prefix)
DBLIBVER=4.8
-DBINC=$(DB)/include
-DBLIB=$(DB)/lib
-_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
+DBINC=$(OUTDIR)/inc/berkeleydb
+DBLIB=$(OUTDIR)/lib
+_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb47
# Historical Berkeley DB 1.85
#
python/makefile.mk
-6
View File
@@ -129,12 +129,6 @@ PATCH_FILES= \
Python-2.6.2-cross.patch \
Python-2.6.2-cross.fix-configure.patch \
.IF "$(SYSTEM_DB)" != "YES"
PATCH_FILES += \
Python-2.6.1-cross.berkeleydb.patch \
.ENDIF
BUILD_DIR=
MYCWD=$(shell @pwd)/$(INPATH)/misc/build
.IF "$(PYTHON_FOR_BUILD)" == ""
python/prj/build.lst
+1 -1
View File
@@ -1,3 +1,3 @@
py python : BERKELEYDB:berkeleydb solenv OPENSSL:openssl NULL
py python: solenv OPENSSL:openssl NULL
py python nmake - w,vc7 py_mkout NULL
py python nmake - u py_mkout NULL
scp2/InstallModule_ooo.mk
-2
View File
@@ -51,7 +51,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
SYSTEM_CAIRO \
SYSTEM_CLUCENE \
SYSTEM_CURL \
SYSTEM_DB \
SYSTEM_EXPAT \
SYSTEM_GRAPHITE \
SYSTEM_HSQLDB \
@@ -89,7 +88,6 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\
MINGW_CAIRO_DLL \
MINGW_CRYPTO_DLL \
MINGW_CURL_DLL \
MINGW_DB_DLL \
MINGW_EXPAT_DLL \
MINGW_FONTCONFIG_DLL \
MINGW_FREETYPE_DLL \
scp2/source/ooo/file_library_ooo.scp
-15
View File
@@ -199,21 +199,6 @@ End
#endif
#ifndef SYSTEM_DB
File gid_File_Lib_Db
LIB_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
scp2/source/ooo/mingw_dlls.scp
-6
View File
@@ -67,12 +67,6 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Libxml2, MINGW_LIBXML_DLL )
#endif
#endif
#ifdef SYSTEM_DB
#ifdef NEEDS_MINGW_DB_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libdb, MINGW_DB_DLL )
#endif
#endif
#if defined SYSTEM_CURL || defined SYSTEM_NSS
#ifdef NEEDS_MINGW_NSPR4_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libnspr, MINGW_NSPR4_DLL )
scp2/source/ooo/module_hidden_ooo.scp
-1
View File
@@ -323,7 +323,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Comphelper2,
gid_File_Lib_Curl,
gid_Unixlink_File_Lib_Curl,
gid_File_Lib_Db,
gid_File_Lib_Dbpool,
gid_File_Lib_Embobj,
gid_File_Lib_Emboleobj,
solenv/inc/libs.mk
-8
View File
@@ -188,13 +188,6 @@ ZLIB3RDLIB=-lz
ZLIB3RDLIB=-lzlib
.ENDIF
JPEG3RDLIB=-ljpeg
.IF "$(SYSTEM_DB)" == "YES"
BERKELEYLIB=-l$(DB_LIB)
.ELIF "$(GUI)$(COM)"=="WNTGCC"
BERKELEYLIB=-ldb47
.ELSE
BERKELEYLIB=-ldb-4.7
.ENDIF
CURLLIB=-lcurl
SFX2LIB=-lsfx$(DLLPOSTFIX)
SFXLIB=-lsfx$(DLLPOSTFIX)
@@ -418,7 +411,6 @@ EXPAT3RDLIB=expat_xmltok.lib expat_xmlparse.lib
EXPATASCII3RDLIB=expat_xmltok.lib ascii_expat_xmlparse.lib
ZLIB3RDLIB=zlib.lib
JPEG3RDLIB=jpeg.lib
BERKELEYLIB=libdb47.lib
CURLLIB=libcurl.lib
CHAOSLIB=ichaos.lib
UUILIB=iuui.lib
tail_build/prj/build.lst
+1 -1
View File
@@ -1,2 +1,2 @@
tb tail_build : BERKELEYDB:berkeleydb CPPUNIT:cppunit EXPAT:expat FONTCONFIG:fontconfig ICU:icu LIBPNG:libpng LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL
tb tail_build : CPPUNIT:cppunit EXPAT:expat FONTCONFIG:fontconfig ICU:icu LIBPNG:libpng LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL
tb tail_build\prj nmake - all tb_prj NULL