| Message ID | 20240319200646.45266-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/putty: fix arm uclibc build | expand |
On 19/03/2024 21:06, Fabrice Fontaine wrote: > Fix the following arm uclibc build failure raised since bump to version > 0.78 in commit 5673ea3ce4d4dd721bb17fc8d5b1283f5c1080b4 which wrongly > removed patch because file was renamed. Patch was sent upstream in 2021 > but rejected, even a second iteration defining AT_HWCAP2 to 26 if needed > was also rejected. > > Fixes: 5673ea3ce4d4dd721bb17fc8d5b1283f5c1080b4 > - http://autobuild.buildroot.org/results/547d1c0e8a89e1e4b601aa756d26886bfc3d586f > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > --- > ...-arm_arch_queries.h-fix-uclibc-build.patch | 40 +++++++++++++++++++ > 1 file changed, 40 insertions(+) > create mode 100644 package/putty/0001-unix-utils-arm_arch_queries.h-fix-uclibc-build.patch > > diff --git a/package/putty/0001-unix-utils-arm_arch_queries.h-fix-uclibc-build.patch b/package/putty/0001-unix-utils-arm_arch_queries.h-fix-uclibc-build.patch > new file mode 100644 > index 0000000000..f6b5fe6f91 > --- /dev/null > +++ b/package/putty/0001-unix-utils-arm_arch_queries.h-fix-uclibc-build.patch > @@ -0,0 +1,40 @@ > +From 2631c745f986b356fbe5e1d418cff63b46134df6 Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine <fontaine.fabrice@gmail.com> > +Date: Tue, 19 Mar 2024 20:37:33 +0100 > +Subject: [PATCH] unix/utils/arm_arch_queries.h: fix uclibc build > + > +Build on uclibc is broken since version 0.75 and commit > +65383082bf0c49cec63f4b36001a40bd9b13edf6 because AT_HWCAP2 is used > +even if <sys/auxv.h> is not available: > + > +/home/buildroot/autobuild/run/instance-3/output-1/build/putty-0.80/unix/utils/arm_arch_queries.c: In function 'platform_aes_neon_available': > +/home/buildroot/autobuild/run/instance-3/output-1/build/putty-0.80/unix/utils/arm_arch_queries.c:18:22: error: 'AT_HWCAP2' undeclared (first use in this function) > + 18 | return getauxval(AT_HWCAP2) & HWCAP2_AES; > + | ^~~~~~~~~ > + > +To fix this build failure, include <elf.h> > + > +Fixes: > + - http://autobuild.buildroot.org/results/547d1c0e8a89e1e4b601aa756d26886bfc3d586f > + > +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> There's no Upstream: tag, which makes check-package fail. Previously, the patch was simply ignored, but instead I added an Upstream: tag that says it was rejected. Applied to master with that fixed,thanks. Regards, Arnout > +--- > + unix/utils/arm_arch_queries.h | 2 ++ > + 1 file changed, 2 insertions(+) > + > +diff --git a/unix/utils/arm_arch_queries.h b/unix/utils/arm_arch_queries.h > +index fa46c622..5cce7f31 100644 > +--- a/unix/utils/arm_arch_queries.h > ++++ b/unix/utils/arm_arch_queries.h > +@@ -18,6 +18,8 @@ > + > + #if defined __arm__ || defined __aarch64__ > + > ++#include <elf.h> > ++ > + #if HAVE_SYS_TYPES_H > + #include <sys/types.h> > + #endif > +-- > +2.43.0 > +
>>>>> "Arnout" == Arnout Vandecappelle via buildroot <buildroot@buildroot.org> writes: > On 19/03/2024 21:06, Fabrice Fontaine wrote: >> Fix the following arm uclibc build failure raised since bump to version >> 0.78 in commit 5673ea3ce4d4dd721bb17fc8d5b1283f5c1080b4 which wrongly >> removed patch because file was renamed. Patch was sent upstream in 2021 >> but rejected, even a second iteration defining AT_HWCAP2 to 26 if needed >> was also rejected. >> Fixes: 5673ea3ce4d4dd721bb17fc8d5b1283f5c1080b4 >> - http://autobuild.buildroot.org/results/547d1c0e8a89e1e4b601aa756d26886bfc3d586f >> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> >> --- >> ...-arm_arch_queries.h-fix-uclibc-build.patch | 40 +++++++++++++++++++ >> 1 file changed, 40 insertions(+) >> create mode 100644 package/putty/0001-unix-utils-arm_arch_queries.h-fix-uclibc-build.patch >> diff --git >> a/package/putty/0001-unix-utils-arm_arch_queries.h-fix-uclibc-build.patch >> b/package/putty/0001-unix-utils-arm_arch_queries.h-fix-uclibc-build.patch >> new file mode 100644 >> index 0000000000..f6b5fe6f91 >> --- /dev/null >> +++ b/package/putty/0001-unix-utils-arm_arch_queries.h-fix-uclibc-build.patch >> @@ -0,0 +1,40 @@ >> +From 2631c745f986b356fbe5e1d418cff63b46134df6 Mon Sep 17 00:00:00 2001 >> +From: Fabrice Fontaine <fontaine.fabrice@gmail.com> >> +Date: Tue, 19 Mar 2024 20:37:33 +0100 >> +Subject: [PATCH] unix/utils/arm_arch_queries.h: fix uclibc build >> + >> +Build on uclibc is broken since version 0.75 and commit >> +65383082bf0c49cec63f4b36001a40bd9b13edf6 because AT_HWCAP2 is used >> +even if <sys/auxv.h> is not available: >> + >> +/home/buildroot/autobuild/run/instance-3/output-1/build/putty-0.80/unix/utils/arm_arch_queries.c: >> In function 'platform_aes_neon_available': >> +/home/buildroot/autobuild/run/instance-3/output-1/build/putty-0.80/unix/utils/arm_arch_queries.c:18:22: >> error: 'AT_HWCAP2' undeclared (first use in this function) >> + 18 | return getauxval(AT_HWCAP2) & HWCAP2_AES; >> + | ^~~~~~~~~ >> + >> +To fix this build failure, include <elf.h> >> + >> +Fixes: >> + - http://autobuild.buildroot.org/results/547d1c0e8a89e1e4b601aa756d26886bfc3d586f >> + >> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > There's no Upstream: tag, which makes check-package fail. Previously, > the patch was simply ignored, but instead I added an Upstream: tag > that says it was rejected. > Applied to master with that fixed,thanks. Committed to 2024.02.x, 2023.02.x and 2023.11.x, thanks.
diff --git a/package/putty/0001-unix-utils-arm_arch_queries.h-fix-uclibc-build.patch b/package/putty/0001-unix-utils-arm_arch_queries.h-fix-uclibc-build.patch new file mode 100644 index 0000000000..f6b5fe6f91 --- /dev/null +++ b/package/putty/0001-unix-utils-arm_arch_queries.h-fix-uclibc-build.patch @@ -0,0 +1,40 @@ +From 2631c745f986b356fbe5e1d418cff63b46134df6 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <fontaine.fabrice@gmail.com> +Date: Tue, 19 Mar 2024 20:37:33 +0100 +Subject: [PATCH] unix/utils/arm_arch_queries.h: fix uclibc build + +Build on uclibc is broken since version 0.75 and commit +65383082bf0c49cec63f4b36001a40bd9b13edf6 because AT_HWCAP2 is used +even if <sys/auxv.h> is not available: + +/home/buildroot/autobuild/run/instance-3/output-1/build/putty-0.80/unix/utils/arm_arch_queries.c: In function 'platform_aes_neon_available': +/home/buildroot/autobuild/run/instance-3/output-1/build/putty-0.80/unix/utils/arm_arch_queries.c:18:22: error: 'AT_HWCAP2' undeclared (first use in this function) + 18 | return getauxval(AT_HWCAP2) & HWCAP2_AES; + | ^~~~~~~~~ + +To fix this build failure, include <elf.h> + +Fixes: + - http://autobuild.buildroot.org/results/547d1c0e8a89e1e4b601aa756d26886bfc3d586f + +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +--- + unix/utils/arm_arch_queries.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/unix/utils/arm_arch_queries.h b/unix/utils/arm_arch_queries.h +index fa46c622..5cce7f31 100644 +--- a/unix/utils/arm_arch_queries.h ++++ b/unix/utils/arm_arch_queries.h +@@ -18,6 +18,8 @@ + + #if defined __arm__ || defined __aarch64__ + ++#include <elf.h> ++ + #if HAVE_SYS_TYPES_H + #include <sys/types.h> + #endif +-- +2.43.0 +
Fix the following arm uclibc build failure raised since bump to version 0.78 in commit 5673ea3ce4d4dd721bb17fc8d5b1283f5c1080b4 which wrongly removed patch because file was renamed. Patch was sent upstream in 2021 but rejected, even a second iteration defining AT_HWCAP2 to 26 if needed was also rejected. Fixes: 5673ea3ce4d4dd721bb17fc8d5b1283f5c1080b4 - http://autobuild.buildroot.org/results/547d1c0e8a89e1e4b601aa756d26886bfc3d586f Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- ...-arm_arch_queries.h-fix-uclibc-build.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 package/putty/0001-unix-utils-arm_arch_queries.h-fix-uclibc-build.patch