helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-04-02 02:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

aufs-util: Use cross strip tool

Browse Source 
Honor the STRIP variable when passed from environment
Fixes build with musl/raspberrypi

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj 2017-09-06 20:57:54 -07:00 committed by Martin Jansa
parent 948132006e
commit 3bacc2323f
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
meta-filesystems/recipes-utils/aufs-util/aufs-util/0001-libau-Define-STRIP-weakly.patch Normal file
View File

@ -0,0 +1,39 @@
From bb8801fb21ac8d73e3b1a11a8555aaf822182a51 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 5 Sep 2017 10:36:52 -0700
Subject: [PATCH] libau: Define STRIP weakly
STRIP can be set on environment to use cross version of strip utility
hardcoding to strip is not working in cross environment
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Submitted
libau/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libau/Makefile b/libau/Makefile
index 81520ac..c25eef2 100644
--- a/libau/Makefile
+++ b/libau/Makefile
@@ -25,6 +25,7 @@ LibSoHdr = libau.h rdu.h
LibSoExport = $(addsuffix .exp, $(basename ${LibSoObj}))
LibSoExportErr = $(addsuffix .err, ${LibSoExport})
LibSoVerScript = verscript
+STRIP ?= strip
all: ${LibSo}
@@ -77,7 +78,7 @@ ${LibSo}.${LibSoMajor}.${LibSoMinor}: ${LibSoObj}
${CC} --shared -Wl,-soname,${LibSo}.${LibSoMajor} \
-Wl,--version-script,${LibSoVerScript} \
${LDFLAGS} -o $@ $^ ${LDLIBS}
- strip -R EXP $@
+ ${STRIP} -R EXP $@
# readelf --syms --use-dynamic libau.so
install_ulib: File = ${LibSo}.${LibSoMajor}.${LibSoMinor}
--
2.14.1

2
meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb
View File

@ -12,6 +12,7 @@ SRC_URI = "git://git.code.sf.net/p/aufs/aufs-util;protocol=git;branch=aufs4.4 \
https://raw.githubusercontent.com/sfjro/aufs4-linux/aufs4.4/include/uapi/linux/aufs_type.h;name=aufs_type \
file://aufs-util-don-t-strip-executables.patch \
file://aufs-util-add-tool-concept-to-Makefile-for-cross-com.patch \
file://0001-libau-Define-STRIP-weakly.patch \
"
SRC_URI[aufs_type.md5sum] = "f7b4a255dcb55fe7b0967f5f59b44f19"
SRC_URI[aufs_type.sha256sum] = "85bc8e4c1a94a7d526c382e4b047b4256cab8c4a65fc0396291707ad9a327a18"
@ -26,7 +27,6 @@ do_configure_prepend() {
sed -i -e 's;install_sbin: Tgt = ${DESTDIR}/sbin;install_sbin: Tgt = ${DESTDIR}/${base_sbindir};' \
-e 's;install_ubin: Tgt = ${DESTDIR}/usr/sbin;install_sbin: Tgt = ${DESTDIR}/${bindir};' \
${S}/Makefile
sed -i -e 's;strip -R;${STRIP} -R;' ${S}/libau/Makefile
}
do_configure_append () {