mirror of https://gitee.com/bigwinds/arangodb
Add today's git version of libbson to 3rdParty.
This commit is contained in:
Max Neunhoeffer
parent
07fd17b364
commit
b488e508a2
|
|
@ -0,0 +1,61 @@
|
|||
# -*- mode: Makefile; -*-
|
||||
|
||||
## -----------------------------------------------------------------------------
|
||||
## --SECTION-- LIBRARY
|
||||
## -----------------------------------------------------------------------------
|
||||
|
||||
################################################################################
|
||||
### @brief LIBBSON
|
||||
################################################################################
|
||||
|
||||
BUILT_SOURCES += @LIBBSON_BUILT@
|
||||
LIBBSONDIR = @abs_top_srcdir@/3rdParty/libbson/BUILD
|
||||
|
||||
@LIBBSON_LIBS@: @srcdir@/.libbson-build-@TRI_BITS@
|
||||
|
||||
@srcdir@/.libbson-build-@TRI_BITS@:
|
||||
@echo
|
||||
@echo "--------------------------------------------------------------------------------"
|
||||
@echo "BUILDING LIBBSON"
|
||||
@echo "--------------------------------------------------------------------------------"
|
||||
@echo
|
||||
|
||||
-mkdir $(LIBBSONDIR)
|
||||
cd @top_srcdir@/3rdParty/libbson/upstream \
|
||||
&& ./configure \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
--prefix=$(LIBBSONDIR) \
|
||||
--libdir=$(LIBBSONDIR)/libs \
|
||||
CC=${CC} \
|
||||
CXX=${CXX}
|
||||
|
||||
cd @top_srcdir@/3rdParty/libbson/upstream && $(MAKE) install
|
||||
|
||||
touch @srcdir@/.libbson-build-@TRI_BITS@
|
||||
|
||||
@echo
|
||||
@echo "--------------------------------------------------------------------------------"
|
||||
@echo "BUILD LIBBSON FINISHED"
|
||||
@echo "--------------------------------------------------------------------------------"
|
||||
@echo
|
||||
|
||||
################################################################################
|
||||
### @brief additional files to remove
|
||||
################################################################################
|
||||
|
||||
CLEANUP_3RD += clean-libbson
|
||||
|
||||
clean-libbson:
|
||||
cd @top_srcdir@/3rdParty/libbson/upstream && ( $(MAKE) clean || true )
|
||||
rm -f @srcdir@/.libbson-build-@TRI_BITS@
|
||||
rm -rf $(LIBBSONDIR)
|
||||
|
||||
## -----------------------------------------------------------------------------
|
||||
## --SECTION-- END-OF-FILE
|
||||
## -----------------------------------------------------------------------------
|
||||
|
||||
## Local Variables:
|
||||
## mode: outline-minor
|
||||
## outline-regexp: "^\\(### @brief\\|## --SECTION--\\|# -\\*- \\)"
|
||||
## End:
|
||||
20
Makefile.am
20
Makefile.am
|
|
@ -120,7 +120,8 @@ AM_CPPFLAGS = \
|
|||
@READLINE_CPPFLAGS@ \
|
||||
@ICU_CPPFLAGS@ \
|
||||
@ZLIB_CPPFLAGS@ \
|
||||
@V8_CPPFLAGS@
|
||||
@V8_CPPFLAGS@ \
|
||||
@LIBBSON_CPPFLAGS@
|
||||
|
||||
################################################################################
|
||||
### @brief linker flags
|
||||
|
|
@ -133,7 +134,8 @@ AM_LDFLAGS = \
|
|||
@READLINE_LDFLAGS@ \
|
||||
@ICU_LDFLAGS@ \
|
||||
@ZLIB_LDFLAGS@ \
|
||||
@V8_LDFLAGS@
|
||||
@V8_LDFLAGS@ \
|
||||
@LIBBSON_LDFLAGS@
|
||||
|
||||
################################################################################
|
||||
### @brief libraries
|
||||
|
|
@ -145,7 +147,8 @@ LIBS = \
|
|||
@OPENSSL_LIBS@ \
|
||||
@ICU_LIBS@ \
|
||||
@ZLIB_LIBS@ \
|
||||
@READLINE_LIBS@
|
||||
@READLINE_LIBS@ \
|
||||
@LIBBSON_LIBS@
|
||||
|
||||
################################################################################
|
||||
### @brief ruby additions
|
||||
|
|
@ -518,6 +521,12 @@ if ENABLE_ALL_IN_ONE_ETCD
|
|||
include 3rdParty/Makefile.etcd
|
||||
endif
|
||||
|
||||
################################################################################
|
||||
### @brief libbson
|
||||
################################################################################
|
||||
|
||||
include 3rdParty/Makefile.libbson
|
||||
|
||||
## -----------------------------------------------------------------------------
|
||||
## --SECTION-- CMAKE SETUP
|
||||
## -----------------------------------------------------------------------------
|
||||
|
|
@ -574,6 +583,11 @@ cmake-setup:
|
|||
-D ZLIB_LIBS= \
|
||||
-D ZLIB_VERSION= \
|
||||
\
|
||||
-D LIBBSON_INCLUDE = \
|
||||
-D LIBBSON_LIB_PATH= \
|
||||
-D LIBBSON_LIBS= \
|
||||
-D LIBBSON_VERSION= \
|
||||
\
|
||||
..
|
||||
|
||||
## -----------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -260,6 +260,12 @@ else
|
|||
BASIC_INFO="$BASIC_INFO|ALL-IN-ONE-BOOST: disabled"
|
||||
fi
|
||||
|
||||
dnl ----------------------------------------------------------------------------
|
||||
dnl LIBBSON
|
||||
dnl ----------------------------------------------------------------------------
|
||||
|
||||
m4_include([m4/internal.libbson])
|
||||
|
||||
|
||||
dnl ============================================================================
|
||||
dnl --SECTION-- GENERATE FILES
|
||||
|
|
|
|||
|
|
@ -0,0 +1,49 @@
|
|||
dnl -*- mode: Autoconf; -*-
|
||||
|
||||
dnl ----------------------------------------------------------------------------
|
||||
dnl --SECTION-- libbson
|
||||
dnl ----------------------------------------------------------------------------
|
||||
|
||||
libbson_build_dir="${srcdir}/3rdParty/libbson/BUILD"
|
||||
libbson_lib_dir="${libbson_build_dir}/libs"
|
||||
|
||||
LIBBSON_CPPFLAGS="-I${libbson_build_dir}/include"
|
||||
LIBBSON_LDFLAGS=""
|
||||
LIBBSON_LIBS="${libbson_lib_dir}/libbson.a"
|
||||
LIBBSON_BUILT="${libbson_lib_dir}/libbson.a"
|
||||
|
||||
TRI_LIBBSON_VERSION="git_3_April_2014"
|
||||
|
||||
dnl ----------------------------------------------------------------------------
|
||||
dnl add substitutions
|
||||
dnl ----------------------------------------------------------------------------
|
||||
|
||||
AC_SUBST(LIBBSON_CPPFLAGS)
|
||||
AC_SUBST(LIBBSON_LDFLAGS)
|
||||
AC_SUBST(LIBBSON_LIBS)
|
||||
AC_SUBST(LIBBSON_BUILT)
|
||||
|
||||
LIBBSON_CPPFLAGS="${LIBBSON_CPPFLAGS} -DTRI_LIBBSON_VERSION='\"${TRI_LIBBSON_VERSION}\"'"
|
||||
|
||||
dnl ----------------------------------------------------------------------------
|
||||
dnl informational output
|
||||
dnl ----------------------------------------------------------------------------
|
||||
|
||||
LIB_INFO="$LIB_INFO|."
|
||||
LIB_INFO="$LIB_INFO|LIBBSON: 3rdParty version"
|
||||
LIB_INFO="$LIB_INFO|LIBBSON VERSION: ${TRI_LIBBSON_VERSION}"
|
||||
|
||||
LIB_INFO="$LIB_INFO|LIBBSON_CPPFLAGS: ${LIBBSON_CPPFLAGS}"
|
||||
LIB_INFO="$LIB_INFO|LIBBSON_LDFLAGS: ${LIBBSON_LDFLAGS}"
|
||||
LIB_INFO="$LIB_INFO|LIBBSON_LIBS: ${LIBBSON_LIBS}"
|
||||
|
||||
dnl LIB_INFO="$LIB_INFO|."
|
||||
|
||||
dnl ----------------------------------------------------------------------------
|
||||
dnl --SECTION-- END-OF-FILE
|
||||
dnl ----------------------------------------------------------------------------
|
||||
|
||||
dnl Local Variables:
|
||||
dnl mode: outline-minor
|
||||
dnl outline-regexp: "^\\(dnl --SECTION--\\)"
|
||||
dnl End:
|
||||
Loading…
Reference in New Issue