From 98841e67aacb756a5364cce2e62e9136e3d4e4c0 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 9 Oct 2017 17:03:19 +0000 Subject: [PATCH] libgfshare: simplify cross build --- srcpkgs/libgfshare/patches/cross.patch | 11 +++++++++++ srcpkgs/libgfshare/template | 19 +++---------------- 2 files changed, 14 insertions(+), 16 deletions(-) create mode 100644 srcpkgs/libgfshare/patches/cross.patch diff --git a/srcpkgs/libgfshare/patches/cross.patch b/srcpkgs/libgfshare/patches/cross.patch new file mode 100644 index 0000000000..1c5ba1b224 --- /dev/null +++ b/srcpkgs/libgfshare/patches/cross.patch @@ -0,0 +1,11 @@ +--- Makefile.am.orig 2015-06-01 18:48:30.000000000 +0000 ++++ Makefile.am 2017-10-09 16:55:49.722491139 +0000 +@@ -19,8 +19,6 @@ + include_HEADERS = include/libgfshare.h + + $(top_srcdir)/src/libgfshare.c: libgfshare_tables.h +-libgfshare_tables.h: gfshare_maketable$(EXEEXT) +- ./gfshare_maketable$(EXEEXT) > libgfshare_tables.h + + # And provide for the pkgconfigness + pkgconfigdir = $(libdir)/pkgconfig diff --git a/srcpkgs/libgfshare/template b/srcpkgs/libgfshare/template index 90952557b9..9f94d0b304 100644 --- a/srcpkgs/libgfshare/template +++ b/srcpkgs/libgfshare/template @@ -3,7 +3,7 @@ pkgname=libgfshare version=2.0.0 revision=3 build_style=gnu-configure -hostmakedepends="pkg-config" +hostmakedepends="automake libtool pkg-config" short_desc="Shamir's secret-sharing method in the Galois Field GF(2**8)" maintainer="lemmi " license="MIT" @@ -11,14 +11,8 @@ homepage="https://git.gitano.org.uk/libgfshare.git" distfiles="http://www.digital-scurf.org/files/libgfshare/libgfshare-${version}.tar.bz2" checksum=86f602860133c828356b7cf7b8c319ba9b27adf70a624fe32275ba1ed268331f -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" libgfshare-maketable" -fi - -pre_build() { - if [ "$CROSS_BUILD" ]; then - sed -i -e 's#\.\/gfshare_maketable#gfshare_maketable#' Makefile - fi +pre_configure() { + autoreconf -fi } post_install() { @@ -45,10 +39,3 @@ libgfshare-tools_package() { vmove usr/share/man/man1/gfsplit.1 } } - -libgfshare-maketable_package() { - short_desc+="tables for libgfshare" - pkg_install() { - vbin gfshare_maketable - } -}