<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
</head>
<body text="#000000" bgcolor="#FFFFFF">
<p>On 03/10/18 15:37, Douglas Royds wrote:
<blockquote type="cite">
<meta http-equiv="Content-Type" content="text/html;
charset=utf-8">
I added "realpath" to the HOSTTOOLS, and precomputed a relative
path to the csu/ dir in git/Makerules.<br>
<blockquote><tt>csu-objpfx-relative = $(shell realpath
--relative-to=`pwd` $(csu-objpfx))/</tt><br>
</blockquote>
Seems to do the trick. I'll send a patch(ish) separately. </blockquote>
</p>
<p><br>
</p>
<p>Richard, this patch (perhaps) applies on top of your poky-contrib
branch. I've used `realpath` instead of your python oe-relpaths
script, just because it was there. Requires coreutils 8.23 or
later, I believe (Ubuntu 16.04 or later).<br>
</p>
<p><br>
</p>
<p>Subject: [PATCH] glibc: Fix non-IA reproducibility for shared
libraries<br>
<br>
Compute a relative path to build-arm-tait-linux-gnueabi/csu/<br>
for each library subdirectory.<br>
<br>
Signed-off-by: Douglas Royds <a class="moz-txt-link-rfc2396E" href="mailto:douglas.royds@taitradio.com"><douglas.royds@taitradio.com></a><br>
---<br>
meta/conf/bitbake.conf | 2 +-<br>
...34-reproducible-makehack-shared-libs.patch | 48
+++++++++++++++++++<br>
meta/recipes-core/glibc/glibc_2.28.bb | 1 +<br>
3 files changed, 50 insertions(+), 1 deletion(-)<br>
create mode 100644
meta/recipes-core/glibc/glibc/0034-reproducible-makehack-shared-libs.patch<br>
<br>
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf<br>
index 1941633a54..aa759b19a3 100644<br>
--- a/meta/conf/bitbake.conf<br>
+++ b/meta/conf/bitbake.conf<br>
@@ -482,7 +482,7 @@ HOSTTOOLS += " \<br>
fgrep file find flock g++ gawk gcc getconf getopt git grep
gunzip gzip \<br>
head hostname id install ld ldd ln ls make makeinfo md5sum
mkdir mknod \<br>
mktemp mv nm objcopy objdump od patch perl pod2man pr printf
pwd python python2 \<br>
- python2.7 python3 ranlib readelf readlink rm rmdir rpcgen sed
sh sha256sum \<br>
+ python2.7 python3 ranlib readelf readlink realpath rm rmdir
rpcgen sed sh sha256sum \<br>
sleep sort split stat strings strip tail tar tee test touch
tr true uname \<br>
uniq wc wget which xargs \<br>
"<br>
diff --git
a/meta/recipes-core/glibc/glibc/0034-reproducible-makehack-shared-libs.patch
b/meta/recipes-core/glibc/glibc/0034-reproducible-makehack-shared-libs.patch<br>
new file mode 100644<br>
index 0000000000..11902be523<br>
--- /dev/null<br>
+++
b/meta/recipes-core/glibc/glibc/0034-reproducible-makehack-shared-libs.patch<br>
@@ -0,0 +1,48 @@<br>
+diff --git a/Makerules b/Makerules<br>
+index a10a0b4d70..cacddb8784 100644<br>
+--- a/Makerules<br>
++++ b/Makerules<br>
+@@ -606,10 +606,11 @@ lib%.so: lib%_pic.a $(+preinit)
$(+postinit) $(link-libc-deps)<br>
+ $(build-shlib) $(link-libc-args)<br>
+ $(call after-link,$@)<br>
+ <br>
++csu-objpfx-relative = $(shell realpath --relative-to=`pwd`
$(csu-objpfx))/<br>
+ define build-shlib-helper<br>
+ $(LINK.o) -shared -static-libgcc -Wl,-O1 $(sysdep-LDFLAGS) \<br>
+ $(if $($(@F)-no-z-defs)$(no-z-defs),,-Wl,-z,defs)
$(rtld-LDFLAGS) \<br>
+- $(extra-B-$(@F:lib%.so=%).so) -B$(csu-objpfx) \<br>
++ $(extra-B-$(@F:lib%.so=%).so) -B$(csu-objpfx-relative) \<br>
+ $(extra-B-$(@F:lib%.so=%).so) $(load-map-file) \<br>
+
-Wl,-soname=lib$(libprefix)$(@F:lib%.so=%).so$($(@F)-version) \<br>
+ $(LDFLAGS.so) $(LDFLAGS-lib.so)
$(LDFLAGS-$(@F:lib%.so=%).so) \<br>
+@@ -662,13 +663,13 @@ endif<br>
+ <br>
+ define build-shlib<br>
+ $(build-shlib-helper) -o $@ $(shlib-lds-flags) \<br>
+- $(csu-objpfx)abi-note.o $(build-shlib-objlist)<br>
++ $(csu-objpfx-relative)abi-note.o $(build-shlib-objlist)<br>
+ endef<br>
+ <br>
+ define build-module-helper<br>
+ $(LINK.o) -shared -static-libgcc $(sysdep-LDFLAGS)
$(rtld-LDFLAGS) \<br>
+ $(if $($(@F)-no-z-defs)$(no-z-defs),,-Wl,-z,defs) \<br>
+- -B$(csu-objpfx) $(load-map-file) \<br>
++ -B$(csu-objpfx-relative) $(load-map-file) \<br>
+ $(LDFLAGS.so) $(LDFLAGS-$(@F:%.so=%).so) \<br>
+ -L$(subst :, -L,$(rpath-link))
-Wl,-rpath-link=$(rpath-link)<br>
+ endef<br>
+@@ -679,12 +680,12 @@ endef<br>
+ # not for shared objects<br>
+ define build-module<br>
+ $(build-module-helper) -o $@ $(shlib-lds-flags) \<br>
+- $(csu-objpfx)abi-note.o $(build-module-objlist)
$(link-libc-args)<br>
++ $(csu-objpfx-relative)abi-note.o $(build-module-objlist)
$(link-libc-args)<br>
+ $(call after-link,$@)<br>
+ endef<br>
+ define build-module-asneeded<br>
+ $(build-module-helper) -o $@ $(shlib-lds-flags) \<br>
+- $(csu-objpfx)abi-note.o \<br>
++ $(csu-objpfx-relative)abi-note.o \<br>
+ -Wl,--as-needed $(build-module-objlist) -Wl,--no-as-needed
\<br>
+ $(link-libc-args)<br>
+ $(call after-link,$@)<br>
diff --git a/meta/recipes-core/glibc/glibc_2.28.bb
b/meta/recipes-core/glibc/glibc_2.28.bb<br>
index 6ca89cbe2c..9d1d46bf28 100644<br>
--- a/meta/recipes-core/glibc/glibc_2.28.bb<br>
+++ b/meta/recipes-core/glibc/glibc_2.28.bb<br>
@@ -46,6 +46,7 @@ SRC_URI =
"${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \<br>
<a class="moz-txt-link-freetext" href="file://0029-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch">file://0029-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch</a>
\<br>
<a class="moz-txt-link-freetext" href="file://0030-intl-Emit-no-lines-in-bison-generated-files.patch">file://0030-intl-Emit-no-lines-in-bison-generated-files.patch</a> \<br>
<a class="moz-txt-link-freetext" href="file://0033-reproducible-makehack.patch">file://0033-reproducible-makehack.patch</a> \<br>
+ <a class="moz-txt-link-freetext" href="file://0034-reproducible-makehack-shared-libs.patch">file://0034-reproducible-makehack-shared-libs.patch</a> \<br>
"<br>
<br>
NATIVESDKFIXES ?= ""<br>
-- <br>
2.17.1<br>
<br>
<br>
</p>
</body>
</html>