Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

added DARWIN

This commit is contained in:
Frank Celler 2012-02-09 23:18:38 +01:00
parent f7a9fe885f
commit a525b11f72
4 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile.all-in-one
View File

@ -4,9 +4,9 @@
## LIBEV ## LIBEV
################################################################################ ################################################################################
BUILT_SOURCES += @top_srcdir@/3rdParty/libev/.libs/libev.a BUILT_SOURCES += @LIBEV_LIBS@
@top_srcdir@/3rdParty/libev/.libs/libev.a: @LIBEV_LIBS@:
@echo @echo
@echo "--------------------------------------------------------------------------------" @echo "--------------------------------------------------------------------------------"
@echo "BUILDING LIBEV" @echo "BUILDING LIBEV"
@ -34,21 +34,9 @@ if ENABLE_32BIT
V8_BUILD_VERSION=ia32.release V8_BUILD_VERSION=ia32.release
endif endif
if ENABLE_DARWIN BUILT_SOURCES += $(V8_LIBS)
V8_BUILT_SOURCES = \ $(V8_LIBS):
@top_srcdir@/3rdParty/V8//libv8.a \
else
V8_BUILT_SOURCES = \
@top_srcdir@/3rdParty/V8/out/$(V8_BUILD_VERSION)/libv8_base.a \
@top_srcdir@/3rdParty/V8/out/$(V8_BUILD_VERSION)/libv8_nosnapshot.a
endif
BUILT_SOURCES += $(V8_BUILT_SOURCE)
$(V8_BUILT_SOURCE):
@echo @echo
@echo "--------------------------------------------------------------------------------" @echo "--------------------------------------------------------------------------------"
@echo "BUILDING V8" @echo "BUILDING V8"

10
m4/all-in-one.v8
View File

@ -7,10 +7,14 @@ dnl ----------------------------------------------------------------------------
V8_CPPFLAGS="-I${srcdir}/3rdParty/V8/include" V8_CPPFLAGS="-I${srcdir}/3rdParty/V8/include"
V8_LDFLAGS="" V8_LDFLAGS=""
if text "x$tr_BITS" == "x64"; then if test "x$tr_DARWIN" == xyes; then
V8_LIBS="${srcdir}/3rdParty/V8/out/x64.release/libv8_base.a ${srcdir}/3rdParty/V8/out/x64.release/libv8_nosnapshot.a" V8_LIBS="${srcdir}/3rdParty/V8/libv8.a"
else else
V8_LIBS="${srcdir}/3rdParty/V8/out/ia32.release/libv8_base.a ${srcdir}/3rdParty/V8/out/ia32.release/libv8_nosnapshot.a" if test "x$tr_BITS" == x64; then
V8_LIBS="${srcdir}/3rdParty/V8/out/x64.release/libv8_base.a ${srcdir}/3rdParty/V8/out/x64.release/libv8_nosnapshot.a"
else
V8_LIBS="${srcdir}/3rdParty/V8/out/ia32.release/libv8_base.a ${srcdir}/3rdParty/V8/out/ia32.release/libv8_nosnapshot.a"
fi
fi fi
TRI_V8_VERSION="3.9.4.0" TRI_V8_VERSION="3.9.4.0"

6
m4/configure.32bit
View File

@ -12,7 +12,7 @@ case $target_cpu in
;; ;;
esac esac
if text "x$tr_BITS" == "x64"; then if test "x$tr_BITS" == "x64"; then
AC_ARG_ENABLE(32bit, AC_ARG_ENABLE(32bit,
AS_HELP_STRING([--enable-32bit], [force 32bit compilation (default: no)]), AS_HELP_STRING([--enable-32bit], [force 32bit compilation (default: no)]),
@ -34,7 +34,7 @@ dnl ----------------------------------------------------------------------------
dnl informational output dnl informational output
dnl ----------------------------------------------------------------------------------------- dnl -----------------------------------------------------------------------------------------
if text "x$tr_BITS" == "x64"; then if test "x$tr_BITS" == "x64"; then
if test "x$tr_32BIT" = xyes; then if test "x$tr_32BIT" = xyes; then
BASIC_INFO="$BASIC_INFO|32bit: enabled" BASIC_INFO="$BASIC_INFO|32bit: enabled"
else else
@ -42,4 +42,4 @@ if text "x$tr_BITS" == "x64"; then
fi fi
else else
BASIC_INFO="$BASIC_INFO|32bit: enabled" BASIC_INFO="$BASIC_INFO|32bit: enabled"
fi fi

14
m4/configure.basics
View File

@ -12,6 +12,16 @@ AC_CANONICAL_BUILD
AC_CANONICAL_HOST AC_CANONICAL_HOST
AC_CANONICAL_TARGET AC_CANONICAL_TARGET
tr_DARWIN="no"
case $target in
*-apple-darwin*)
tr_DARWIN="yes"
;;
esac
AM_CONDITIONAL(ENABLE_DARWIN, test "x$tr_DARWIN" = xyes)
dnl ----------------------------------------------------------------------------------------- dnl -----------------------------------------------------------------------------------------
dnl use automake to generate Makfile.in dnl use automake to generate Makfile.in
dnl ----------------------------------------------------------------------------------------- dnl -----------------------------------------------------------------------------------------
@ -36,8 +46,6 @@ case $target in
list_cc="[gcc-4 gcc-3 gcc cc]" list_cc="[gcc-4 gcc-3 gcc cc]"
list_cxx="[g++-4 g++-3 g++ cxx]" list_cxx="[g++-4 g++-3 g++ cxx]"
tr_DARWIN="yes"
;; ;;
*) *)
@ -47,8 +55,6 @@ case $target in
;; ;;
esac esac
AM_CONDITIONAL(ENABLE_DARWIN, "x$tr_DARWIN" = "xyes")
AC_PROG_CXXCPP AC_PROG_CXXCPP
AC_PROG_CC($list_cc) AC_PROG_CC($list_cc)
AC_PROG_CXX($list_cxx) AC_PROG_CXX($list_cxx)