From a2fab33ace916f68168e2444f47d0cce9cd04ea5 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 22 Aug 2014 15:40:23 -0400 Subject: protobuf: respect autotools build/source split Tweak the ptest build rule to look for artifacts in the build directory instead of source, since build and source are split on the latest oe-core. Signed-off-by: Bruce Ashfield --- recipes-containers/criu/protobuf_2.5.0.bb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'recipes-containers/criu') diff --git a/recipes-containers/criu/protobuf_2.5.0.bb b/recipes-containers/criu/protobuf_2.5.0.bb index 5c7454b5..a85fd87a 100644 --- a/recipes-containers/criu/protobuf_2.5.0.bb +++ b/recipes-containers/criu/protobuf_2.5.0.bb @@ -34,12 +34,14 @@ do_compile_ptest() { # Modify makefile to use the cross-compiler sed -e "s|c++|${CXX}|g" -i "${S}/${TEST_SRC_DIR}/Makefile" + mkdir -p "${B}/${TEST_SRC_DIR}" + # Add the location of the cross-compiled header and library files # which haven't been installed yet. - cp "${S}/protobuf.pc" "${S}/${TEST_SRC_DIR}/protobuf.pc" - sed -e 's|Cflags:|Cflags: -I${S}/src|' -i "${S}/${TEST_SRC_DIR}/protobuf.pc" - sed -e 's|Libs:|Libs: -L${S}/src/.libs|' -i "${S}/${TEST_SRC_DIR}/protobuf.pc" - export PKG_CONFIG_PATH="${S}/${TEST_SRC_DIR}" + cp "${B}/protobuf.pc" "${B}/${TEST_SRC_DIR}/protobuf.pc" + sed -e 's|Cflags:|Cflags: -I${S}/src|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" + sed -e 's|Libs:|Libs: -L${B}/src/.libs|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" + export PKG_CONFIG_PATH="${B}/${TEST_SRC_DIR}" # Save the pkgcfg sysroot variable, and update it to nothing so # that it doesn't append the sysroot to the beginning of paths. -- cgit v1.2.3-54-g00ecf