de930eae3e819a13dc983eea0a02b53603fb5520 — Zack Weinberg 3 years ago 9276ff1
Resolve more NetBSD and OpenBSD patches.

Also clarify status of debian/atomic.patch.
Also fold SKIP into REJECTED and add LATER state.
1 files changed, 37 insertions(+), 32 deletions(-)

M todo.org
M todo.org => todo.org +37 -32
@@ 1,5 1,5 @@
#+TITLE: Patch Todo List

* DONE arch
** MERGED arch/0001-autoconf-2.69-perl-5.22-autoscan.patch

@@ 14,14 14,14 @@ dfb0659b205e03af62542cd318a9f3253e28c40a
** MERGED arch/0004-Port-tests-to-Bash-5.patch

* DONE debian
* TODO debian
** MERGED debian/add-runstatedir.patch

** MERGED debian/AM_PROG_LIBTOOL.patch

** REJECTED debian/atomic.patch
** TODO debian/atomic.patch
Conversation is from 2008

@@ 85,7 85,7 @@ e5654a5591884b92633c7785f325626711e7f7aa
but it was reverted here:

** SKIP freebsd/patch-doc_autoconf.texi
** REJECTED freebsd/patch-doc_autoconf.texi
half backport of: a357718b081f1678748ead5d7cb67c766c930441
But also:
- Renames a section arbitrarily

@@ 101,7 101,7 @@ different choices about this than GNU and that's their business but
not interesting to us right now (if it were going to change it would
be as part of a GNU Project-wide review of how this is done).]

** SKIP freebsd/patch-doc-Makefile.in
** REJECTED freebsd/patch-doc-Makefile.in
The makefile file it tries to patch has been removed prior to 2.69 (did not
track down exact commit). The change itself is removing 2 files from stages of
the build which I don't think is something we want to do upstream.

@@ 122,8 122,8 @@ It's like 25 years old and yet people are still Doing It Wrong.)]
[RA: I believe I read that a long time ago and have been trying to remember the
name of that article for ages.]

* HARD netbsd
** HARD netbsd/patch-aa
* DONE netbsd
** DONE netbsd/patch-aa
`AC_FUNC_ALLOCA should never define a prototype on the BSDs. Bump revision.`

@@ 139,7 139,10 @@ Please file a bug for this one.]

[RA: Bug Created]

** HARD netbsd/patch-lib_autoconf_fortran.m4
[ZW: Confirmed that alloca is successfully detected on NetBSD 9 with
autoconf 2.69c, bug closed.]

** LATER netbsd/patch-lib_autoconf_fortran.m4
`Rpath is a linker option, so prefix it with -Wl. Bump revision.`

@@ 155,7 158,7 @@ helpful.]

[RA: Bug Created]

* TODO oe
* DONE oe
This repo has a big commit that touches just about every file so extracting the
original commits with a --depth=1 checkout is not feasible. Would need to spend
the extra time to clone the entire history and then use that.

@@ 176,7 179,7 @@ to make a judgment all here.
aka 5.006, and that version does support 'use warnings', so I’ve gone
ahead and merged this patch.]

** HARD oe/autoreconf-exclude.patch
** LATER oe/autoreconf-exclude.patch
Adds an exclude option to the autoreconf util to skip some steps.

Need to dig up the commit for this one to get a description of use cases. Patch

@@ 192,7 195,7 @@ should wait for after 2.70.]

[RA: Bug created]

** SKIP oe/autoreconf-gnuconfigize.patch
** REJECTED oe/autoreconf-gnuconfigize.patch
No idea what gnu-configize is and light research hasn't turned up anything. Need
to dig further.

@@ 206,7 209,7 @@ dead, so :shrug:]

[RA: Aight marking as skip]

** EASY oe/autotest-automake-result-format.patch
** LATER oe/autotest-automake-result-format.patch
Adds a command line option to autotest to disable the test group banner and test
summary. My guess is that makes automated tooling to use but would need to dig
through the yocto ptest package to figure it out.

@@ 217,7 220,9 @@ before merging.

This is a new feature so can be dealt with later.

** SKIP oe/check-automake-cross-warning.patch
[ZW: Bug filed]

** REJECTED oe/check-automake-cross-warning.patch
Upstream status of the patch is "Innapropriate [configuration]"

Seems to be tweaks to the build to enable `--warning=cross` if available.

@@ 232,7 237,7 @@ some library files are shared between Autoconf and Automake.  There
is an argument for taking this patch.  I will start a discussion on
the mailing lists.]

** SKIP oe/config_site.patch
** REJECTED oe/config_site.patch
The patch is supposed to allow for multiple files to be provided in CONFIG_SITE
but it doesn't change the processing of the variable at all. Instead it seems
like it's removing the default search paths for the config.site file.

@@ 246,7 251,7 @@ $prefix/etc/config.site when $CONFIG_SITE *isn’t* set.
Post-2.70 material in any case.  Please file a bug for this one
so we remember to come back to it.]

** SKIP oe/fix_path_xtra.patch
** REJECTED oe/fix_path_xtra.patch
This patch just removes XMKMF to remove confusion in their particular build
enviornment. I'm going to go ahead and say we can skip this.

@@ 256,7 261,7 @@ wouldn’t take it as-is, and I think a proper fix would be complicated
enough that it should wait for 2.71.  Please file a bug for this one
so we remember to come back to it.]

** SKIP oe/performance.patch
** REJECTED oe/performance.patch

From a quick reading, it seems like the above patch does essentially the same

@@ 265,7 270,7 @@ thing but in a cleaner way.
[ZW: Yep, 2b59b6f8a79b8bf77e178ff4e5aa0ede433d39cf does the same thing
but more thoroughly.]

** SKIP oe/preferbash.patch
** REJECTED oe/preferbash.patch
Prefers bash over sh because in their system sh can map to dash and they use a
lot of bashisms.

@@ 301,7 306,7 @@ installed*.  I have access to AIX but not with this library.  Until we
can find someone I think we should leave well enough alone.  However,
please file a bug so we don’t forget about it.]

* QUESTION openbsd
* DONE openbsd
Gave up trying to extract information out of the commit history because the
folder structure complicates things quite a bit and the commit messages don't
add any useful context. Need to hunt down mailing list threads for additional

@@ 315,7 320,7 @@ is *not* GNU M4 (see https://github.com/openbsd/src/tree/master/usr.bin/m4 ).
Autoconf upstream only supports use with GNU M4, so all of those
changes we can safely skip.]

** SKIP openbsd/patch-bin_autom4te_in
** REJECTED openbsd/patch-bin_autom4te_in
This is just a bunch of random changes:
- Removes the default recursion limit
- Unconditionally appends `-g -D__gnu__` to the m4 options.

@@ 337,7 342,7 @@ here appear to be *wrong*, for instance the ‘-o’ option does something
completely different from ‘--debugfile’. I don’t think we want this at

** SKIP openbsd/patch-bin_autoupdate_in
** REJECTED openbsd/patch-bin_autoupdate_in
More of the same:
- Unconditionally appends `-g -D__gnu__` to the m4 options.
- Replaces some flags by their short hands (--include -> -I)

@@ 347,7 352,7 @@ seeing any particular reason to want it either. (They presumably did
it because their M4 doesn’t support long options.) The `-g -D__gnu__`
addition shouldn’t be necessary.]

** SKIP openbsd/patch-configure
** REJECTED openbsd/patch-configure
Patches the configure file which is not something we track in git so patch can't
be applied as is.

@@ 369,13 374,13 @@ I imagine they’re patching the generated file because their build
system doesn’t know how to regenerate it after a patch to the actual
source; not our problem anyway.]

** SKIP openbsd/patch-doc_autoconf_texi
** REJECTED openbsd/patch-doc_autoconf_texi
Adds the autoconf version number when refering to the autoconf tools. Could
merge it but this seems like a thing that only OpenBSD so can safely skip it.

[ZW: Yeah, this is like the FreeBSD changes to the top-level Info index.]

** SKIP openbsd/patch-doc_Makefile_in
** REJECTED openbsd/patch-doc_Makefile_in
Changes Makefile.in which I believe is a generated file so can't merge this as

@@ 391,20 396,20 @@ the code being patched belongs to their Makefile templates.]
** BACKPORT openbsd/patch-lib_autoconf_general_m4

** SKIP openbsd/patch-lib_autoconf_Makefile_in
** REJECTED openbsd/patch-lib_autoconf_Makefile_in
Modifies a generated file and removes autoconf.m4f from nodist_autoconflib_DATA.
We don't want to upstream this.

[ZW: Concur.  All changes related to `.m4f` files are again because
OpenBSD’s M4 isn’t GNU M4, and does not implement “frozen state” files.]

** SKIP openbsd/patch-lib_autotest_Makefile_in
** REJECTED openbsd/patch-lib_autotest_Makefile_in
Modifies a generated file and removes autoconf.m4f from nodist_autoconflib_DATA.
We don't want to upstream this.

[ZW: Concur.]

** QUESTION openbsd/patch-lib_m4sugar_m4sugar_m4
** REJECTED openbsd/patch-lib_m4sugar_m4sugar_m4
Random changes:
- Provides AM_SANITY_CHECK right after defining m4_provide. Seems like shoving
  AM specific code in the middle of the m4 library.

@@ 418,7 423,7 @@ we can figure out the right way to implement it.
an explanation then we can revisit, but I wouldn’t consider it a

** SKIP openbsd/patch-lib_m4sugar_Makefile_in
** REJECTED openbsd/patch-lib_m4sugar_Makefile_in
Modifying a generated file so can't be merged as is.

Removes m4sugar.m4f and m4sh.m4f from the nodist variable which is probably not

@@ 426,7 431,7 @@ something we want to upstream.

[ZW: Concur.]

** SKIP openbsd/patch-Makefile_in
** REJECTED openbsd/patch-Makefile_in
Again, modifying generated files so can't be merged as is.

Otherwise, hard to figure out which part of the build they're trying to modify

@@ 437,7 442,7 @@ this takes place, pretty hard to tell what problem they're trying to solve.
this is modifying Automake’s templates so it would need to go to

** SKIP openbsd/patch-tests_c_at
** REJECTED openbsd/patch-tests_c_at
Basically `sed -r "s_/lib/cpp_/usr/bin/cpp_"`

There are other instances of /lib/cpp that they haven't modified. They only

@@ 454,7 459,7 @@ these tests, so we don’t need this patch.  I might change AC_PROG_CPP
to try ‘cpp’ (i.e. look for it in $PATH) before ‘/lib/cpp’, when
‘cc -E’ doesn’t work.]

** SKIP openbsd/patch-tests_local_at
** REJECTED openbsd/patch-tests_local_at
This test deals with output of what I can only assume to be compilers and seems
to add an extra case that wasn't previously handled. It unfortunately does not
update the comment which relies heavily on examples which means we'd have to

@@ 465,7 470,7 @@ Hunting for context on the mailing list might help.
[ZW: This is dealing with M4 output; OpenBSD’s M4 must be printing
certain error messages differently.  We don’t need this.]

** SKIP openbsd/patch-tests_Makefile_in
** REJECTED openbsd/patch-tests_Makefile_in
More modifications to generated files.

Seems like they're disabling the call to make on lib/autotest. Pretty sure we

@@ 474,7 479,7 @@ don't want that.
[ZW: Goes with all the other changes to disable use of .m4f files.
Indeed, we don’t want it.]

** SKIP openbsd/patch-tests_tools_at
** REJECTED openbsd/patch-tests_tools_at
Disables one of the tests. Context needed to understand why.

[ZW: ‘--freeze’ and ‘--reload-state’ options are part of the “frozen