--- Log opened Tue Jun 25 00:00:52 2019
04:26 -!- Coy9Emard [~Coy9Emard@ns334669.ip-5-196-64.eu] has quit [Ping timeout: 248 seconds]
05:22 -!- ryanofsky [~russ@jumpy.yanofsky.org] has joined #bitcoin-builds
07:21 < nothingmuch> dongcarl: any thoughts on how to *un*patch generated files, since they end up in the dist tarball?
07:26 < nothingmuch> apart from this i have a mostly working bitcoin-core-dist package, although tar metadata doesn't match {guix-,}build.sh yet, the content does
07:52 < nothingmuch> WIP so far: https://gist.github.com/nothingmuch/405a841d7b4ce4a61b8a4b55c3372d81
08:38 < nothingmuch> dongcarl: also wondering about your recent patch to sort tar file list - why wasn't it needed for make dist?
09:54 < dongcarl> Sorry been afk
09:54 < dongcarl> Unpatch...
09:55 < dongcarl> As in undo what the standard phases of gnu-build-system does?
09:57 < nothingmuch> specifically the patch-generated-files phase, patch-source-files can be removed since the source files are only copied to the distdir, but the generated files, which also end up there, also run w/ assumptions about {,/usr}/bin
09:58 < dongcarl> nothingmuch: take a look at the package definitions in Guix’s repo
09:58 < dongcarl> There are many examples of manipulating standard phases
09:58 < dongcarl> Removing, replacing, etc
09:59 < dongcarl> Most of what I learned is by looking at examples of other packages... and there are quite a lot of them
09:59 < nothingmuch> yeah the simplest thing that might work is substitute* with a giant | joined regex for all the inputs' paths, substituting for the empty string
09:59 < nothingmuch> but this seems very brittle
10:00 < dongcarl> Just so I understand, you want to remove the patch-generated-* phases? Or to remove them?
10:01 < dongcarl> Or to undo them?
10:01 < nothingmuch> patch-generated-* needs to remain for bootstrap & configure phases to work
10:01 < nothingmuch> so i think it needs to be more subtle than just modify-phases to delete or replace
10:02 < dongcarl> But you want to undo them after configure,
10:02 < dongcarl> ?
10:02 < nothingmuch> yes, because otherwise the dist tarball ends with the guix specific paths
10:02 < nothingmuch> or, not necessarily undo, maybe a cleaner approach would just be to back those up before patching and restore them
10:03 < nothingmuch> or to avoid patching and instead set up the std paths in the build container
10:03 < dongcarl> Urgh this sucks
10:04 < dongcarl> When you looked into it, why can’t we just write a simple shell script for this?
10:04 < dongcarl> Oh right the m4 expansions
10:04 < nothingmuch> well, since the --without voodoo seemed to work i pursued it, it seemed like the least invasive approach (see gist, the package def is pretty minimal)
10:05 < dongcarl> Yeah... well okay, I’m thinking this:
10:05 < dongcarl> After you configure, you gotta `make dist` right?
10:06 < nothingmuch> yep
10:06 < dongcarl> Eh, I guess `make dist` won’t use any shebangs?
10:08 < dongcarl> I’m thinking about the details of putting the “undo patches” stages before or after `make dist`
10:08 < nothingmuch> i think so, it appears to be autogen.sh & configure (also in subdirs) and build-aux files that are affected
10:08 < dongcarl> Okay yeah so that would work
10:08 < dongcarl> Take a look at how gnu-build-system’s patch-* stages work
10:08 < dongcarl> They are quite short I believe
10:11 < dongcarl> Huh... do git origins have their .git preserved?
10:11 < dongcarl> Hmmm
10:12 < dongcarl> nothingmuch: There’s a lot of weird stuff here, perhaps you’d wanna do the depends package first?
10:13 < nothingmuch> yeah i could put this on hold
10:14 < nothingmuch> although if we don't recreate /usr/* like you do in build.sh i think we're going to inevitably be stuck with guix patching leaking into it
10:14 < dongcarl> nothingmuch: cool, I’ll work with your gist a bit when I’m back near keyboard
10:15 < nothingmuch> as for git origins - no they do not
10:15 < nothingmuch> but i think the unpack phase can be repeated if that's what you're suggesting?
10:16 < dongcarl> nothingmuch: yeah, lemme chew on those, I’ve had a solution before, just gotta dig it out my brain
10:16 < nothingmuch> oh wait... i think the ./configure changes are not coming from patch-generated-* but the bootstrap stage itself
10:17 < nothingmuch> (just finished reading patch-*, also in guix/build/util.scm)
10:18 < dongcarl> Cool cool, sorry I’m not super available these few days, been on vacation
10:19 < dongcarl> Will be back in next couple of days and help with the good fight
10:20 < nothingmuch> in that case please enjoy vacation and don't worry about me =)
10:20 < dongcarl> =)
--- Log closed Wed Jun 26 00:00:53 2019