From d367f6cb86ad10d7aa8f27a53da5117da0ccbee3 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Wed, 30 Dec 2020 16:51:42 -0600 Subject: [PATCH] gavl: use better cross-compile patch --- .../gavl/patches/0001-fix-cross-build.patch | 24 +++++++++++++++++++ srcpkgs/gavl/patches/cross-test.patch | 13 ---------- srcpkgs/gavl/template | 7 ++++-- 3 files changed, 29 insertions(+), 15 deletions(-) create mode 100644 srcpkgs/gavl/patches/0001-fix-cross-build.patch delete mode 100644 srcpkgs/gavl/patches/cross-test.patch diff --git a/srcpkgs/gavl/patches/0001-fix-cross-build.patch b/srcpkgs/gavl/patches/0001-fix-cross-build.patch new file mode 100644 index 00000000000000..86caa7aeb9af4d --- /dev/null +++ b/srcpkgs/gavl/patches/0001-fix-cross-build.patch @@ -0,0 +1,24 @@ +From 724b4c1819e833b22f7546c9768e1034996fa337 Mon Sep 17 00:00:00 2001 +From: Nathan Owens +Date: Wed, 30 Dec 2020 16:48:44 -0600 +Subject: [PATCH] fix cross build + +AC_TRY_RUN will fail with cross, +use AC_COMPILE_IFELSE instead +--- +diff --git configure.ac configure.ac +index 60fc968..d6e5eee 100644 +--- configure.ac ++++ configure.ac +@@ -159,7 +159,7 @@ LIBS=$RT_LIBS + + AC_MSG_CHECKING(for CLOCK_MONOTONIC) + +-AC_TRY_RUN([ ++AC_COMPILE_IFELSE([ + #include + #include + main() +-- +2.30.0 + diff --git a/srcpkgs/gavl/patches/cross-test.patch b/srcpkgs/gavl/patches/cross-test.patch deleted file mode 100644 index 81a81a2f167375..00000000000000 --- a/srcpkgs/gavl/patches/cross-test.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git configure configure -index d3702c3..79a958b 100755 ---- configure -+++ configure -@@ -11188,7 +11188,7 @@ LIBS=$RT_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLOCK_MONOTONIC" >&5 - $as_echo_n "checking for CLOCK_MONOTONIC... " >&6; } - --if test "$cross_compiling" = yes; then : -+if test "$cross_compiling" = xxx; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - as_fn_error "cannot run test program while cross compiling diff --git a/srcpkgs/gavl/template b/srcpkgs/gavl/template index 0f5f50d9356563..e86817f94eb89f 100644 --- a/srcpkgs/gavl/template +++ b/srcpkgs/gavl/template @@ -3,14 +3,17 @@ pkgname=gavl version=1.4.0 revision=4 build_style=gnu-configure -hostmakedepends="doxygen" +hostmakedepends="automake doxygen libtool" short_desc="Low level library, upon which multimedia APIs can be built" maintainer="Logen K " license="GPL-3.0-or-later" homepage="http://gmerlin.sourceforge.net/gavl.html" distfiles="${SOURCEFORGE_SITE}/gmerlin/gavl/${version}/gavl-${version}.tar.gz" checksum=51aaac41391a915bd9bad07710957424b046410a276e7deaff24a870929d33ce -CFLAGS="-lm" + +pre_configure() { + autoreconf -fi +} gavl-devel_package() { depends="gavl>=${version}_${revision}"