Small changes to build

This commit is contained in:
Gregory Burd 2011-11-08 23:09:16 -08:00
parent d3c05018f6
commit e9c260ad67
2 changed files with 15 additions and 12 deletions

View file

@ -54,8 +54,9 @@ case "$1" in
} }
} }
(cd ../../snappy && git archive --format=tar --prefix=snappy-$SNAPPY_VSN/ $SNAPPY_VSN) \ # (cd ../../snappy && git archive --format=tar --prefix=snappy-$SNAPPY_VSN/ $SNAPPY_VSN) \
| tar xf - # | tar xf -
tar -xzf snappy-$SNAPPY_VSN.tgz
(cd snappy-$SNAPPY_VSN && \ (cd snappy-$SNAPPY_VSN && \
sed -ibak '/^AC_ARG_WITH.*$/, /^fi$/d' configure.ac sed -ibak '/^AC_ARG_WITH.*$/, /^fi$/d' configure.ac
) )
@ -76,8 +77,9 @@ case "$1" in
fi fi
# leveldb # leveldb
if [ ! -f $BASEDIR/leveldb/lib/libleveldb.a ]; then if [ ! -f $BASEDIR/leveldb/lib/libleveldb.a ]; then
(cd ../../leveldb && git archive --format=tar --prefix=leveldb-$LEVELDB_VSN/ $LEVELDB_VSN) \ # (cd ../../leveldb && git archive --format=tar --prefix=leveldb-$LEVELDB_VSN/ $LEVELDB_VSN) \
| tar xf - # | tar xf -
tar -xf leveldb-$LEVELDB_VSN.tgz
(cd leveldb-$LEVELDB_VSN && \ (cd leveldb-$LEVELDB_VSN && \
echo "echo \"PLATFORM_CFLAGS+=-fPIC -I$BASEDIR/snappy/include\" >> build_config.mk" >> build_detect_platform && echo "echo \"PLATFORM_CFLAGS+=-fPIC -I$BASEDIR/snappy/include\" >> build_config.mk" >> build_detect_platform &&
echo "echo \"PLATFORM_LDFLAGS+=-L $BASEDIR/snappy/lib -lsnappy\" >> build_config.mk" >> build_detect_platform && echo "echo \"PLATFORM_LDFLAGS+=-L $BASEDIR/snappy/lib -lsnappy\" >> build_config.mk" >> build_detect_platform &&

View file

@ -3,13 +3,14 @@
%% Require OTP version R13B04 or R14 %% Require OTP version R13B04 or R14
{require_otp_vsn, "R13B04|R14"}. {require_otp_vsn, "R13B04|R14"}.
{lib_dirs, ["deps"]}.
%% Depends %% Depends
{deps_dir, "../"}. {deps, [% {meck, ".*", {git, "git://github.com/norton/meck.git", "meck"}}
{deps, [{meck, "", {git, "git://github.com/norton/meck.git"}} %, {edown, ".*", {git, "git://github.com/norton/edown.git", "edown"}}
, {edown, "", {git, "git://github.com/norton/edown.git"}} %, {asciiedoc, ".*", {git, "git://github.com/norton/asciiedoc.git", "asciidoc"}}
, {asciiedoc, "", {git, "git://github.com/norton/asciiedoc.git"}} %, {qc, ".*", {git, "git://github.com/norton/qc.git", "qc"}}
, {qc, "", {git, "git://github.com/norton/qc.git"}} %, {sext, ".*", {git, "git://github.com/norton/sext.git", "sext"}}
, {sext, "", {git, "git://github.com/norton/sext.git"}}
]}. ]}.
%% Erlang compiler options %% Erlang compiler options
@ -60,13 +61,13 @@
{compile, "c_src/build_deps.sh c_src/leveldb/lib/libleveldb.a"}]}. {compile, "c_src/build_deps.sh c_src/leveldb/lib/libleveldb.a"}]}.
%% port_sources %% port_sources
{port_sources, ["c_src/lets_drv_lib.cc" {port_sources, [ "c_src/lets_drv_lib.cc"
, "c_src/lets_drv.cc" , "c_src/lets_drv.cc"
, "c_src/lets_nif_lib.cc" , "c_src/lets_nif_lib.cc"
, "c_src/lets_nif.cc" , "c_src/lets_nif.cc"
]}. ]}.
%% so_specs %% so_specs
{so_specs, [{"priv/lib/lets_drv.so", ["c_src/lets_drv_lib.o", "c_src/lets_drv.o"]} {so_specs, [ {"priv/lib/lets_drv.so", ["c_src/lets_drv_lib.o", "c_src/lets_drv.o"]}
, {"priv/lib/lets_nif.so", ["c_src/lets_nif_lib.o", "c_src/lets_nif.o"]} , {"priv/lib/lets_nif.so", ["c_src/lets_nif_lib.o", "c_src/lets_nif.o"]}
]}. ]}.