From 39e0e3fb6b35c5cce87aae11e354000cfc27142d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 18 Jul 2020 10:11:25 +0200 Subject: [PATCH] libmusicbrainz5: fix cross build --- srcpkgs/libmusicbrainz5/template | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/srcpkgs/libmusicbrainz5/template b/srcpkgs/libmusicbrainz5/template index 0fa574b37ee..7565f513e63 100644 --- a/srcpkgs/libmusicbrainz5/template +++ b/srcpkgs/libmusicbrainz5/template @@ -2,9 +2,8 @@ pkgname=libmusicbrainz5 version=5.1.0 revision=4 -build_style=cmake -make_build_args="make-c-interface all" wrksrc="libmusicbrainz-${version}" +build_style=cmake hostmakedepends="pkg-config" makedepends="neon-devel libxml2-devel" short_desc="Library That Provides Access to the MusicBrainz Server (5.x)" @@ -19,6 +18,10 @@ if [ "$CROSS_BUILD" ]; then fi pre_configure() { + # The line 'DEPENDS ... *.inc' in src/CMakeLists.txt produces this error: + # *** No rule to make target 'src/*.inc', needed by 'src/mb5_c.cc'. Stop. + # We do not edit the *.inc files thus just remove the '*.inc' + vsed -i src/CMakeLists.txt -e "s; \*\.inc;;" # Building for the host architecture is needed to generate C interface source files # see https://github.com/metabrainz/libmusicbrainz/blob/master/INSTALL.txt if [ "$CROSS_BUILD" ]; then @@ -26,14 +29,10 @@ pre_configure() { cd build-native CC=${CC_host} CFLAGS=${XBPS_CFLAGS} CXX=${CXX_host} \ CXXFLAGS=${XBPS_CXXFLAGS} LDFLAGS=${XBPS_LDFLAGS} cmake .. - make ${makejobs} make-c-interface + make ${makejobs} configure_args+=" -DIMPORT_EXECUTABLES=../build-native/ImportExecutables.cmake" cd .. fi - # The line 'DEPENDS ... *.inc' in src/CMakeLists.txt produces this error: - # *** No rule to make target 'src/*.inc', needed by 'src/mb5_c.cc'. Stop. - # We do not edit the *.inc files thus just remove the '*.inc' - vsed -i src/CMakeLists.txt -e "s; \*\.inc;;" } libmusicbrainz5-devel_package() {