Message ID | 20200904141839.29071-1-paul@crapouillou.net |
---|---|
State | Accepted |
Headers | show |
Series | [v2] package/libzip: add patch from upstream to fix build | expand |
On Fri, 4 Sep 2020 16:18:39 +0200 Paul Cercueil <paul@crapouillou.net> wrote: > Cherry-pick a patch from upstream project that fixes the build when used > with a uClibc based toolchain. > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> Could you provide a reasonably minimal defconfig that exhibits the issue? I'm not able to reproduce. libzip alone, or libzip + openssl builds fine here with a uClibc pre-built toolchain. Thanks, Thomas
Hi Thomas, Le ven. 4 sept. 2020 à 17:21, Thomas Petazzoni <thomas.petazzoni@bootlin.com> a écrit : > On Fri, 4 Sep 2020 16:18:39 +0200 > Paul Cercueil <paul@crapouillou.net> wrote: > >> Cherry-pick a patch from upstream project that fixes the build when >> used >> with a uClibc based toolchain. >> >> Signed-off-by: Paul Cercueil <paul@crapouillou.net> > > Could you provide a reasonably minimal defconfig that exhibits the > issue? I'm not able to reproduce. libzip alone, or libzip + openssl > builds fine here with a uClibc pre-built toolchain. BR2_mipsel=y BR2_mips_xburst=y # BR2_MIPS_SOFT_FLOAT is not set BR2_OPTIMIZE_2=y BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_PTHREAD_DEBUG=y BR2_BINUTILS_VERSION_2_34_X=y BR2_GCC_VERSION_10_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GCC_ENABLE_LTO=y BR2_TARGET_OPTIMIZATION="-pipe" BR2_TARGET_GENERIC_PASSWD_SHA512=y BR2_ROOTFS_MERGED_USR=y BR2_SYSTEM_ENABLE_NLS=y BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y BR2_PACKAGE_LIBZIP=y BR2_PACKAGE_OPENSSL=y BR2_PACKAGE_LIBRESSL=y Cheers, -Paul
Paul, Al, On 2020-09-04 16:18 +0200, Paul Cercueil spake thusly: > Cherry-pick a patch from upstream project that fixes the build when used > with a uClibc based toolchain. > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> Applied to master, thanks. Note that I was a bit puzzled like Thomas, but your defconfig hinted at the cause: yours is using libressl, while I guess Thomas only tested with openssl. And indeed, here's an even simpler defconfig that exhibit the issue: BR2_arm=y BR2_cortex_a7=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_STABLE=y BR2_PACKAGE_LIBZIP=y BR2_PACKAGE_OPENSSL=y BR2_PACKAGE_LIBRESSL=y Thanks! :-) Regards, Yann E. MORIN. > --- > > Notes: > v2: Update commit URL > > .../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 > > 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..c488f05289 > --- /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/nih-at/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 > + > -- > 2.28.0 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
>>>>> "Paul" == Paul Cercueil <paul@crapouillou.net> writes: > Cherry-pick a patch from upstream project that fixes the build when used > with a uClibc based toolchain. > Signed-off-by: Paul Cercueil <paul@crapouillou.net> > --- > Notes: > v2: Update commit URL Committed to 2020.08.x, thanks.
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..c488f05289 --- /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/nih-at/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 when used with a uClibc based toolchain. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- Notes: v2: Update commit URL .../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