[Buildroot] [PATCH] package/dmraid: fix compile issue with musl

[Buildroot] [PATCH] package/dmraid: fix compile issue with musl

[Waldemar Brodkorb]

Musl removed LFS64 alias of lseek in 1.2.4.
Tested wth qemu_mips32r6_malta_defconfig.

No need to backport to older Buildroot releases.

Fixes:
 - http://autobuild.buildroot.net/results/c6f/c6fc3a7f03171cced5a26246d14113c29e641086

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
---
 package/dmraid/0002-remove-lseek64.patch | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 package/dmraid/0002-remove-lseek64.patch

diff --git a/package/dmraid/0002-remove-lseek64.patch b/package/dmraid/0002-remove-lseek64.patch
new file mode 100644
index 0000000000..1e6636bf31
--- /dev/null
+++ b/package/dmraid/0002-remove-lseek64.patch
@@ -0,0 +1,19 @@
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+Upstream: N/A upstream appears dormant
+diff -Nur dmraid.orig/1.0.0.rc16-3/dmraid/lib/misc/file.c dmraid/1.0.0.rc16-3/dmraid/lib/misc/file.c
+--- dmraid.orig/1.0.0.rc16-3/dmraid/lib/misc/file.c	2010-01-11 17:19:29.000000000 +0100
++++ dmraid/1.0.0.rc16-3/dmraid/lib/misc/file.c	2023-08-11 13:18:25.762988533 +0200
+@@ -68,12 +68,7 @@
+ 	if ((fd = open(path, flags, lc->mode)) == -1)
+ 		LOG_ERR(lc, 0, "opening \"%s\"", path);
+ 
+-#ifdef __KLIBC__
+-#define	DMRAID_LSEEK	lseek
+-#else
+-#define	DMRAID_LSEEK	lseek64
+-#endif
+-	if (offset && (o = DMRAID_LSEEK(fd, offset, SEEK_SET)) == (loff_t) - 1)
++	if (offset && (o = lseek(fd, offset, SEEK_SET)) == (loff_t) - 1)
+ 		log_err(lc, "%s: seeking device \"%s\" to %" PRIu64,
+ 			who, path, offset);
+ 	else if (rw->func(fd, buffer, size) != size)
-- 
2.39.2

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

Re: [Buildroot] [PATCH] package/dmraid: fix compile issue with musl

[Yann E. MORIN]

Waldemar, All,

On 2023-08-15 06:06 +0200, Waldemar Brodkorb spake thusly:
> Musl removed LFS64 alias of lseek in 1.2.4.
> Tested wth qemu_mips32r6_malta_defconfig.
> 
> No need to backport to older Buildroot releases.
> 
> Fixes:
>  - http://autobuild.buildroot.net/results/c6f/c6fc3a7f03171cced5a26246d14113c29e641086
> 
> Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
> ---
>  package/dmraid/0002-remove-lseek64.patch | 19 +++++++++++++++++++
>  1 file changed, 19 insertions(+)
>  create mode 100644 package/dmraid/0002-remove-lseek64.patch
> 
> diff --git a/package/dmraid/0002-remove-lseek64.patch b/package/dmraid/0002-remove-lseek64.patch
> new file mode 100644
> index 0000000000..1e6636bf31
> --- /dev/null
> +++ b/package/dmraid/0002-remove-lseek64.patch
> @@ -0,0 +1,19 @@
> +Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
> +Upstream: N/A upstream appears dormant

You still need to provide a little blurb to explain the change in the
patch itself.

OTOH, is dmraid still useful nowadays? As you noticed, there hasn't been
any activity since the version we package, 1.0.0.rc16-3, released in
2010, 13 years ago now, and we only did sanitary cleanups since we bumped
in early 2014, almost 10 years ago now. Does it make sense to keep it?

Regards,
Yann E. MORIN.

> +diff -Nur dmraid.orig/1.0.0.rc16-3/dmraid/lib/misc/file.c dmraid/1.0.0.rc16-3/dmraid/lib/misc/file.c
> +--- dmraid.orig/1.0.0.rc16-3/dmraid/lib/misc/file.c	2010-01-11 17:19:29.000000000 +0100
> ++++ dmraid/1.0.0.rc16-3/dmraid/lib/misc/file.c	2023-08-11 13:18:25.762988533 +0200
> +@@ -68,12 +68,7 @@
> + 	if ((fd = open(path, flags, lc->mode)) == -1)
> + 		LOG_ERR(lc, 0, "opening \"%s\"", path);
> + 
> +-#ifdef __KLIBC__
> +-#define	DMRAID_LSEEK	lseek
> +-#else
> +-#define	DMRAID_LSEEK	lseek64
> +-#endif
> +-	if (offset && (o = DMRAID_LSEEK(fd, offset, SEEK_SET)) == (loff_t) - 1)
> ++	if (offset && (o = lseek(fd, offset, SEEK_SET)) == (loff_t) - 1)
> + 		log_err(lc, "%s: seeking device \"%s\" to %" PRIu64,
> + 			who, path, offset);
> + 	else if (rw->func(fd, buffer, size) != size)
> -- 
> 2.39.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot