| Message ID | 20200902201431.2197792-1-paul@crapouillou.net |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | package/libzip: add patch from upstream to fix build | expand |
On Wed, 2 Sep 2020 22:14:30 +0200 Paul Cercueil <paul@crapouillou.net> wrote: > Cherry-pick a patch from upstream project that fixes the build. > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> Which build issue is this fixing ? What toolchain/C library ? Since when is this happening ? Do we need to backport this fix to our stable branches ? Do we have autobuilder failures for this ? > diff --git a/package/libzip/0002-Include-limits.h-for-INT_MAX.patch b/package/libzip/0002-Include-limits.h-for-INT_MAX.patch > new file mode 100644 > index 0000000000..e1d728158e > --- /dev/null > +++ b/package/libzip/0002-Include-limits.h-for-INT_MAX.patch > @@ -0,0 +1,27 @@ > +From fd89e242d16128dedef08f47d99ae56aa19b0591 Mon Sep 17 00:00:00 2001 > +From: =?UTF-8?q?=C3=98rjan=20Malde?= <red@foxi.me> > +Date: Wed, 15 Jul 2020 12:16:16 +0200 > +Subject: [PATCH] Include limits.h for INT_MAX > + > +[Retrieved from: > +https://github.com/pcercuei/libzip/commit/fd89e242d16128dedef08f47d99ae56aa19b0591] This URL gives me a 404. Thomas
Le jeu. 3 sept. 2020 à 22:16, Thomas Petazzoni <thomas.petazzoni@bootlin.com> a écrit : > On Wed, 2 Sep 2020 22:14:30 +0200 > Paul Cercueil <paul@crapouillou.net> wrote: > >> Cherry-pick a patch from upstream project that fixes the build. >> >> Signed-off-by: Paul Cercueil <paul@crapouillou.net> > > Which build issue is this fixing ? What toolchain/C library ? Since > when is this happening ? Do we need to backport this fix to our stable > branches ? Do we have autobuilder failures for this ? Buildroot toolchain, GCC 10, uClibc-ng. Doesn't build because it uses INT_MAX without including <limits.h>. Backport the change to the next 2020.08 point release, I think. About autobuilder failures, I didn't see any. It failed locally. > >> diff --git a/package/libzip/0002-Include-limits.h-for-INT_MAX.patch >> b/package/libzip/0002-Include-limits.h-for-INT_MAX.patch >> new file mode 100644 >> index 0000000000..e1d728158e >> --- /dev/null >> +++ b/package/libzip/0002-Include-limits.h-for-INT_MAX.patch >> @@ -0,0 +1,27 @@ >> +From fd89e242d16128dedef08f47d99ae56aa19b0591 Mon Sep 17 00:00:00 >> 2001 >> +From: =?UTF-8?q?=C3=98rjan=20Malde?= <red@foxi.me> >> +Date: Wed, 15 Jul 2020 12:16:16 +0200 >> +Subject: [PATCH] Include limits.h for INT_MAX >> + >> +[Retrieved from: >> >> +https://github.com/pcercuei/libzip/commit/fd89e242d16128dedef08f47d99ae56aa19b0591] > > This URL gives me a 404. I forked the upstream project just to notice afterwards that they already had a fix, so I deleted my project. The real URL is s/pcercuei/nih-at/, so: https://github.com/nih-at/libzip/commit/fd89e242d16128dedef08f47d99ae56aa19b0591 -Paul > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com
diff --git a/package/libzip/0002-Include-limits.h-for-INT_MAX.patch b/package/libzip/0002-Include-limits.h-for-INT_MAX.patch new file mode 100644 index 0000000000..e1d728158e --- /dev/null +++ b/package/libzip/0002-Include-limits.h-for-INT_MAX.patch @@ -0,0 +1,27 @@ +From fd89e242d16128dedef08f47d99ae56aa19b0591 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=98rjan=20Malde?= <red@foxi.me> +Date: Wed, 15 Jul 2020 12:16:16 +0200 +Subject: [PATCH] Include limits.h for INT_MAX + +[Retrieved from: +https://github.com/pcercuei/libzip/commit/fd89e242d16128dedef08f47d99ae56aa19b0591] +Signed-off-by: Paul Cercueil <paul@crapouillou.net> +--- + lib/zip_crypto_openssl.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/zip_crypto_openssl.c b/lib/zip_crypto_openssl.c +index 1cb00479..60f92758 100644 +--- a/lib/zip_crypto_openssl.c ++++ b/lib/zip_crypto_openssl.c +@@ -38,6 +38,7 @@ + #include "zip_crypto.h" + + #include <openssl/rand.h> ++#include <limits.h> + + #if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) + #define USE_OPENSSL_1_0_API +-- +2.28.0 +
Cherry-pick a patch from upstream project that fixes the build. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- .../0002-Include-limits.h-for-INT_MAX.patch | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 package/libzip/0002-Include-limits.h-for-INT_MAX.patch