Skip to contentSkip to conversation

package/libdrm: fix nouveau tests compile for musl

PATCH New Peter Seiderer 2 participants 4 messages Nov 25, 2019 – Nov 28, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/libdrm: fix nouveau tests compile for musl

Add openembedded provided patch [2] to fix musl toolchain compile failures because of different ioctl() signatures, (int, int, ...) vs. (int, unsigned long, ...).

Fixes:

../tests/nouveau/threaded.c:39:5: error: conflicting types for 'ioctl' int ioctl(int fd, unsigned long request, ...)

[1] http://autobuild.buildroot.net/results/047f149a928ac2a17e25211a0a8a264ebae369ac
[2] https://github.com/openembedded/openembedded-core/blob/master/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch

---
 ...uveau-threaded-adapt-ioctl-signature.patch | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 package/libdrm/0006-tests-nouveau-threaded-adapt-ioctl-signature.patch
package/libdrm/0006-tests-nouveau-threaded-adapt-ioctl-signature.patch new file +37 -0
new file mode 100644
index 0000000000..80845709da
@@ -0,0 +1,37 @@
+From 6c7b305869b941e52cb846cbed5e4a5c85d035d9 Mon Sep 17 00:00:00 2001
+From: Ross Burton <[email protected]>
+Date: Mon, 18 Jun 2018 15:07:03 +0100
+Subject: [PATCH] tests/nouveau/threaded: adapt ioctl signature
+
+POSIX says ioctl() has the signature (int, int, ...) but glibc has decided to
+use (int, unsigned long int, ...) instead.
+
+Use a #ifdef to adapt the replacement function as appropriate.
+
+Signed-off-by: Ross Burton <[email protected]>
+
+[Taken from https://raw.githubusercontent.com/openembedded/openembedded-core/master/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch]
+Signed-off-by: Peter Seiderer <[email protected]>
+---
+ tests/nouveau/threaded.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/tests/nouveau/threaded.c b/tests/nouveau/threaded.c
+index 3669bcd..e1c27c0 100644
+--- a/tests/nouveau/threaded.c
++++ b/tests/nouveau/threaded.c
+@@ -36,7 +36,11 @@ static int failed;
+ 
+ static int import_fd;
+ 
++#ifdef __GLIBC__
+ int ioctl(int fd, unsigned long request, ...)
++#else
++int ioctl(int fd, int request, ...)
++#endif
+ {
+ 	va_list va;
+ 	int ret;
+-- 
+2.24.0
+
Signature · 1 line
2.24.0
#1 lore raw

PATCH 1/1 package/libdrm: fix nouveau tests compile for musl

Quoted 9 lines · On Mon, 25 Nov 2019 21:55:20 +0100 Peter Seiderer <[email protected]> wrote:

Add openembedded provided patch [2] to fix musl toolchain compile failures because of different ioctl() signatures, (int, int, ...) vs. (int, unsigned long, ...).

Fixes:

../tests/nouveau/threaded.c:39:5: error: conflicting types for 'ioctl' int ioctl(int fd, unsigned long request, ...)

Quoted 8 lines

[1] http://autobuild.buildroot.net/results/047f149a928ac2a17e25211a0a8a264ebae369ac
[2] https://github.com/openembedded/openembedded-core/blob/master/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch

---
 ...uveau-threaded-adapt-ioctl-signature.patch | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 package/libdrm/0006-tests-nouveau-threaded-adapt-ioctl-signature.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 package/libdrm: fix nouveau tests compile for musl

Hello Thomas,

Quoted 15 lines · Thomas Petazzoni
Quoted 12 lines · On Mon, 25 Nov 2019 21:55:20 +0100 Peter Seiderer <[email protected]> wrote:

Add openembedded provided patch [2] to fix musl toolchain compile failures because of different ioctl() signatures, (int, int, ...) vs. (int, unsigned long, ...).

Fixes:

../tests/nouveau/threaded.c:39:5: error: conflicting types for 'ioctl' int ioctl(int fd, unsigned long request, ...)

[1] http://autobuild.buildroot.net/results/047f149a928ac2a17e25211a0a8a264ebae369ac
[2] https://github.com/openembedded/openembedded-core/blob/master/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch

Quoted 7 lines
Quoted 5 lines
---
 ...uveau-threaded-adapt-ioctl-signature.patch | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 package/libdrm/0006-tests-nouveau-threaded-adapt-ioctl-signature.patch

Applied to master, thanks.

And finally suggested upstream, see [1]...and the same for two more old ones, see [2] and [3]...

Regards,
Peter

[1] https://gitlab.freedesktop.org/mesa/drm/merge_requests/30
[2] https://gitlab.freedesktop.org/mesa/drm/merge_requests/27
[3] https://gitlab.freedesktop.org/mesa/drm/merge_requests/28

Quoted 2 lines

Thomas

#3 lore raw

PATCH 1/1 package/libdrm: fix nouveau tests compile for musl

Hello Thomas,

Quoted 25 lines · Peter Seiderer

Hello Thomas,

Quoted 21 lines · Thomas Petazzoni
Quoted 17 lines · On Mon, 25 Nov 2019 21:55:20 +0100 Peter Seiderer <[email protected]> wrote:

Add openembedded provided patch [2] to fix musl toolchain compile failures because of different ioctl() signatures, (int, int, ...) vs. (int, unsigned long, ...).

Fixes:

../tests/nouveau/threaded.c:39:5: error: conflicting types for 'ioctl' int ioctl(int fd, unsigned long request, ...)

[1] http://autobuild.buildroot.net/results/047f149a928ac2a17e25211a0a8a264ebae369ac
[2] https://github.com/openembedded/openembedded-core/blob/master/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch

---
 ...uveau-threaded-adapt-ioctl-signature.patch | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 package/libdrm/0006-tests-nouveau-threaded-adapt-ioctl-signature.patch
Quoted 3 lines
Quoted 1 line

Applied to master, thanks.

And finally suggested upstream, see [1]...and the same for two more old ones, see [2] and [3]...

And as the way through gitlab merge requests seems to be the right one (instead of the mailing list), re-submitted two more old buildroot patches, see [4], [5]...

Regards,
Peter

[4] https://gitlab.freedesktop.org/mesa/drm/merge_requests/31
[5] https://gitlab.freedesktop.org/mesa/drm/merge_requests/32

Quoted 12 lines

Regards,
Peter

[1] https://gitlab.freedesktop.org/mesa/drm/merge_requests/30
[2] https://gitlab.freedesktop.org/mesa/drm/merge_requests/27
[3] https://gitlab.freedesktop.org/mesa/drm/merge_requests/28

Quoted 2 lines

Thomas