cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Instead of running make install for snappy, get the headers and static

Browse Source 
library from its source tree. Should make it possible for dpb to build this.
This commit is contained in:
jmatthew 2013-11-01 12:37:46 +00:00
parent ed23a60a97
commit c00b3212ab
3 changed files with 45 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
databases/riak/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 2013/10/27 11:24:05 jmatthew Exp $
# $OpenBSD: Makefile,v 1.9 2013/11/01 12:37:46 jmatthew Exp $
COMMENT= distributed data store
DISTNAME= riak-1.4.2
@ -74,7 +74,8 @@ TOOLS_V 2.6.8 \
WEBMACHINE_V 1.10.4-0-gfcff795 \
WEBTOOL_V 0.8.9.1 \
WX_V 0.99.2 \
XMERL_V 1.3.2
XMERL_V 1.3.2 \
SNAPPY_V 1.0.4
.for _n _v in ${RIAK_VERSIONS}
${_n}=${_v}
@ -86,10 +87,10 @@ MAKE_ENV = MAKE=${MAKE_PROGRAM}
MAKE_FLAGS = rel
# configure bundled snappy correctly
SNAPPY_V = 1.0.4
WRKCONF = ${WRKSRC}/deps/eleveldb/c_src/snappy-${SNAPPY_V}
MODGNU_CONFIG_GUESS_DIRS = ${WRKCONF}
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += --with-pic
WANTLIB = c crypto m ncurses pthread ssl stdc++ util mozjs nspr4
LIB_DEPENDS = lang/erlang>=15b.02 lang/spidermonkey
@ -122,5 +123,3 @@ do-install:
.endfor
.include <bsd.port.mk>
CONFIGURE_ARGS = --with-pic --prefix=${WRKSRC}/deps/eleveldb/c_src/system

25
databases/riak/patches/patch-deps_eleveldb_c_src_build_deps_sh Normal file
View File

@ -0,0 +1,25 @@
$OpenBSD: patch-deps_eleveldb_c_src_build_deps_sh,v 1.1 2013/11/01 12:37:46 jmatthew Exp $
Don't try to install libsnappy. Instead, find the headers in the source
tree and get the static library from where it's built.
--- deps/eleveldb/c_src/build_deps.sh.orig Fri Aug 30 07:03:04 2013
+++ deps/eleveldb/c_src/build_deps.sh Tue Oct 29 07:18:53 2013
@@ -65,12 +65,12 @@
(cd snappy-$SNAPPY_VSN && ./configure --prefix=$BASEDIR/system --with-pic)
fi
- (cd snappy-$SNAPPY_VSN && $MAKE && $MAKE install)
+ (cd snappy-$SNAPPY_VSN && $MAKE)
- export CFLAGS="$CFLAGS -I $BASEDIR/system/include"
- export CXXFLAGS="$CXXFLAGS -I $BASEDIR/system/include"
- export LDFLAGS="$LDFLAGS -L$BASEDIR/system/lib"
- export LD_LIBRARY_PATH="$BASEDIR/system/lib:$LD_LIBRARY_PATH"
+ export CFLAGS="$CFLAGS -I $BASEDIR/snappy-$SNAPPY_VSN"
+ export CXXFLAGS="$CXXFLAGS -I $BASEDIR/snappy-$SNAPPY_VSN"
+ export LDFLAGS="$LDFLAGS -L$BASEDIR/snappy-$SNAPPY_VSN/.libs"
+ export LD_LIBRARY_PATH="$BASEDIR/snappy-$SNAPPY_VSN/.libs:$LD_LIBRARY_PATH"
if [ ! -d leveldb ]; then
git clone git://github.com/basho/leveldb

16
databases/riak/patches/patch-deps_eleveldb_rebar_config Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-deps_eleveldb_rebar_config,v 1.4 2013/11/01 12:37:46 jmatthew Exp $
link in libsnappy from its build tree rather than the installed location,
since running make install is problematic.
--- deps/eleveldb/rebar.config.orig Tue Oct 29 07:30:07 2013
+++ deps/eleveldb/rebar.config Tue Oct 29 07:29:52 2013
@@ -8,7 +8,7 @@
{"CFLAGS", "$CFLAGS -Wall -O3 -fPIC"},
{"CXXFLAGS", "$CXXFLAGS -Wall -O3 -fPIC"},
{"DRV_CFLAGS", "$DRV_CFLAGS -O3 -Wall -I c_src/leveldb/include"},
- {"DRV_LDFLAGS", "$DRV_LDFLAGS c_src/leveldb/libleveldb.a c_src/system/lib/libsnappy.a -lstdc++"}
+ {"DRV_LDFLAGS", "$DRV_LDFLAGS c_src/leveldb/libleveldb.a c_src/snappy-${SNAPPY_V}/.libs/libsnappy.a -lstdc++"}
]}.
{pre_hooks, [{'get-deps', "c_src/build_deps.sh get-deps"},