mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-07 05:10:20 +00:00
Code Issues Projects Releases Wiki Activity

polkit: do not hardcode the libdir

Browse Source 
libdir is defined as ${prefix}/lib/, but we want it to support multilib path

Signed-off-by: Chunrong Guo <B40290@freescale.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Chunrong Guo
2015-05-08 10:49:20 +08:00
committed by Martin Jansa
parent a61450e764
commit dce88e4a2c
2 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-extended/polkit/polkit/0001-do-not-hardcoded-libdir.patch
+44
View File
@@ -0,0 +1,44 @@
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
meta-oe/recipes-extended/polkit/polkit_0.112.bb
+1
View File
@@ -21,6 +21,7 @@ PAM_SRC_URI = "file://polkit-1_pam.patch"
SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar.gz \ SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar.gz \
${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
file://0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch \ file://0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch \
file://0001-do-not-hardcoded-libdir.patch \
" "
SRC_URI[md5sum] = "b0f2fa00a55f47c6a5d88e9b73f80127" SRC_URI[md5sum] = "b0f2fa00a55f47c6a5d88e9b73f80127"