summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-01-15 13:44:13 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-16 11:57:33 +0000
commit2465f17c448bc69d85be896989d8a0ba15d35431 (patch)
tree469ee448daf794becc99ae1bf8ca9822d31aa9e4 /meta
parent46420331ef6eba032c63eda0b77bfdb9dcc80544 (diff)
downloadpoky-2465f17c448bc69d85be896989d8a0ba15d35431.tar.gz
polkit: replace obsolete automake macros with working ones
Add obsolete_automake_macros.patch that replaces automake macros no longer supported by automake-1.13 with modern constructs. (From OE-Core rev: 9f4cca12f00327bb9a7070f305c36433ee732d7a) Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/polkit/polkit-0.104/obsolete_automake_macros.patch23
-rw-r--r--meta/recipes-extended/polkit/polkit_0.104.bb3
2 files changed, 25 insertions, 1 deletions
diff --git a/meta/recipes-extended/polkit/polkit-0.104/obsolete_automake_macros.patch b/meta/recipes-extended/polkit/polkit-0.104/obsolete_automake_macros.patch
new file mode 100644
index 0000000000..5a6046cc38
--- /dev/null
+++ b/meta/recipes-extended/polkit/polkit-0.104/obsolete_automake_macros.patch
@@ -0,0 +1,23 @@
1Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=59091]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd polkit-0.104/configure.ac polkit-0.104/configure.ac
5--- polkit-0.104/configure.ac 2012-01-03 18:25:49.000000000 +0200
6+++ polkit-0.104/configure.ac 2013-01-07 03:13:31.862125625 +0200
7@@ -3,7 +3,7 @@
8 AC_PREREQ(2.59c)
9 AC_INIT(polkit, 0.104, http://lists.freedesktop.org/mailman/listinfo/polkit-devel)
10 AM_INIT_AUTOMAKE(polkit, 0.104)
11-AM_CONFIG_HEADER(config.h)
12+AC_CONFIG_HEADERS(config.h)
13 AM_MAINTAINER_MODE
14
15 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
16@@ -24,7 +24,6 @@
17
18 AC_ISC_POSIX
19 AC_PROG_CC
20-AM_PROG_CC_STDC
21 AC_HEADER_STDC
22 AM_PROG_LIBTOOL
23 AC_PROG_MAKE_SET
diff --git a/meta/recipes-extended/polkit/polkit_0.104.bb b/meta/recipes-extended/polkit/polkit_0.104.bb
index 4eaec8cacc..2c0aacaac3 100644
--- a/meta/recipes-extended/polkit/polkit_0.104.bb
+++ b/meta/recipes-extended/polkit/polkit_0.104.bb
@@ -10,13 +10,14 @@ DEPENDS = "expat glib-2.0 intltool-native gobject-introspection-stub"
10PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" 10PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
11PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=shadow,libpam,libpam" 11PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=shadow,libpam,libpam"
12 12
13PR = "r8" 13PR = "r9"
14 14
15PAM_SRC_URI = "file://polkit-1_pam.patch" 15PAM_SRC_URI = "file://polkit-1_pam.patch"
16SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar.gz \ 16SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar.gz \
17 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ 17 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
18 file://0001-PolkitUnixSession-Set-error-if-we-cannot-find-a-sess.patch \ 18 file://0001-PolkitUnixSession-Set-error-if-we-cannot-find-a-sess.patch \
19 file://0002-PolkitUnixSession-Actually-return-TRUE-if-a-session-.patch \ 19 file://0002-PolkitUnixSession-Actually-return-TRUE-if-a-session-.patch \
20 file://obsolete_automake_macros.patch \
20 " 21 "
21 22
22SRC_URI[md5sum] = "e380b4c6fb1e7bccf854e92edc0a8ce1" 23SRC_URI[md5sum] = "e380b4c6fb1e7bccf854e92edc0a8ce1"