[oe-commits] Martin Jansa : Revert "libmusicbrainz: workaround for build-native/ do_configure"

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 22b6b4aac2b8a5aa4c0e1e59c99a723ff5160d81
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=22b6b4aac2b8a5aa4c0e1e59c99a723ff5160d81

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sat Mar 15 15:18:58 2014 +0100

Revert "libmusicbrainz: workaround for build-native/do_configure"

This reverts commit 062adf31f84d20d4ad08f0c7b62c7ff043c80a99.

---

 .../musicbrainz/libmusicbrainz_git.bb              | 50 +---------------------
 1 file changed, 2 insertions(+), 48 deletions(-)

diff --git a/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb b/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb
index e5bc187..f6a8f53 100644
--- a/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb
+++ b/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=fbc093901857fcd118f065f900982c24"
 DEPENDS = "expat neon"
 
 PV = "5.0.1+git${SRCPV}"
-PR = "r2"
+PR = "r1"
 
 SRCREV = "0749dd0a35b4a54316da064475863a4ac6e28e7e"
 SRC_URI = "git://github.com/metabrainz/libmusicbrainz.git \
@@ -30,55 +30,9 @@ do_configure_prepend() {
           -DCMAKE_C_COMPILER=${BUILD_CC} \
           -DCMAKE_CXX_FLAGS=${BUILD_CXXFLAGS} \
           -DCMAKE_CXX_COMPILER=${BUILD_CXX} \
-          ${S}
+          ..
     make make-c-interface
     cd ..
-
-    # the first thing cmake_do_configure does is delete ${B}
-    # stash it first
-    cp -r build-native ..
-}
-
-# recreate default here, with work around for build-native
-cmake_do_configure() {
-	if [ "${OECMAKE_BUILDPATH}" -o "${OECMAKE_SOURCEPATH}" ]; then
-		bbnote "cmake.bbclass no longer uses OECMAKE_SOURCEPATH and OECMAKE_BUILDPATH.  The default behaviour is now out-of-tree builds with B=WORKDIR/build."
-	fi
-
-	if [ "${S}" != "${B}" ]; then
-		rm -rf ${B}
-		mkdir -p ${B}
-		cd ${B}
-	fi
-
-	# bring build-native back into build/
-	mv ../build-native .
-
-	# Just like autotools cmake can use a site file to cache result that need generated binaries to run
-	if [ -e ${WORKDIR}/site-file.cmake ] ; then
-		OECMAKE_SITEFILE=" -C ${WORKDIR}/site-file.cmake"
-	else
-		OECMAKE_SITEFILE=""
-	fi
-
-	cmake \
-	  ${OECMAKE_SITEFILE} \
-	  ${S} \
-	  -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
-	  -DCMAKE_INSTALL_BINDIR:PATH=${bindir} \
-	  -DCMAKE_INSTALL_SBINDIR:PATH=${sbindir} \
-	  -DCMAKE_INSTALL_LIBEXECDIR:PATH=${libexecdir} \
-	  -DCMAKE_INSTALL_SYSCONFDIR:PATH=${sysconfdir} \
-	  -DCMAKE_INSTALL_SHAREDSTATEDIR:PATH=${sharedstatedir} \
-	  -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=${localstatedir} \
-	  -DCMAKE_INSTALL_LIBDIR:PATH=${libdir} \
-	  -DCMAKE_INSTALL_INCLUDEDIR:PATH=${includedir} \
-	  -DCMAKE_INSTALL_DATAROOTDIR:PATH=${datadir} \
-	  -DCMAKE_INSTALL_SO_NO_EXE=0 \
-	  -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
-	  -DCMAKE_VERBOSE_MAKEFILE=1 \
-	  ${EXTRA_OECMAKE} \
-	  -Wno-dev
 }
 
 EXTRA_OECMAKE = "-DLIB_INSTALL_DIR:PATH=${libdir} \