| Message ID | 20210722194420.7413-1-cotequeiroz@gmail.com |
|---|---|
| Headers | show |
| Series | Bump WolfSSL and libtool | expand |
On 7/22/21 9:44 PM, Eneas U de Queiroz wrote: > WolfSSL has decided it needs at least libtool 2.4.2 to build. From > their commit 92854a5dd message: > advance LT_PREREQ from 2.2 (2008) to 2.4.2 (2011) to reflect current > automated testing coverage. > > We could easily patch our way out of it, but I decided to try the > upgrade first. It appears to work just fine. I've just rebuilt the > whole tree for my Linksys E8450 (mt7622), and tested the WolfSSL update > with hostapd and uhttpd. I've had no hickups, but of course ymmv. > > My major concern while bumping a core building tool was how it could > affect the changes we have in place. I've looked at both our patches, > and at what was changed upstream. > > The major changes were related to getting the gnulib sources from git, > and refreshing them when running bootstrap. Since we are applying > patches, getting fresh copies are not viable, but there's a command-line > option to avoid doing it. > > I'm not so sure what to do about 21.02. > 1. Patch WolfSSL to accept building with libtool 2.4; > 2. Bump libtool to 2.4.2: 11 *relevant* files changed from 2.4, > 424 insertions(+), 198 deletions(-). > This was before the gnulib changes. For a comparison, there are > 71 files changed, 17143 insertions(+), 5697 deletions(-), when going > from 2.4 to 2.4.6. > 3. Bump both to keep in sync with master. > > My vote: do 1 now, and wait for possible fallout from master. Then, > perhaps try to keep them in sync, at the following point release. > > Cheers > > Eneas U de Queiroz (2): > libtool: bump to 2.4.6 > wolfssl: bump to v4.8.0-stable > Hi Eneas U de Queiroz, libtool was updated to version 2.4.2 in this commmit: https:/git.openwrt.org/cdc646c03282b91d7e9518bb726f29c1de5d24fc The wolfssl update was applied here: https://git.openwrt.org/7d92bb0509615550b98e2dc71091073c8258d564 I would also like to get libtool to 2.4.6 in master, could you please rebase your patch on top of current master please. @Jow: Do you have any objections to updating libtool in master to version 2.4.6? I would prefer to patch wolfssl in 21.02 to work with older libtool. Hauke
WolfSSL has decided it needs at least libtool 2.4.2 to build. From their commit 92854a5dd message: advance LT_PREREQ from 2.2 (2008) to 2.4.2 (2011) to reflect current automated testing coverage. We could easily patch our way out of it, but I decided to try the upgrade first. It appears to work just fine. I've just rebuilt the whole tree for my Linksys E8450 (mt7622), and tested the WolfSSL update with hostapd and uhttpd. I've had no hickups, but of course ymmv. My major concern while bumping a core building tool was how it could affect the changes we have in place. I've looked at both our patches, and at what was changed upstream. The major changes were related to getting the gnulib sources from git, and refreshing them when running bootstrap. Since we are applying patches, getting fresh copies are not viable, but there's a command-line option to avoid doing it. I'm not so sure what to do about 21.02. 1. Patch WolfSSL to accept building with libtool 2.4; 2. Bump libtool to 2.4.2: 11 *relevant* files changed from 2.4, 424 insertions(+), 198 deletions(-). This was before the gnulib changes. For a comparison, there are 71 files changed, 17143 insertions(+), 5697 deletions(-), when going from 2.4 to 2.4.6. 3. Bump both to keep in sync with master. My vote: do 1 now, and wait for possible fallout from master. Then, perhaps try to keep them in sync, at the following point release. Cheers Eneas U de Queiroz (2): libtool: bump to 2.4.6 wolfssl: bump to v4.8.0-stable package/libs/wolfssl/Makefile | 6 +- tools/libtool/Makefile | 11 +- tools/libtool/patches/000-relocatable.patch | 108 ++------- .../libtool/patches/001-fix-func_append.patch | 22 -- tools/libtool/patches/100-libdir-fixes.patch | 97 +++----- ...10-dont-use-target-dir-for-relinking.patch | 51 ++-- .../120-strip-unsafe-dirs-for-relinking.patch | 36 +-- ...ingslash.patch => 130-trailingslash.patch} | 33 +-- ...140-don-t-quote-SHELL-in-Makefile.am.patch | 72 ++++++ ...itigate-the-sed_quote_subst-slowdown.patch | 224 ++++++++++++++++++ .../libtool/patches/160-passthrough-ssp.patch | 12 - .../patches/200-openwrt-branding.patch | 134 ++--------- 12 files changed, 447 insertions(+), 359 deletions(-) delete mode 100644 tools/libtool/patches/001-fix-func_append.patch rename tools/libtool/patches/{150-trailingslash.patch => 130-trailingslash.patch} (57%) create mode 100644 tools/libtool/patches/140-don-t-quote-SHELL-in-Makefile.am.patch create mode 100644 tools/libtool/patches/150-libtool-mitigate-the-sed_quote_subst-slowdown.patch delete mode 100644 tools/libtool/patches/160-passthrough-ssp.patch