Date: Wednesday, March 29, 2017 @ 08:53:50 Author: bpiotrowski Revision: 291778
upgpkg: make 4.2.1-2 rebuild against guile 2.2 Added: make/trunk/guile-2.2.patch Modified: make/trunk/PKGBUILD -----------------+ PKGBUILD | 13 ++++++++++--- guile-2.2.patch | 15 +++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-03-29 08:19:49 UTC (rev 291777) +++ PKGBUILD 2017-03-29 08:53:50 UTC (rev 291778) @@ -4,7 +4,7 @@ pkgname=make pkgver=4.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="GNU make utility to maintain groups of programs" arch=('i686' 'x86_64') url="http://www.gnu.org/software/make" @@ -11,11 +11,18 @@ license=('GPL3') groups=('base-devel') depends=('glibc' 'guile') -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}) +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig} + guile-2.2.patch) md5sums=('15b012617e7c44c0ed482721629577ac' - 'SKIP') + 'SKIP' + '89bbbe3f806f208608e117665feb562b') validpgpkeys=('3D2554F0A15338AB9AF1BB9D96B047156338B6D4') # Paul Smith +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i ${srcdir}/guile-2.2.patch + autoreconf -fi +} build() { cd ${pkgname}-${pkgver} Added: guile-2.2.patch =================================================================== --- guile-2.2.patch (rev 0) +++ guile-2.2.patch 2017-03-29 08:53:50 UTC (rev 291778) @@ -0,0 +1,15 @@ +diff --git a/configure.ac b/configure.ac +index 64ec870..eb1139f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -168,8 +168,8 @@ AC_ARG_WITH([guile], [AS_HELP_STRING([--with-guile], + # comes with it's own PC file so we have to specify them as individual + # packages. Ugh. + AS_IF([test "x$with_guile" != xno], +-[ PKG_CHECK_MODULES([GUILE], [guile-2.0], [have_guile=yes], +- [PKG_CHECK_MODULES([GUILE], [guile-1.8], [have_guile=yes], ++[ PKG_CHECK_MODULES([GUILE], [guile-2.2], [have_guile=yes], ++ [PKG_CHECK_MODULES([GUILE], [guile-2.0], [have_guile=yes], + [have_guile=no])]) + ]) +