summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorHenning Heinold <heinold@inf.fu-berlin.de>2008-09-27 16:23:59 +0000
committerHenning Heinold <heinold@inf.fu-berlin.de>2008-09-27 16:23:59 +0000
commit23e88e06a2cf63b687f4a82ca2e26111f1d8a878 (patch)
treed54d3a89160fc223f5ae2647804136e03d011f96 /packages
parent5805b4b78964b11ed7aef4773f6c495e67828558 (diff)
grub: fix version 0.97 for automake 1.10
* add patch from Kalev Lember * closes bug 4587 * bump PR
Diffstat (limited to 'packages')
-rw-r--r--packages/grub/grub-0.97/.mtn2git_empty0
-rw-r--r--packages/grub/grub-0.97/automake-1.10.patch16
-rw-r--r--packages/grub/grub_0.97.bb5
3 files changed, 19 insertions, 2 deletions
diff --git a/packages/grub/grub-0.97/.mtn2git_empty b/packages/grub/grub-0.97/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/grub/grub-0.97/.mtn2git_empty
diff --git a/packages/grub/grub-0.97/automake-1.10.patch b/packages/grub/grub-0.97/automake-1.10.patch
new file mode 100644
index 0000000000..e7c6ec061f
--- /dev/null
+++ b/packages/grub/grub-0.97/automake-1.10.patch
@@ -0,0 +1,16 @@
+--- grub-0.97/configure.ac.orig
++++ grub-0.97/configure.ac
+@@ -56,12 +56,7 @@
+
+ AC_CHECK_TOOL(CC, gcc)
+ AC_PROG_CC
+-# We need this for older versions of Autoconf.
+-_AM_DEPENDENCIES(CC)
+-
+-dnl Because recent automake complains about AS, set it here.
+-CCAS="$CC"
+-AC_SUBST(CCAS)
++AM_PROG_AS
+
+ AC_ARG_WITH(binutils,
+ [ --with-binutils=DIR search the directory DIR to find binutils])
diff --git a/packages/grub/grub_0.97.bb b/packages/grub/grub_0.97.bb
index 028a1a1a06..67fca242d4 100644
--- a/packages/grub/grub_0.97.bb
+++ b/packages/grub/grub_0.97.bb
@@ -3,9 +3,10 @@ HOMEPAGE = "http://www.gnu.org/software/grub"
SECTION = "bootloaders"
PRIORITY = "optional"
RDEPENDS = "diffutils"
-PR = "r2"
+PR = "r3"
-SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz"
+SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz \
+ file://automake-1.10.patch;patch=1"
inherit autotools