Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

Make gcc-aarch64 reproducible (#366)

Browse source 
This fixes https://github.com/postmarketOS/binary-package-repo/issues/1

GCC generates hardlinks between files `A` and `B` in its `make install` step. The problem is, that `tar` randomly packages `A` as full binary, and links `B` to `A`, or the other way around! I was able to reproduce this issue consistently when re-building `gcc-aarch64` on Travis CI (interestingly, this did not appear for `gcc-armhf`).

The fix is, to delete `B` and create a symlink `B` that points to `A` instead.
This commit is contained in:
Oliver Smith 2017-08-12 14:06:02 +00:00 • committed by GitHub
parent f3f21d3152
commit c904ffc751
5 changed files with 104 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

38
pmb/aportgen/gcc.py
View file

@ -51,19 +51,10 @@ def generate(args, pkgname):
LANG_FORTRAN=false
LANG_ADA=false
options="!strip !tracedeps"
"""
replace_simple = {
# Do not package libstdc++, do not add "g++-$ARCH" here (already
# did that explicitly in the subpackages variable above, so
# pmbootstrap picks it up properly).
'*subpackages="$subpackages libstdc++:libcxx:*': None,
# libstdc++.a is not reproducible by default (.a files are archives of
# object files, and these object files are inside the .a file in a random
# order!). The best way would be to patch this upstream in gcc, but for now
# we repackage the .a files to make sure, that they are reproducible.
'*package() {*': """package() {
# Wrap the package function, to make the resulting package
# lazy-reproducible
package() {
# Repack the *.a files to be reproducible (see #64)
_temp="$_builddir"/_reproducible-patch
cd "$_builddir"
@ -83,7 +74,28 @@ def generate(args, pkgname):
cp -v sorted.a "$_builddir"/"$f"
cd ..
rm -r "$_temp"
done"""
done
# Unmodified package function from the gcc APKBUILD
_package
# Workaround for: postmarketOS/binary-package-repo#1
echo "Replacing hardlinks with symlinks"
rm -v "$pkgdir"/usr/bin/"$CTARGET"-c++
ln -s -v /usr/bin/"$CTARGET"-g++ "$pkgdir"/usr/bin/"$CTARGET"-c++
rm -v "$pkgdir"/usr/bin/"$CTARGET"-gcc-"$pkgver"
ln -s -v /usr/bin/"$CTARGET"-gcc "$pkgdir"/usr/bin/"$CTARGET"-gcc-"$pkgver"
}
"""
replace_simple = {
# Do not package libstdc++, do not add "g++-$ARCH" here (already
# did that explicitly in the subpackages variable above, so
# pmbootstrap picks it up properly).
'*subpackages="$subpackages libstdc++:libcxx:*': None,
# Rename package to _package, so we can wrap it (see above)
'*package() {*': "_package() {"
}
pmb.aportgen.core.rewrite(