From a5190f09dc70640679901730c264c932056a88c0 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Thu, 23 Jul 2015 15:21:05 -0700 Subject: [PATCH] net-libs/serf: Fix cross compile build error Ebuild fixups for cross compiling. Bumps serf-1.3.8.ebuild to serf-1.3.8-r1.ebuild. Signed-off-by: Geoff Levand --- .../serf/{serf-1.3.8.ebuild => serf-1.3.8-r1.ebuild} | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) rename sdk_container/src/third_party/coreos-overlay/net-libs/serf/{serf-1.3.8.ebuild => serf-1.3.8-r1.ebuild} (83%) diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/serf/serf-1.3.8.ebuild b/sdk_container/src/third_party/coreos-overlay/net-libs/serf/serf-1.3.8-r1.ebuild similarity index 83% rename from sdk_container/src/third_party/coreos-overlay/net-libs/serf/serf-1.3.8.ebuild rename to sdk_container/src/third_party/coreos-overlay/net-libs/serf/serf-1.3.8-r1.ebuild index 5fe4658eb9..bbedf91773 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-libs/serf/serf-1.3.8.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/net-libs/serf/serf-1.3.8-r1.ebuild @@ -30,19 +30,23 @@ src_prepare() { # https://code.google.com/p/serf/issues/detail?id=133 sed -e "/env.Append(CCFLAGS=\['-O2'\])/d" -i SConstruct + + # Accept C++ comments in system headers. + # Fixes error: expected identifier or '(' before '/' token + sed -e "s/-std=c89//" -i SConstruct } src_compile() { local myesconsargs=( PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" - APR="${EPREFIX}/usr/bin/apr-1-config" - APU="${EPREFIX}/usr/bin/apu-1-config" - OPENSSL="${EPREFIX}/usr" + APR="${EROOT}usr/bin/apr-1-config" + APU="${EROOT}usr/bin/apu-1-config" + OPENSSL="${EROOT}usr" CC="$(tc-getCC)" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" - LINKFLAGS="${LDFLAGS}" + LINKFLAGS="${LDFLAGS} --sysroot=${SYSROOT}" ) if use kerberos; then