[Buildroot] [PATCH v2 1/1] package/nfs-utils: fix static build

[Buildroot] [PATCH v2 1/1] package/nfs-utils: fix static build

[Bernd Kuhls]

Fixes:
http://autobuild.buildroot.net/results/f17/f17a554c86f0b24327b49fdc75612cc133f129ed/

f9dc4bab9f4576eed3a22ca7517bfc88d9812c34 bumped nfs-utils to version
2.6.3 which includes the addition of the two files patched here.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: added upstream URL

 ...-guard-dlfcn.h-include-with-HAVE_DLF.patch | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 package/nfs-utils/0002-support-reexport-guard-dlfcn.h-include-with-HAVE_DLF.patch

diff --git a/package/nfs-utils/0002-support-reexport-guard-dlfcn.h-include-with-HAVE_DLF.patch b/package/nfs-utils/0002-support-reexport-guard-dlfcn.h-include-with-HAVE_DLF.patch
new file mode 100644
index 0000000000..5ffb15d86d
--- /dev/null
+++ b/package/nfs-utils/0002-support-reexport-guard-dlfcn.h-include-with-HAVE_DLF.patch
@@ -0,0 +1,44 @@
+From 274e4d212c30183242e48b639889865819f3ac33 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Sun, 11 Jun 2023 08:57:11 +0200
+Subject: [PATCH] support/reexport: guard dlfcn.h include with HAVE_DLFCN_H
+
+Upstream: https://marc.info/?l=linux-nfs&m=168650558019402&w=2
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ support/reexport/fsidd.c    | 2 ++
+ support/reexport/reexport.c | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/support/reexport/fsidd.c b/support/reexport/fsidd.c
+index 37649d06..d4b245e8 100644
+--- a/support/reexport/fsidd.c
++++ b/support/reexport/fsidd.c
+@@ -3,7 +3,9 @@
+ #endif
+ 
+ #include <assert.h>
++#ifdef HAVE_DLFCN_H
+ #include <dlfcn.h>
++#endif
+ #include <event2/event.h>
+ #include <limits.h>
+ #include <stdint.h>
+diff --git a/support/reexport/reexport.c b/support/reexport/reexport.c
+index d597a2f7..d9a700af 100644
+--- a/support/reexport/reexport.c
++++ b/support/reexport/reexport.c
+@@ -2,7 +2,9 @@
+ #include <config.h>
+ #endif
+ 
++#ifdef HAVE_DLFCN_H
+ #include <dlfcn.h>
++#endif
+ #include <stdint.h>
+ #include <stdio.h>
+ #include <sys/random.h>
+-- 
+2.39.2
+
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 1/1] package/nfs-utils: fix static build

[Giulio Benetti]

On 11/06/23 19:51, Bernd Kuhls wrote:
> Fixes:
> http://autobuild.buildroot.net/results/f17/f17a554c86f0b24327b49fdc75612cc133f129ed/
> 
> f9dc4bab9f4576eed3a22ca7517bfc88d9812c34 bumped nfs-utils to version
> 2.6.3 which includes the addition of the two files patched here.
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

Reviewed-by: Giulio Benetti <giulio.benetti@benettiengineering.com>

Best regards
-- 
Giulio Benetti
CEO&CTO@Benetti Engineering sas

> ---
> v2: added upstream URL
> 
>   ...-guard-dlfcn.h-include-with-HAVE_DLF.patch | 44 +++++++++++++++++++
>   1 file changed, 44 insertions(+)
>   create mode 100644 package/nfs-utils/0002-support-reexport-guard-dlfcn.h-include-with-HAVE_DLF.patch
> 
> diff --git a/package/nfs-utils/0002-support-reexport-guard-dlfcn.h-include-with-HAVE_DLF.patch b/package/nfs-utils/0002-support-reexport-guard-dlfcn.h-include-with-HAVE_DLF.patch
> new file mode 100644
> index 0000000000..5ffb15d86d
> --- /dev/null
> +++ b/package/nfs-utils/0002-support-reexport-guard-dlfcn.h-include-with-HAVE_DLF.patch
> @@ -0,0 +1,44 @@
> +From 274e4d212c30183242e48b639889865819f3ac33 Mon Sep 17 00:00:00 2001
> +From: Bernd Kuhls <bernd.kuhls@t-online.de>
> +Date: Sun, 11 Jun 2023 08:57:11 +0200
> +Subject: [PATCH] support/reexport: guard dlfcn.h include with HAVE_DLFCN_H
> +
> +Upstream: https://marc.info/?l=linux-nfs&m=168650558019402&w=2
> +
> +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> +---
> + support/reexport/fsidd.c    | 2 ++
> + support/reexport/reexport.c | 2 ++
> + 2 files changed, 4 insertions(+)
> +
> +diff --git a/support/reexport/fsidd.c b/support/reexport/fsidd.c
> +index 37649d06..d4b245e8 100644
> +--- a/support/reexport/fsidd.c
> ++++ b/support/reexport/fsidd.c
> +@@ -3,7 +3,9 @@
> + #endif
> +
> + #include <assert.h>
> ++#ifdef HAVE_DLFCN_H
> + #include <dlfcn.h>
> ++#endif
> + #include <event2/event.h>
> + #include <limits.h>
> + #include <stdint.h>
> +diff --git a/support/reexport/reexport.c b/support/reexport/reexport.c
> +index d597a2f7..d9a700af 100644
> +--- a/support/reexport/reexport.c
> ++++ b/support/reexport/reexport.c
> +@@ -2,7 +2,9 @@
> + #include <config.h>
> + #endif
> +
> ++#ifdef HAVE_DLFCN_H
> + #include <dlfcn.h>
> ++#endif
> + #include <stdint.h>
> + #include <stdio.h>
> + #include <sys/random.h>
> +--
> +2.39.2
> +

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 1/1] package/nfs-utils: fix static build

[Petr Vorel]

[-- Attachment #1.1: Type: text/plain, Size: 2679 bytes --]

On Sunday, 11 June 2023, Giulio Benetti <
giulio.benetti@benettiengineering.com> wrote:

> On 11/06/23 19:51, Bernd Kuhls wrote:
>
>> Fixes:
>>
>> http://autobuild.buildroot.net/results/f17/f17a554c86f0b24327b49fdc75612cc133f129ed/
>>
>> f9dc4bab9f4576eed3a22ca7517bfc88d9812c34 bumped nfs-utils to version
>> 2.6.3 which includes the addition of the two files patched here.
>>
>> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
>>
>
> Reviewed-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
>
>
Reviewed-by: Petr Vorel <petr.vorel@gmail.com>

Fixes: f9dc4bab9f ("package/nfs-utils: bump to version 2.6.3")

Thanks!

Kind regards,
Petr
Petr



> Best regards
> --
> Giulio Benetti
> CEO&CTO@Benetti Engineering sas
>
> ---
>> v2: added upstream URL
>>
>>   ...-guard-dlfcn.h-include-with-HAVE_DLF.patch | 44 +++++++++++++++++++
>>   1 file changed, 44 insertions(+)
>>   create mode 100644
>> package/nfs-utils/0002-support-reexport-guard-dlfcn.h-include-with-HAVE_DLF.patch
>>
>> diff --git
>> a/package/nfs-utils/0002-support-reexport-guard-dlfcn.h-include-with-HAVE_DLF.patch
>> b/package/nfs-utils/0002-support-reexport-guard-dlfcn.h-include-with-HAVE_DLF.patch
>> new file mode 100644
>> index 0000000000..5ffb15d86d
>> --- /dev/null
>> +++
>> b/package/nfs-utils/0002-support-reexport-guard-dlfcn.h-include-with-HAVE_DLF.patch
>> @@ -0,0 +1,44 @@
>> +From 274e4d212c30183242e48b639889865819f3ac33 Mon Sep 17 00:00:00 2001
>> +From: Bernd Kuhls <bernd.kuhls@t-online.de>
>> +Date: Sun, 11 Jun 2023 08:57:11 +0200
>> +Subject: [PATCH] support/reexport: guard dlfcn.h include with
>> HAVE_DLFCN_H
>> +
>> +Upstream: https://marc.info/?l=linux-nfs&m=168650558019402&w=2
>> +
>> +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
>> +---
>> + support/reexport/fsidd.c    | 2 ++
>> + support/reexport/reexport.c | 2 ++
>> + 2 files changed, 4 insertions(+)
>> +
>> +diff --git a/support/reexport/fsidd.c b/support/reexport/fsidd.c
>> +index 37649d06..d4b245e8 100644
>> +--- a/support/reexport/fsidd.c
>> ++++ b/support/reexport/fsidd.c
>> +@@ -3,7 +3,9 @@
>> + #endif
>> +
>> + #include <assert.h>
>> ++#ifdef HAVE_DLFCN_H
>> + #include <dlfcn.h>
>> ++#endif
>> + #include <event2/event.h>
>> + #include <limits.h>
>> + #include <stdint.h>
>> +diff --git a/support/reexport/reexport.c b/support/reexport/reexport.c
>> +index d597a2f7..d9a700af 100644
>> +--- a/support/reexport/reexport.c
>> ++++ b/support/reexport/reexport.c
>> +@@ -2,7 +2,9 @@
>> + #include <config.h>
>> + #endif
>> +
>> ++#ifdef HAVE_DLFCN_H
>> + #include <dlfcn.h>
>> ++#endif
>> + #include <stdint.h>
>> + #include <stdio.h>
>> + #include <sys/random.h>
>> +--
>> +2.39.2
>> +
>>
>
>

[-- Attachment #1.2: Type: text/html, Size: 4214 bytes --]

[-- Attachment #2: Type: text/plain, Size: 150 bytes --]

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 1/1] package/nfs-utils: fix static build

[Thomas Petazzoni via buildroot]

Hello Bernd,

On Sun, 11 Jun 2023 19:51:42 +0200
Bernd Kuhls <bernd.kuhls@t-online.de> wrote:

> Fixes:
> http://autobuild.buildroot.net/results/f17/f17a554c86f0b24327b49fdc75612cc133f129ed/
> 
> f9dc4bab9f4576eed3a22ca7517bfc88d9812c34 bumped nfs-utils to version
> 2.6.3 which includes the addition of the two files patched here.
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> v2: added upstream URL
> 
>  ...-guard-dlfcn.h-include-with-HAVE_DLF.patch | 44 +++++++++++++++++++
>  1 file changed, 44 insertions(+)
>  create mode 100644 package/nfs-utils/0002-support-reexport-guard-dlfcn.h-include-with-HAVE_DLF.patch
> 
> diff --git a/package/nfs-utils/0002-support-reexport-guard-dlfcn.h-include-with-HAVE_DLF.patch b/package/nfs-utils/0002-support-reexport-guard-dlfcn.h-include-with-HAVE_DLF.patch
> new file mode 100644
> index 0000000000..5ffb15d86d
> --- /dev/null
> +++ b/package/nfs-utils/0002-support-reexport-guard-dlfcn.h-include-with-HAVE_DLF.patch
> @@ -0,0 +1,44 @@
> +From 274e4d212c30183242e48b639889865819f3ac33 Mon Sep 17 00:00:00 2001
> +From: Bernd Kuhls <bernd.kuhls@t-online.de>
> +Date: Sun, 11 Jun 2023 08:57:11 +0200
> +Subject: [PATCH] support/reexport: guard dlfcn.h include with HAVE_DLFCN_H
> +
> +Upstream: https://marc.info/?l=linux-nfs&m=168650558019402&w=2

I've changed this to the URL of the final commit that has been applied
upstream, and applied your patch.

Thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 1/1] package/nfs-utils: fix static build

[Peter Korsgaard]

>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:

 > Fixes:
 > http://autobuild.buildroot.net/results/f17/f17a554c86f0b24327b49fdc75612cc133f129ed/

 > f9dc4bab9f4576eed3a22ca7517bfc88d9812c34 bumped nfs-utils to version
 > 2.6.3 which includes the addition of the two files patched here.

 > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
 > ---
 > v2: added upstream URL

Committed to 2023.05.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot