build: progress towards bundled libbson for fallback.

Author: chergert

AUTHORS

@@ -1,34 +1,42 @@
 EXTRA_DIST =
-noinst_PROGRAMS =
+CLEANFILES =
+DISTCLEANFILES =
 
-include mongoc/Makefile.include
-include examples/Makefile.include
-include tests/Makefile.include
-include tools/Makefile.include
-include doc/Makefile.include
+bin_PROGRAMS =
+lib_LTLIBRARIES =
+noinst_LTLIBRARIES =
 
-if HAVE_PYTHON
-include bindings/python/Makefile.include
-endif
+AM_CPPFLAGS = \
+	-DMONGOC_COMPILATION \
+	-D_BSD_SOURCE \
+	-D_GNUC_SOURCE \
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/mongoc \
+	-I$(top_builddir)/src/mongoc
 
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-DISTCHECK_CONFIGURE_FLAGS = --enable-silent-rules
+AM_CFLAGS = $(BSON_CFLAGS)
+
+AM_LDFLAGS = $(BSON_LDFLAGS)
+
+AM_LIBADD = \
+	$(BSON_LIBS) \
+	$(SHM_LIB)
 
 AM_CTAGSFLAGS = --fields=+l --languages=c
 
-mongocdocdir = ${docdir}
-mongocdoc_DATA =
-mongocdoc_DATA += COPYING
-mongocdoc_DATA += NEWS
-mongocdoc_DATA += README
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA =
-pkgconfig_DATA += $(top_builddir)/mongoc/libmongoc-1.0.pc
-if HAVE_SSL
-pkgconfig_DATA += $(top_builddir)/mongoc/libmongoc-ssl-1.0.pc
-endif
+include doc/Makefile.am
+include examples/Makefile.am
+include src/Makefile.am
+include tests/Makefile.am
 
+ACLOCAL_AMFLAGS = -I build/autotools/m4 ${ACLOCAL_FLAGS}
+DISTCHECK_CONFIGURE_FLAGS = --enable-silent-rules
+
+mongocdocdir = ${docdir}
+mongocdoc_DATA = \
+	COPYING \
+	NEWS \
+	README.rst
 EXTRA_DIST += $(mongocdoc_DATA)
 
 dist-hook:

ChangeLog

@@ -43,3 +43,44 @@ Security Vulnerabilities
 If you’ve identified a security vulnerability in a driver or any other
 MongoDB project, please report it according to the `instructions here
 <http://docs.mongodb.org/manual/tutorial/create-a-vulnerability-report>`_.
+
+
+Building From Git
+=================
+
+The following example will install both libbson and mongo-c-driver from git.
+It assumes you do not yet have libbson installed and are on a 64-bit system.
+
+Dependencies
+------------
+
+Fedora::
+
+  $ sudo yum install git gcc automake autoconf libtool
+
+FreeBSD::
+
+  $ pkg install git gcc automake autoconf libtool
+
+
+Clone Repositories
+------------------
+
+You can use the following to checkout and build libbson and mongo-c-driver.::
+
+  $ for name in "libbson mongo-c-driver"
+
+  $ git clone https://github.com/mongodb/libbson.git
+  $ git clone https://github.com/mongodb/mongo-c-driver.git
+
+  $ cd libbson
+  $ ./autogen.sh --prefix=/usr --libdir=/usr/lib64
+  $ make
+  $ sudo make install
+  $ cd -
+  $ cd mongo-c-driver
+  $ ./autogen.sh --prefix=/usr --libdir=/usr/lib64
+  $ make
+  $ sudo make install
+
+

Makefile.am

@@ -1,4 +1,33 @@
-#!/bin/sh
+#! /bin/sh
 
-autoreconf -fiv
-./configure $@
+# Allow invocation from a separate build directory; in that case, we change
+# to the source directory to run the auto*, then change back before running configure
+srcdir=`dirname "$0"`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd "$srcdir" || exit 1
+
+if [ ! -f README ]; then
+    ln -s README.md README
+fi
+
+if [ ! -f COPYING ]; then
+    ln -s LICENSE COPYING
+fi
+
+touch ChangeLog
+touch AUTHORS
+
+if test -z `which autoreconf`; then
+    echo "Error: autoreconf not found, please install it."
+    exit 1
+fi
+autoreconf --force --verbose --install -I build/autotools $ACLOCAL_FLAGS|| exit $?
+rm -rf autom4te.cache
+
+cd "$ORIGDIR" || exit 1
+
+if test -z "$NOCONFIGURE"; then
+    "$srcdir"/configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
+fi

README

@@ -0,0 +1,67 @@
+# We want to check for compiler flag support, but there is no way to make
+# clang's "argument unused" warning fatal.  So we invoke the compiler through a
+# wrapper script that greps for this message.
+saved_CC="$CC"
+saved_CXX="$CXX"
+saved_LD="$LD"
+flag_wrap="$srcdir/scripts/wrap-compiler-for-flag-check"
+CC="$flag_wrap $CC"
+CXX="$flag_wrap $CXX"
+LD="$flag_wrap $LD"
+
+# We use the same hardening flags for C and C++.  We must check that each flag
+# is supported by both compilers.
+AC_DEFUN([check_cc_cxx_flag],
+ [AC_LANG_PUSH(C)
+  AX_CHECK_COMPILE_FLAG([$1],
+   [AC_LANG_PUSH(C++)
+    AX_CHECK_COMPILE_FLAG([$1], [$2], [$3], [-Werror $4])
+    AC_LANG_POP(C++)],
+   [$3], [-Werror $4])
+  AC_LANG_POP(C)])
+AC_DEFUN([check_link_flag],
+ [AX_CHECK_LINK_FLAG([$1], [$2], [$3], [-Werror $4])])
+
+AC_ARG_ENABLE([hardening],
+  [AS_HELP_STRING([--enable-hardening],
+    [Enable compiler and linker options to frustrate memory corruption exploits @<:@yes@:>@])],
+  [enable_hardening="$enableval"],
+  [enable_hardening="yes"])
+
+HARDEN_CFLAGS=""
+HARDEN_LDFLAGS=""
+AS_IF([test x"$enable_hardening" != x"no"], [
+  check_cc_cxx_flag([-fno-strict-overflow], [HARDEN_CFLAGS="$HARDEN_CFLAGS -fno-strict-overflow"])
+
+  # This one will likely succeed, even on platforms where it does nothing.
+  check_cc_cxx_flag([-D_FORTIFY_SOURCE=2], [HARDEN_CFLAGS="$HARDEN_CFLAGS -D_FORTIFY_SOURCE=2"])
+
+  check_cc_cxx_flag([-fstack-protector-all],
+   [check_link_flag([-fstack-protector-all],
+     [HARDEN_CFLAGS="$HARDEN_CFLAGS -fstack-protector-all"
+      check_cc_cxx_flag([-Wstack-protector], [HARDEN_CFLAGS="$HARDEN_CFLAGS -Wstack-protector"],
+        [], [-fstack-protector-all])
+      check_cc_cxx_flag([--param ssp-buffer-size=1], [HARDEN_CFLAGS="$HARDEN_CFLAGS --param ssp-buffer-size=1"],
+        [], [-fstack-protector-all])])])
+
+  # At the link step, we might want -pie (GCC) or -Wl,-pie (Clang on OS X)
+  #
+  # The linker checks also compile code, so we need to include -fPIE as well.
+  check_cc_cxx_flag([-fPIE],
+   [check_link_flag([-fPIE -pie],
+     [HARDEN_CFLAGS="$HARDEN_CFLAGS -fPIE"
+      HARDEN_LDFLAGS="$HARDEN_LDFLAGS -pie"],
+     [check_link_flag([-fPIE -Wl,-pie],
+       [HARDEN_CFLAGS="$HARDEN_CFLAGS -fPIE"
+        HARDEN_LDFLAGS="$HARDEN_LDFLAGS -Wl,-pie"])])])
+
+  check_link_flag([-Wl,-z,relro],
+   [HARDEN_LDFLAGS="$HARDEN_LDFLAGS -Wl,-z,relro"
+    check_link_flag([-Wl,-z,now], [HARDEN_LDFLAGS="$HARDEN_LDFLAGS -Wl,-z,now"])])])
+AC_SUBST([HARDEN_CFLAGS])
+AC_SUBST([HARDEN_LDFLAGS])
+
+# End of flag tests.
+CC="$saved_CC"
+CXX="$saved_CXX"
+LD="$saved_LD"

README.rst

@@ -0,0 +1,35 @@
+# If CFLAGS and CXXFLAGS are unset, default to empty.
+# This is to tell automake not to include '-g' if C{XX,}FLAGS is not set.
+# For more info - http://www.gnu.org/software/automake/manual/autoconf.html#C_002b_002b-Compiler
+if test -z "$CXXFLAGS"; then
+    CXXFLAGS=""
+fi
+if test -z "$CFLAGS"; then
+    CFLAGS=""
+fi
+
+AC_PROG_CC
+AC_PROG_CXX
+
+# Check that an appropriate C compiler is available.
+c_compiler="unknown"
+AC_LANG_PUSH([C])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 1)
+#error Not a supported GCC compiler
+#endif
+])], [c_compiler="gcc"], [])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 3)
+#error Not a supported Clang compiler
+#endif
+])], [c_compiler="clang"], [])
+AC_LANG_POP([C])
+
+if test "$c_compiler" = "unknown"; then
+    AC_MSG_ERROR([Compiler GCC >= 4.1 or Clang >= 3.3 is required for C compilation])
+fi
+
+AC_C_CONST
+AC_C_INLINE
+AC_C_TYPEOF