On Tue, May 26, 2015 at 02:03:08PM +0200, Jérémie Courrèges-Anglas wrote:
> Christian Weisgerber <[email protected]> writes:
>
> > From the latest amd64 bulk build. These ports failed to build with
> > what are likely errors triggered by the switch to binutils-2.17:
>
> [...]
>
> > databases/riak
>
> Here's a diff that should fix it.
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/databases/riak/Makefile,v
> retrieving revision 1.15
> diff -u -p -r1.15 Makefile
> --- Makefile 16 Jan 2015 04:42:12 -0000 1.15
> +++ Makefile 26 May 2015 11:53:18 -0000
> @@ -2,6 +2,7 @@
>
> COMMENT= distributed data store
> DISTNAME= riak-2.0.4
> +REVISION= 0
> CATEGORIES= databases
> HOMEPAGE= http://basho.com/
>
> @@ -100,9 +101,17 @@ MODGNU_CONFIG_GUESS_DIRS = ${WRKCONF}
> CONFIGURE_STYLE = gnu
> CONFIGURE_ARGS += --with-pic --disable-gtest
>
> +snappy_AUTOCONF_VERSION = 2.65
> +snappy_AUTOMAKE_VERSION = 1.11
Why not just AUTOCONF_VERSION and AUTOMAKE_VERSION...
> WANTLIB = c crypto m ncurses pthread ssl stdc++ util mozjs nspr4 pam
> -LIB_DEPENDS = lang/spidermonkey security/openpam
> -BUILD_DEPENDS = lang/erlang>=16b.03
> +
> +BUILD_DEPENDS = lang/erlang>=16b.03
> +BUILD_DEPENDS+= devel/autoconf/${snappy_AUTOCONF_VERSION} \
> + devel/automake/${snappy_AUTOMAKE_VERSION} \
... this way you can just use ${MODGNU_AUTO*_DEPENDS}
> + devel/libtool
> +LIB_DEPENDS = lang/spidermonkey \
> + security/openpam
>
> versions:
> .for _n _v in ${RIAK_VERSIONS}
> @@ -119,6 +128,15 @@ pre-configure:
> ${WRKSRC}/rel/vars.config
> tar xzf ${WRKSRC}/deps/eleveldb/c_src/snappy-${SNAPPY_V}.tar.gz \
> -C ${WRKSRC}/deps/eleveldb/c_src
> + # tweak libtool to generate a static convenience (pic) snappy library
> + perl -pi \
> + -e 's/^lib_LTLIBRARIES/noinst_LTLIBRARIES/;' \
> + -e 's/^libsnappy_la_LDFLAGS/#$$&/;' \
> + ${WRKSRC}/deps/eleveldb/c_src/snappy-${SNAPPY_V}/Makefile.am
> + cd ${WRKSRC}/deps/eleveldb/c_src/snappy-${SNAPPY_V}/ && ${SETENV} \
> + AUTOCONF_VERSION=${snappy_AUTOCONF_VERSION} \
> + AUTOMAKE_VERSION=${snappy_AUTOMAKE_VERSION} \
> + ./autogen.sh
> mkdir -p ${WRKSRC}/rel/riak/etc
>
> do-install:
>
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
>
--
Antoine
