guix: document when certain patches can be dropped #27668

fanquake commented at 9:12 AM on May 16, 2023: member

Additional notes for when patches can be dropped.

guix: document when certain guix patches can be dropped a09269a146

fanquake requested review from TheCharlatan on May 16, 2023

DrahtBot commented at 9:12 AM on May 16, 2023: contributor

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Reviews

See the guideline for information on the review process.

Type	Reviewers
ACK	hebasto, jarolrod

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

DrahtBot added the label Build system on May 16, 2023

in contrib/guix/patches/glibc-2.27-fcommon.patch:20 in a09269a146

  16 | @@ -17,6 +17,8 @@ Date:   Fri May 6 11:03:04 2022 +0100
  17 |      https://sourceware.org/git/?p=glibc.git;a=commit;h=18363b4f010da9ba459b13310b113ac0647c2fcc
  18 |      https://sourceware.org/git/?p=glibc.git;a=commit;h=7650321ce037302bfc2f026aa19e0213b8d02fe6
  19 |  
  20 | +    This patch can be dropped when we are building with glibc 2.31+.

hebasto commented at 9:44 AM on May 16, 2023:

According to https://sourceware.org/bugzilla/show_bug.cgi?id=26332:

Fixed for glibc 2.32.

hebasto commented at 10:02 AM on May 16, 2023:

"2.31+" means ">=2.31", right?

fanquake commented at 10:10 AM on May 16, 2023:

According to https://sourceware.org/bugzilla/show_bug.cgi?id=26332:

According to the same thread it was backported to 2.31. Which is all that matters for us.

"2.31+" means ">=2.31", right?

Yes.

in contrib/guix/patches/glibc-2.27-guix-prefix.patch:8 in a09269a146

   4 | @@ -5,7 +5,7 @@ In order to be reproducible regardless of the architecture used to build
   5 |  the package, map all guix store prefixes to something fixed, e.g. /usr.
   6 |  
   7 |  We might be able to drop this in favour of using --with-nonshared-cflags
   8 | -when we being using newer versions of glibc.
   9 | +when we begin using newer versions of glibc.

hebasto commented at 9:52 AM on May 16, 2023:

As the --with-nonshared-cflags was introduced in glibc 2.29, does it mean we can be more explicit about "newer version"?

fanquake commented at 10:12 AM on May 16, 2023:

I don't think that gains us anything here, as it's implied we can only use --with-nonshared-cflags when it's actually available.

in contrib/guix/patches/glibc-2.27-riscv64-Use-__has_include-to-include-asm-syscalls.h.patch:7 in a09269a146

   3 | @@ -4,6 +4,8 @@ See also: http://lists.busybox.net/pipermail/buildroot/2020-July/590376.html.
   4 |  
   5 |  https://sourceware.org/git/?p=glibc.git;a=commit;h=0b9c84906f653978fb8768c7ebd0ee14a47e662e
   6 |  
   7 | +This patch can be dropped when we are building with glibc 2.28+.

hebasto commented at 10:00 AM on May 16, 2023:

https://sourceware.org/bugzilla/show_bug.cgi?id=24022:

Target Milestone: | 2.29

fanquake commented at 10:11 AM on May 16, 2023:

https://sourceware.org/bugzilla/show_bug.cgi?id=24022:

Again. The thread says it was backported to 2.28, which is what matters for us.

hebasto commented at 10:01 AM on May 16, 2023: member

Concept ACK.

hebasto approved

hebasto commented at 10:18 AM on May 16, 2023: member

ACK a09269a146b1e32a0e7979692f4455cc2f6faeae, I have reviewed the changes and they look OK.

maflcko added the label DrahtBot Guix build requested on May 16, 2023

jarolrod commented at 12:18 PM on May 16, 2023: member

ACK a09269a146b1e32a0e7979692f4455cc2f6faeae

Can confirm the note on the long jump patch ;)

DrahtBot commented at 4:40 AM on May 17, 2023: contributor

Guix builds

File	commit edd2a8644531e6fb8f64ad6acce86f8fdec9ab26<br>(master)	commit e80291e8762fb1e5db3f3d3a628e82731eac8cf9<br>(master and this pull)
SHA256SUMS.part	`f93462cbe27de266...`	`9f186756deeb2111...`
*-aarch64-linux-gnu-debug.tar.gz	`7f83d7af4668896d...`	`a110706af108aad1...`
*-aarch64-linux-gnu.tar.gz	`93bb3e7bbcb92a5a...`	`8662b688a9514798...`
*-arm-linux-gnueabihf-debug.tar.gz	`936cc31d8f47618c...`	`94150a23f3f38101...`
*-arm-linux-gnueabihf.tar.gz	`66ca6c2558874a45...`	`bb2855b58cf73b42...`
*-powerpc64-linux-gnu-debug.tar.gz	`3697c1c5a106f247...`	`97c2c1ffb5a519ea...`
*-powerpc64-linux-gnu.tar.gz	`146c59ef101e5d17...`	`bb57f41cc6d8c6dd...`
*-powerpc64le-linux-gnu-debug.tar.gz	`7855f94fdb223417...`	`52dcecfde332a289...`
*-powerpc64le-linux-gnu.tar.gz	`b7dc61c1a6367f9a...`	`1da16f7fd9e9e93b...`
*-riscv64-linux-gnu-debug.tar.gz	`c49cfe17ac7ada55...`	`2dcae33da2afefd4...`
*-riscv64-linux-gnu.tar.gz	`e21ba85d301d6d7f...`	`0619b32a0aa11ccc...`
*-x86_64-linux-gnu-debug.tar.gz	`f5395213235339e0...`	`3b0726de6babe90e...`
*-x86_64-linux-gnu.tar.gz	`afdb58223c451354...`	`b78b1dfd39a1053f...`
*.tar.gz	`de1b74857405f9d9...`	`8909f76159a22dd6...`
guix_build.log	`6d51e03fc6ce4365...`	`066a3969ea0855d4...`
guix_build.log.diff		`06d35810bac0ac03...`

DrahtBot removed the label DrahtBot Guix build requested on May 17, 2023

fanquake merged this on May 17, 2023

fanquake closed this on May 17, 2023

fanquake deleted the branch on May 17, 2023

sidhujag referenced this in commit 03a773b000 on May 17, 2023

kwvg referenced this in commit f27a520f4e on May 31, 2023

kwvg referenced this in commit 3cbe3c960f on May 31, 2023

kwvg referenced this in commit 5f21353529 on Jun 3, 2023

kwvg referenced this in commit 732292f4e6 on Jun 6, 2023

kwvg referenced this in commit b6d0a074f9 on Jun 7, 2023

kwvg referenced this in commit 8c2d99cdec on Jun 8, 2023

kwvg referenced this in commit 6887ebd91e on Jun 10, 2023

kwvg referenced this in commit c445af117b on Jun 11, 2023

kwvg referenced this in commit 25c431c35e on Jun 11, 2023

kwvg referenced this in commit 78ef2bbfe8 on Jun 11, 2023

kwvg referenced this in commit 583552ff8f on Jun 19, 2023

kwvg referenced this in commit 9e8b353857 on Jun 20, 2023

kwvg referenced this in commit 5c82761fd4 on Jun 20, 2023

kwvg referenced this in commit b6fe44cc7f on Jun 20, 2023

kwvg referenced this in commit 80926cdb86 on Jun 20, 2023

kwvg referenced this in commit c51f7e6a3c on Jun 20, 2023

kwvg referenced this in commit 0bada1b31e on Jun 20, 2023

kwvg referenced this in commit 7074a06db6 on Jun 29, 2023

kwvg referenced this in commit bbf5a1f210 on Jun 29, 2023

kwvg referenced this in commit a75b1ea0e4 on Jun 30, 2023

kwvg referenced this in commit 3e069a9acd on Jun 30, 2023

kwvg referenced this in commit 95a2f7c1fb on Jul 3, 2023

kwvg referenced this in commit b2302bb480 on Jul 4, 2023

kwvg referenced this in commit 8a4e077019 on Jul 9, 2023

kwvg referenced this in commit 52b25881c8 on Jul 10, 2023

kwvg referenced this in commit 5da9f2afd8 on Jul 28, 2023

UdjinM6 referenced this in commit 9907bd7196 on Jul 30, 2023

PastaPastaPasta referenced this in commit a44a1a94f6 on Aug 1, 2023

Fabcien referenced this in commit 826c3a0abd on Jan 31, 2024

bitcoin locked this on May 16, 2024