Merge pull request #739 from suvari/master

make: patched

system/devel/make/actions.py

@@ -10,6 +10,7 @@ from pisi.actionsapi import get
 from pisi.actionsapi import pisitools
 
 def setup():
+    autotools.autoreconf("-fi")
     autotools.configure("--enable-nls \
                          --program-prefix=g")
 

system/devel/make/files/guile-2.2.patch

@@ -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])])
+ ])
+ 

system/devel/make/pspec.xml

@@ -14,14 +14,16 @@
         <Description>Standard tool to compile source trees. Make gets its knowledge of how to build your program from a file called the makefile. When you write a program, you should write a makefile for it, so that it is possible to use Make to build and install the program</Description>
         <Archive sha1sum="7d9d11eb36cfb752da1fb11bb3e521d2a3cc8830" type="tarbz2">mirrors://gnu/make/make-4.2.1.tar.bz2</Archive>
         <BuildDependencies>
+            <Dependency>texinfo</Dependency>
             <Dependency>gettext</Dependency>
             <Dependency>gnuconfig</Dependency>
             <Dependency>patch</Dependency>
             <Dependency>gc-devel</Dependency>
-            <!--Dependency>guile-devel</Dependency-->
+            <Dependency>guile-devel</Dependency>
         </BuildDependencies>
         <Patches>
             <Patch>glibc_2_27.patch</Patch>
+            <Patch>guile-2.2.patch</Patch>
         </Patches>
     </Source>
 
@@ -42,7 +44,7 @@
 
     <History>
         <Update release="4">
-            <Date>2018-07-15</Date>
+            <Date>2018-07-18</Date>
             <Version>4.2.1</Version>
             <Comment>Rebuild</Comment>
             <Name>Ertuğrul Erata</Name>
@@ -70,4 +72,4 @@
             <Email>ertugrulerata@gmail.com</Email>
         </Update>
     </History>
-</PISI>
+</PISI>