Bug 215761
| Summary: | refactor do-patch | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Mathieu Arnold <mat> | ||||||||||
| Component: | Ports Framework | Assignee: | Mathieu Arnold <mat> | ||||||||||
| Status: | Closed FIXED | ||||||||||||
| Severity: | Affects Only Me | CC: | adamw, portmgr, ports-bugs | ||||||||||
| Priority: | --- | Flags: | mat:
exp-run?
|
||||||||||
| Version: | Latest | ||||||||||||
| Hardware: | Any | ||||||||||||
| OS: | Any | ||||||||||||
| URL: | https://reviews.freebsd.org/D9029 | ||||||||||||
| Bug Depends on: | |||||||||||||
| Bug Blocks: | 215726 | ||||||||||||
| Attachments: |
|
||||||||||||
There is a problem with the handling of strip flags emulators/xen-kernel and sysutils/xen-tools fail to patch for instance. there must have been a bug in the old code, with some variables being left over from the previous patch, fixing these two. Yeah, the strip instruction was not wiped between patches, so the -p of one watch would be applied to the next if it did not have one. Created attachment 178702 [details]
v2
A few other failures (exp-run is still running): http://package18.nyi.freebsd.org/data/110amd64-default-PR215761/2017-01-10_12h16m12s/logs/errors/sabre-20100501.log http://package18.nyi.freebsd.org/data/110amd64-default-PR215761/2017-01-10_12h16m12s/logs/errors/f1spirit-remake-1.0_13.log http://package18.nyi.freebsd.org/data/110amd64-default-PR215761/2017-01-10_12h16m12s/logs/errors/iceicepenguin-1.5.1_5.log http://package18.nyi.freebsd.org/data/110amd64-default-PR215761/2017-01-10_12h16m12s/logs/errors/oneisenough-0.4.0_2.log http://package18.nyi.freebsd.org/data/110amd64-default-PR215761/2017-01-10_12h16m12s/logs/errors/kmfl-european-latin-1.6_1.log http://package18.nyi.freebsd.org/data/110amd64-default-PR215761/2017-01-10_12h16m12s/logs/errors/kde-icons-black-and-white-2.0.a.log http://package18.nyi.freebsd.org/data/110amd64-default-PR215761/2017-01-10_12h16m12s/logs/errors/metacity-longhorninspirat-theme-1.0_9.log Created attachment 178747 [details]
v3
Spaces in a WRKSRC directory where not an edge case I found, fixed. (along with a couple of other issues)
There are some ports that use or set PATCH_ARGS and PATCH_DIST_ARGS directly Ah, yes, I had it on my todo list and forgot about those. (In reply to Antoine Brodin from comment #7) Is it worth also checking for Makefile.local in the external tree? It makes sense to want those in VCS too and it'd allow for altering PATCH_ARGS at the same time. Created attachment 178749 [details]
v4
I don't think it is, and in any way, it would be a different changeset. Also, I don't remember anyone asking for that. In a general case, we try to not add functionalities nobody asks or want, because once we have them, we have to maintain them :-) Exp-run looks fine. A commit references this bug: Author: mat Date: Mon Jan 16 16:47:02 UTC 2017 New revision: 431680 URL: https://svnweb.freebsd.org/changeset/ports/431680 Log: Extract do-patch into a separate script. PR: 215761 Submitted by: mat Exp-run by: antoine Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D9029 Changes: head/CHANGES head/Mk/Scripts/do-patch.sh head/Mk/bsd.port.mk head/chinese/mutt/Makefile head/devel/gdb/Makefile head/games/cake/Makefile head/graphics/xv/Makefile head/japanese/mutt-devel/Makefile head/lang/smlnj/Makefile head/mail/mutt/Makefile head/mail/mutt14/Makefile head/russian/napster/Makefile head/sysutils/pftop/Makefile head/textproc/miller/Makefile head/www/publicfile/Makefile head/x11/rxvt-unicode/Makefile |
Created attachment 178501 [details] v1 I tested all the edge cases I could think of, and find, I don't expect much failures.