On Sat, May 8, 2021 at 4:21 PM Khem Raj <raj.k...@gmail.com> wrote:
>
> Build the native tools via a proper native recipe
> Once done this way we do not need any patches
>
> Signed-off-by: Khem Raj <raj.k...@gmail.com>
> Cc: Andreas Müller <schnitzelt...@gmail.com>
> ---
> .../files/allow-libdir-override.patch | 21 ------------
> .../musicbrainz/libmusicbrainz_git.bb | 34 +++++--------------
> 2 files changed, 9 insertions(+), 46 deletions(-)
> delete mode 100644
> meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch
>
> diff --git
> a/meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch
>
> b/meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch
> deleted file mode 100644
> index db4d6e8c99..0000000000
> ---
> a/meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch
> +++ /dev/null
> @@ -1,21 +0,0 @@
> -Allow LIB_INSTALL_DIR to be set by the the cmake configure invocation. We
> dont
> -easily have a way of determining something that patches ${LIB_SUFFIX} so
> we'll
> -set LIB_INSTALL_DIR.
> -
> -Upstream-Status: Inappropriate [configuration]
> -
> -Signed-off-by: Kumar Gala <ga...@kernel.crashing.org>
> -
> -Index: git/CMakeLists.txt
> -===================================================================
> ---- git.orig/CMakeLists.txt
> -+++ git/CMakeLists.txt
> -@@ -36,7 +36,7 @@ FIND_PACKAGE(LibXml2 REQUIRED)
> - SET(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
> - SET(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Installation
> prefix for executables and object code libraries" FORCE)
> - SET(BIN_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/bin CACHE PATH "Installation
> prefix for user executables" FORCE)
> --SET(LIB_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH
> "Installation prefix for object code libraries" FORCE)
> -+SET(LIB_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH
> "Installation prefix for object code libraries")
> - SET(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include CACHE PATH
> "Installation prefix for C header files" FORCE)
> -
> - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libmusicbrainz5.pc.cmake
> ${CMAKE_CURRENT_BINARY_DIR}/libmusicbrainz5.pc)
> diff --git
> a/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb
> b/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb
> index ca9d94a19c..f5ea36da91 100644
> --- a/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb
> +++ b/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb
> @@ -3,38 +3,22 @@ DESCRIPTION = "The MusicBrainz client is a library which
> can be built into other
> HOMEPAGE = "http://musicbrainz.org";
> LICENSE = "LGPLv2.1+"
> LIC_FILES_CHKSUM = "file://COPYING.txt;md5=fbc093901857fcd118f065f900982c24"
> -DEPENDS = "expat libxml2 libxml2-native neon neon-native"
> +DEPENDS = "expat libxml2 libxml2-native neon neon-native
> libmusicbrainz-native"
>
> PV = "5.1.0+git${SRCPV}"
>
> -SRCREV = "44c05779dd996035758f5ec426766aeedce29cc3"
> -SRC_URI = "git://github.com/metabrainz/libmusicbrainz.git \
> - file://allow-libdir-override.patch "
> +SRCREV = "8be45b12a86bc0e46f2f836c8ac88e1e98d82aee"
^ This was not mentioned in description. Is PV still valid?
Cheers
Andreas
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#91191):
https://lists.openembedded.org/g/openembedded-devel/message/91191
Mute This Topic: https://lists.openembedded.org/mt/82678727/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
