summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-sato/eds/evolution-data-server/avoid_automake_errors.patch83
-rw-r--r--meta/recipes-sato/eds/evolution-data-server/fix_for_automake-1.12.x.patch28
-rw-r--r--meta/recipes-sato/eds/evolution-data-server_git.bb4
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 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3Avoid these warning-errors
4
5automake: warnings are treated as errors
6Makefile.am:15: warning: '%'-style pattern rules are a GNU make extension
7Makefile.am:21: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
8addressbook/backends/file/Makefile.am: installing './depcomp'
9addressbook/libebook/Makefile.am:55: warning: '%'-style pattern rules are a GNU make extension
10addressbook/libebook/Makefile.am:65: warning: '%'-style pattern rules are a GNU make extension
11addressbook/libebook/Makefile.am:66: warning: subst -,_,$*: non-POSIX variable name
12addressbook/libebook/Makefile.am:66: (probably a GNU make extension)
13addressbook/libebook/Makefile.am:72: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
14addressbook/libedata-book/Makefile.am:2: warning: '%'-style pattern rules are a GNU make extension
15addressbook/libedata-book/Makefile.am:3: warning: subst -,_,$*: non-POSIX variable name
16addressbook/libedata-book/Makefile.am:3: (probably a GNU make extension)
17glib-gen.mak:9: warning: '%'-style pattern rules are a GNU make extension
18addressbook/libedata-book/Makefile.am:5: 'glib-gen.mak' included from here
19glib-gen.mak:13: warning: '%'-style pattern rules are a GNU make extension
20addressbook/libedata-book/Makefile.am:5: 'glib-gen.mak' included from here
21glib-gen.mak:18: warning: '%'-style pattern rules are a GNU make extension
22addressbook/libedata-book/Makefile.am:5: 'glib-gen.mak' included from here
23glib-gen.mak:26: warning: '%'-style pattern rules are a GNU make extension
24addressbook/libedata-book/Makefile.am:5: 'glib-gen.mak' included from here
25glib-gen.mak:38: warning: '%'-style pattern rules are a GNU make extension
26addressbook/libedata-book/Makefile.am:5: 'glib-gen.mak' included from here
27glib-gen.mak:41: warning: '%'-style pattern rules are a GNU make extension
28addressbook/libedata-book/Makefile.am:5: 'glib-gen.mak' included from here
29addressbook/libedata-book/Makefile.am:86: warning: '%'-style pattern rules are a GNU make extension
30addressbook/libedata-book/Makefile.am:101: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
31calendar/backends/weather/Makefile.am:44: warning: '%'-style pattern rules are a GNU make extension
32calendar/libecal/Makefile.am:53: warning: '%'-style pattern rules are a GNU make extension
33calendar/libecal/Makefile.am:61: warning: '%'-style pattern rules are a GNU make extension
34calendar/libecal/Makefile.am:62: warning: subst -,_,$*: non-POSIX variable name
35calendar/libecal/Makefile.am:62: (probably a GNU make extension) calendar/libecal/Makefile.am:68: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
36calendar/libedata-cal/Makefile.am:5: warning: '%'-style pattern rules are a GNU make extension
37calendar/libedata-cal/Makefile.am:6: warning: subst -,_,$*: non-POSIX variable name
38calendar/libedata-cal/Makefile.am:6: (probably a GNU make extension)
39glib-gen.mak:9: warning: '%'-style pattern rules are a GNU make extension
40calendar/libedata-cal/Makefile.am:8: 'glib-gen.mak' included from here
41glib-gen.mak:13: warning: '%'-style pattern rules are a GNU make extension
42calendar/libedata-cal/Makefile.am:8: 'glib-gen.mak' included from here
43glib-gen.mak:18: warning: '%'-style pattern rules are a GNU make extension
44calendar/libedata-cal/Makefile.am:8: 'glib-gen.mak' included from here
45glib-gen.mak:26: warning: '%'-style pattern rules are a GNU make extension
46calendar/libedata-cal/Makefile.am:8: 'glib-gen.mak' included from here
47glib-gen.mak:38: warning: '%'-style pattern rules are a GNU make extension
48calendar/libedata-cal/Makefile.am:8: 'glib-gen.mak' included from here
49glib-gen.mak:41: warning: '%'-style pattern rules are a GNU make extension
50calendar/libedata-cal/Makefile.am:8: 'glib-gen.mak' included from here
51calendar/libedata-cal/Makefile.am:71: warning: '%'-style pattern rules are a GNU make extension
52calendar/libedata-cal/Makefile.am:86: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
53camel/Makefile.am:17: warning: '%'-style pattern rules are a GNU make extension
54libebackend/Makefile.am:35: warning: '%'-style pattern rules are a GNU make extension
55libebackend/Makefile.am:41: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
56libedataserver/Makefile.am:91: warning: '%'-style pattern rules are a GNU make extension
57libedataserver/Makefile.am:97: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
58libedataserverui/Makefile.am:108: warning: '%'-style pattern rules are a GNU make extension
59libedataserverui/Makefile.am:118: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
60servers/google/libgdata-google/Makefile.am:27: warning: '%'-style pattern rules are a GNU make extension
61servers/google/libgdata-google/Makefile.am:33: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
62servers/google/libgdata/Makefile.am:31: warning: '%'-style pattern rules are a GNU make extension
63servers/google/libgdata/Makefile.am:37: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
64servers/groupwise/Makefile.am:85: warning: '%'-style pattern rules are a GNU make extension
65servers/groupwise/Makefile.am:91: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
66autoreconf: automake failed with exit status: 1
67
68Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
692012/07/09
70
71Index: 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 @@
1Upstream-Status: Pending
2
3Fixed these kinds if warning-errors
4
5warning: 'libebookbackendfile.la': linking libtool libraries using a non-POSIX archiver requires 'AM_PROG_AR' in 'configure.ac'
6Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
72012/07/09
8
9Index: 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
13SRCREV = "3ca578d968d09785933ebbb45b66b3bccdbd5832" 13SRCREV = "3ca578d968d09785933ebbb45b66b3bccdbd5832"
14 14
15PV = "2.30+git${SRCPV}" 15PV = "2.30+git${SRCPV}"
16PR = "r0" 16PR = "r1"
17 17
18SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \ 18SRC_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
27S = "${WORKDIR}/git" 29S = "${WORKDIR}/git"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 19:50:39 +0000