diff options
-rw-r--r-- | meta-oe/recipes-extended/polkit/polkit/0001-do-not-hardcoded-libdir.patch | 44 | ||||
-rw-r--r-- | meta-oe/recipes-extended/polkit/polkit_0.113.bb | 5 |
2 files changed, 3 insertions, 46 deletions
diff --git a/meta-oe/recipes-extended/polkit/polkit/0001-do-not-hardcoded-libdir.patch b/meta-oe/recipes-extended/polkit/polkit/0001-do-not-hardcoded-libdir.patch deleted file mode 100644 index e605e30e65..0000000000 --- a/meta-oe/recipes-extended/polkit/polkit/0001-do-not-hardcoded-libdir.patch +++ /dev/null @@ -1,44 +0,0 @@ -From c9e09d9b101109832b1dcb050f0c8b588e276686 Mon Sep 17 00:00:00 2001 -From: Zhenhua Luo <zhenhua.luo@freescale.com> -Date: Mon, 4 May 2015 04:11:27 -0500 -Subject: [PATCH] do not hardcoded libdir - -Upstream-Status: Pending - -libdir is hardcoded to ${prefix}/lib, but we want it to support multilib - -Signed-off-by: Chunrong Guo <B40290@freescale.com> ---- - polkitagent/Makefile.am | 2 +- - polkitbackend/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/polkitagent/Makefile.am b/src/polkitagent/Makefile.am -index 3bc364e..7d1ac0e 100644 ---- a/src/polkitagent/Makefile.am -+++ b/src/polkitagent/Makefile.am -@@ -78,7 +78,7 @@ libpolkit_agent_1_la_LIBADD = \ - - libpolkit_agent_1_la_LDFLAGS = -export-symbols-regex '(^polkit_.*)' - --libprivdir = $(prefix)/lib/polkit-1 -+libprivdir = $(libdir)/polkit-1 - libpriv_PROGRAMS = polkit-agent-helper-1 - - polkit_agent_helper_1_SOURCES = \ -diff --git a/src/polkitbackend/Makefile.am b/src/polkitbackend/Makefile.am -index 9f430d0..1f7610b 100644 ---- a/src/polkitbackend/Makefile.am -+++ b/src/polkitbackend/Makefile.am -@@ -67,7 +67,7 @@ rules_DATA = 50-default.rules - - # ---------------------------------------------------------------------------------------------------- - --libprivdir = $(prefix)/lib/polkit-1 -+libprivdir = $(libdir)/polkit-1 - libpriv_PROGRAMS = polkitd - - polkitd_SOURCES = \ --- -2.3.3 - diff --git a/meta-oe/recipes-extended/polkit/polkit_0.113.bb b/meta-oe/recipes-extended/polkit/polkit_0.113.bb index 29e889615d..b85122e0b5 100644 --- a/meta-oe/recipes-extended/polkit/polkit_0.113.bb +++ b/meta-oe/recipes-extended/polkit/polkit_0.113.bb @@ -20,7 +20,6 @@ PACKAGECONFIG[consolekit] = ",,,consolekit" PAM_SRC_URI = "file://polkit-1_pam.patch" SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar.gz \ ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ - file://0001-do-not-hardcoded-libdir.patch \ " SRC_URI[md5sum] = "4b77776c9e4f897dcfe03b2c34198edf" SRC_URI[sha256sum] = "e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81" @@ -31,10 +30,12 @@ PACKAGES =+ "${PN}-examples" FILES_${PN} += " \ ${libdir}/${BPN}-1 \ + ${nonarch_libdir}/${BPN}-1 \ ${datadir}/dbus-1 \ ${datadir}/${BPN}-1 \ " -FILES_${PN}-dbg += "${libdir}/${BPN}-1/.debug" +FILES_${PN}-dbg += "${libdir}/${BPN}-1/.debug \ + ${nonarch_libdir}/${BPN}-1/.debug" FILES_${PN}-examples = "${bindir}/*example*" |