diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-09-27 18:49:28 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-09-27 18:49:28 +0000 |
| commit | 98fee68c313537aeaf56617cf49cf67a10f1b8c5 (patch) | |
| tree | d52932d0069f9dbdf03a99cb51584e8b5edbb02f | |
| parent | 2f8ca4907776a3d69d8ceb15fd9b9b8e7acb436d (diff) | |
| parent | 23e88e06a2cf63b687f4a82ca2e26111f1d8a878 (diff) | |
merge of '42ff2b39da1a828b39b2827ebefd91262b2ea728'
and '513ef8343cdc8a1d5beb9c8fa5298efc58162ffe'
| -rw-r--r-- | packages/gnome/libgweather_2.24.0.bb | 2 | ||||
| -rw-r--r-- | packages/grub/grub-0.97/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/grub/grub-0.97/automake-1.10.patch | 16 | ||||
| -rw-r--r-- | packages/grub/grub_0.97.bb | 5 |
4 files changed, 20 insertions, 3 deletions
diff --git a/packages/gnome/libgweather_2.24.0.bb b/packages/gnome/libgweather_2.24.0.bb index 83fe45eb41..a8df7b1a84 100644 --- a/packages/gnome/libgweather_2.24.0.bb +++ b/packages/gnome/libgweather_2.24.0.bb @@ -1,5 +1,5 @@ LICENSE = "LGPL" -DEPENDS = "libgnome" +DEPENDS = "libgnome libsoup-2.4" inherit gnome 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 |