diff options
3 files changed, 114 insertions, 1 deletions
diff --git a/meta/recipes-sato/eds/evolution-data-server/avoid_automake_errors.patch b/meta/recipes-sato/eds/evolution-data-server/avoid_automake_errors.patch new file mode 100644 index 0000000000..ebf00c3941 --- /dev/null +++ b/meta/recipes-sato/eds/evolution-data-server/avoid_automake_errors.patch | |||
| @@ -0,0 +1,83 @@ | |||
| 1 | Upstream-Status: Inappropriate [embedded specific] | ||
| 2 | |||
| 3 | Avoid these warning-errors | ||
| 4 | |||
| 5 | automake: warnings are treated as errors | ||
| 6 | Makefile.am:15: warning: '%'-style pattern rules are a GNU make extension | ||
| 7 | Makefile.am:21: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name | ||
| 8 | addressbook/backends/file/Makefile.am: installing './depcomp' | ||
| 9 | addressbook/libebook/Makefile.am:55: warning: '%'-style pattern rules are a GNU make extension | ||
| 10 | addressbook/libebook/Makefile.am:65: warning: '%'-style pattern rules are a GNU make extension | ||
| 11 | addressbook/libebook/Makefile.am:66: warning: subst -,_,$*: non-POSIX variable name | ||
| 12 | addressbook/libebook/Makefile.am:66: (probably a GNU make extension) | ||
| 13 | addressbook/libebook/Makefile.am:72: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name | ||
| 14 | addressbook/libedata-book/Makefile.am:2: warning: '%'-style pattern rules are a GNU make extension | ||
| 15 | addressbook/libedata-book/Makefile.am:3: warning: subst -,_,$*: non-POSIX variable name | ||
| 16 | addressbook/libedata-book/Makefile.am:3: (probably a GNU make extension) | ||
| 17 | glib-gen.mak:9: warning: '%'-style pattern rules are a GNU make extension | ||
| 18 | addressbook/libedata-book/Makefile.am:5: 'glib-gen.mak' included from here | ||
| 19 | glib-gen.mak:13: warning: '%'-style pattern rules are a GNU make extension | ||
| 20 | addressbook/libedata-book/Makefile.am:5: 'glib-gen.mak' included from here | ||
| 21 | glib-gen.mak:18: warning: '%'-style pattern rules are a GNU make extension | ||
| 22 | addressbook/libedata-book/Makefile.am:5: 'glib-gen.mak' included from here | ||
| 23 | glib-gen.mak:26: warning: '%'-style pattern rules are a GNU make extension | ||
| 24 | addressbook/libedata-book/Makefile.am:5: 'glib-gen.mak' included from here | ||
| 25 | glib-gen.mak:38: warning: '%'-style pattern rules are a GNU make extension | ||
| 26 | addressbook/libedata-book/Makefile.am:5: 'glib-gen.mak' included from here | ||
| 27 | glib-gen.mak:41: warning: '%'-style pattern rules are a GNU make extension | ||
| 28 | addressbook/libedata-book/Makefile.am:5: 'glib-gen.mak' included from here | ||
| 29 | addressbook/libedata-book/Makefile.am:86: warning: '%'-style pattern rules are a GNU make extension | ||
| 30 | addressbook/libedata-book/Makefile.am:101: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name | ||
| 31 | calendar/backends/weather/Makefile.am:44: warning: '%'-style pattern rules are a GNU make extension | ||
| 32 | calendar/libecal/Makefile.am:53: warning: '%'-style pattern rules are a GNU make extension | ||
| 33 | calendar/libecal/Makefile.am:61: warning: '%'-style pattern rules are a GNU make extension | ||
| 34 | calendar/libecal/Makefile.am:62: warning: subst -,_,$*: non-POSIX variable name | ||
| 35 | calendar/libecal/Makefile.am:62: (probably a GNU make extension) calendar/libecal/Makefile.am:68: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name | ||
| 36 | calendar/libedata-cal/Makefile.am:5: warning: '%'-style pattern rules are a GNU make extension | ||
| 37 | calendar/libedata-cal/Makefile.am:6: warning: subst -,_,$*: non-POSIX variable name | ||
| 38 | calendar/libedata-cal/Makefile.am:6: (probably a GNU make extension) | ||
| 39 | glib-gen.mak:9: warning: '%'-style pattern rules are a GNU make extension | ||
| 40 | calendar/libedata-cal/Makefile.am:8: 'glib-gen.mak' included from here | ||
| 41 | glib-gen.mak:13: warning: '%'-style pattern rules are a GNU make extension | ||
| 42 | calendar/libedata-cal/Makefile.am:8: 'glib-gen.mak' included from here | ||
| 43 | glib-gen.mak:18: warning: '%'-style pattern rules are a GNU make extension | ||
| 44 | calendar/libedata-cal/Makefile.am:8: 'glib-gen.mak' included from here | ||
| 45 | glib-gen.mak:26: warning: '%'-style pattern rules are a GNU make extension | ||
| 46 | calendar/libedata-cal/Makefile.am:8: 'glib-gen.mak' included from here | ||
| 47 | glib-gen.mak:38: warning: '%'-style pattern rules are a GNU make extension | ||
| 48 | calendar/libedata-cal/Makefile.am:8: 'glib-gen.mak' included from here | ||
| 49 | glib-gen.mak:41: warning: '%'-style pattern rules are a GNU make extension | ||
| 50 | calendar/libedata-cal/Makefile.am:8: 'glib-gen.mak' included from here | ||
| 51 | calendar/libedata-cal/Makefile.am:71: warning: '%'-style pattern rules are a GNU make extension | ||
| 52 | calendar/libedata-cal/Makefile.am:86: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name | ||
| 53 | camel/Makefile.am:17: warning: '%'-style pattern rules are a GNU make extension | ||
| 54 | libebackend/Makefile.am:35: warning: '%'-style pattern rules are a GNU make extension | ||
| 55 | libebackend/Makefile.am:41: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name | ||
| 56 | libedataserver/Makefile.am:91: warning: '%'-style pattern rules are a GNU make extension | ||
| 57 | libedataserver/Makefile.am:97: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name | ||
| 58 | libedataserverui/Makefile.am:108: warning: '%'-style pattern rules are a GNU make extension | ||
| 59 | libedataserverui/Makefile.am:118: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name | ||
| 60 | servers/google/libgdata-google/Makefile.am:27: warning: '%'-style pattern rules are a GNU make extension | ||
| 61 | servers/google/libgdata-google/Makefile.am:33: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name | ||
| 62 | servers/google/libgdata/Makefile.am:31: warning: '%'-style pattern rules are a GNU make extension | ||
| 63 | servers/google/libgdata/Makefile.am:37: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name | ||
| 64 | servers/groupwise/Makefile.am:85: warning: '%'-style pattern rules are a GNU make extension | ||
| 65 | servers/groupwise/Makefile.am:91: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name | ||
| 66 | autoreconf: automake failed with exit status: 1 | ||
| 67 | |||
| 68 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
| 69 | 2012/07/09 | ||
| 70 | |||
| 71 | Index: git/configure.ac | ||
| 72 | =================================================================== | ||
| 73 | --- git.orig/configure.ac | ||
| 74 | +++ git/configure.ac | ||
| 75 | @@ -21,7 +21,7 @@ m4_define([api_version], [1.2]) | ||
| 76 | dnl Autoconf / Automake Initialization | ||
| 77 | AC_PREREQ(2.58) | ||
| 78 | AC_INIT([evolution-data-server],[eds_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution-Data-Server]) | ||
| 79 | -AM_INIT_AUTOMAKE([gnu 1.9 tar-ustar -Wall -Werror foreign]) | ||
| 80 | +AM_INIT_AUTOMAKE([gnu 1.9 tar-ustar -Wall foreign]) | ||
| 81 | AC_CONFIG_MACRO_DIR([m4]) | ||
| 82 | AC_CONFIG_SRCDIR(README) | ||
| 83 | AC_CONFIG_HEADERS(config.h) | ||
diff --git a/meta/recipes-sato/eds/evolution-data-server/fix_for_automake-1.12.x.patch b/meta/recipes-sato/eds/evolution-data-server/fix_for_automake-1.12.x.patch new file mode 100644 index 0000000000..ac77a6d5a5 --- /dev/null +++ b/meta/recipes-sato/eds/evolution-data-server/fix_for_automake-1.12.x.patch | |||
| @@ -0,0 +1,28 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | |||
| 3 | Fixed these kinds if warning-errors | ||
| 4 | |||
| 5 | warning: 'libebookbackendfile.la': linking libtool libraries using a non-POSIX archiver requires 'AM_PROG_AR' in 'configure.ac' | ||
| 6 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
| 7 | 2012/07/09 | ||
| 8 | |||
| 9 | Index: git/configure.ac | ||
| 10 | =================================================================== | ||
| 11 | --- git.orig/configure.ac | ||
| 12 | +++ git/configure.ac | ||
| 13 | @@ -17,6 +17,7 @@ dnl This number is meaningless, but we'r | ||
| 14 | dnl library names for backward compatibility. | ||
| 15 | m4_define([api_version], [1.2]) | ||
| 16 | |||
| 17 | + | ||
| 18 | dnl Autoconf / Automake Initialization | ||
| 19 | AC_PREREQ(2.58) | ||
| 20 | AC_INIT([evolution-data-server],[eds_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution-Data-Server]) | ||
| 21 | @@ -30,6 +31,7 @@ AC_LANG(C) | ||
| 22 | |||
| 23 | dnl Automake 1.11 - Silent Build Rules | ||
| 24 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) | ||
| 25 | +m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12 | ||
| 26 | |||
| 27 | dnl Required Package Versions | ||
| 28 | m4_define([glib_minimum_version], [2.16.1]) | ||
diff --git a/meta/recipes-sato/eds/evolution-data-server_git.bb b/meta/recipes-sato/eds/evolution-data-server_git.bb index 17724cec6a..2ad81e48b1 100644 --- a/meta/recipes-sato/eds/evolution-data-server_git.bb +++ b/meta/recipes-sato/eds/evolution-data-server_git.bb | |||
| @@ -13,7 +13,7 @@ DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libi | |||
| 13 | SRCREV = "3ca578d968d09785933ebbb45b66b3bccdbd5832" | 13 | SRCREV = "3ca578d968d09785933ebbb45b66b3bccdbd5832" |
| 14 | 14 | ||
| 15 | PV = "2.30+git${SRCPV}" | 15 | PV = "2.30+git${SRCPV}" |
| 16 | PR = "r0" | 16 | PR = "r1" |
| 17 | 17 | ||
| 18 | SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \ | 18 | SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \ |
| 19 | file://oh-contact.patch;striplevel=0 \ | 19 | file://oh-contact.patch;striplevel=0 \ |
| @@ -22,6 +22,8 @@ SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \ | |||
| 22 | file://new-contact-fix.patch \ | 22 | file://new-contact-fix.patch \ |
| 23 | file://old-gdk-api.patch \ | 23 | file://old-gdk-api.patch \ |
| 24 | file://depbuildfix.patch \ | 24 | file://depbuildfix.patch \ |
| 25 | file://fix_for_automake-1.12.x.patch \ | ||
| 26 | file://avoid_automake_errors.patch \ | ||
| 25 | file://iconv-detect.h" | 27 | file://iconv-detect.h" |
| 26 | 28 | ||
| 27 | S = "${WORKDIR}/git" | 29 | S = "${WORKDIR}/git" |
