rpi-userland: Add patches to fix compilation with musl libc

Signed-off-by Maarten ter Huurne <[email protected]>

---
 .../rpi-userland-003-disable-timer_t-typedef.patch | 22 ++++++++++++++++++++++
 .../rpi-userland-004-include-for-HZ.patch          | 19 +++++++++++++++++++
 ...land-005-do-not-check-__USE_FILE_OFFSET64.patch | 16 ++++++++++++++++
 package/rpi-userland/rpi-userland-006-mode_t.patch | 13 +++++++++++++
 4 files changed, 70 insertions(+)
 create mode 100644 package/rpi-userland/rpi-userland-003-disable-timer_t-typedef.patch
 create mode 100644 package/rpi-userland/rpi-userland-004-include-for-HZ.patch
 create mode 100644 package/rpi-userland/rpi-userland-005-do-not-check-__USE_FILE_OFFSET64.patch
 create mode 100644 package/rpi-userland/rpi-userland-006-mode_t.patch

package/rpi-userland/rpi-userland-003-disable-timer_t-typedef.patch new file +12 -0

new file mode 100644
index 0000000..e51a93f
@@ -0,0 +1,22 @@
+I don't know which platform is missing the timer_t definition, but it would
+be better to check for that platform specifically instead of explicitly
+excluding platforms that do have it.
+
+This fixes compilation with musl libc, which does define timer_t but does
+not define __timer_t.
+
+Note that _HAVE_TIMER_T suggests it would prevent breakage, but it is
+unrealistic to expect every application to set that macro. Not even all CMake
+files in the userland package itself set it...
+
+--- userland-f9e6f9f3def8dc18dc0092cd695ccf53b8ba3efe.org/interface/vcos/pthreads/vcos_platform.h	2014-08-05 19:43:53.000000000 +0200

Thanks. The naming of the patch files as well as the descriptions are good, but each patch is missing a SoB line, which we require. See
http://buildroot.org/downloads/manual/manual.html#_format_and_licensing_of
_the_package_patches.

Quoted 31 lines

diff --git a/package/rpi-userland/rpi-userland-003-disable-timer_t-typedef.patch b/package/rpi-userland/rpi-userland-003-disable-timer_t-typedef.patch new file mode 100644
index 0000000..e51a93f
--- /dev/null
+++
b/package/rpi-userland/rpi-userland-003-disable-timer_t-typedef.patch

(quoted diff) +1 -0

@@ -0,0 +1,22 @@
+I don't know which platform is missing the timer_t definition, but it

would +be better to check for that platform specifically instead of explicitly +excluding platforms that do have it.

(quoted diff) +2 -0

+
+This fixes compilation with musl libc, which does define timer_t but

does +not define __timer_t.

package/rpi-userland/rpi-userland-003-disable-timer_t-typedef.patch new file +3 -0

+
+Note that _HAVE_TIMER_T suggests it would prevent breakage, but it is
+unrealistic to expect every application to set that macro. Not even all

CMake +files in the userland package itself set it...
+
+---
userland-f9e6f9f3def8dc18dc0092cd695ccf53b8ba3efe.org/interface/vcos/pt
hreads/vcos_platform.h 2014-08-05 19:43:53.000000000 +0200 ++++
rpi-userland-f9e6f9f3def8dc18dc0092cd695ccf53b8ba3efe/interface/vcos/pt
hreads/vcos_platform.h 2014-09-11 21:04:36.418943953 +0200 +@@ -120,7
+120,7 @@

package/rpi-userland/rpi-userland-003-disable-timer_t-typedef.patch new file +5 -0

+
+ #define VCOS_ONCE_INIT        PTHREAD_ONCE_INIT
+
+-#if defined(__arm__) && !defined(_HAVE_TIMER_T) && !defined(ANDROID)
++#if 0

Quoted 3 lines

+ typedef __timer_t timer_t;
+ #endif
+ typedef struct VCOS_TIMER_T

I'm just not entirely convinced by this one: it should be the job of the rpi-userland build system to check for timer_t, and define HAVE_TIMER_T accordingly. It's definitely not the job of each and every application to set that macro, but really rpi-userland's build system.

Also, could you submit those patches upstream? We don't like much to carry a lot of patches in Buildroot, so the more patches can be merged upstream, the better.

That's what you'd expect from the HAVE_* name, but there isn't a timer_h check in the rpi-userland build system. There is a hardcoded "CFLAGS+=- D_HAVE_TIMER_T" for a single application inside rpi-userland, the other applications don't define it.

The reason I wrote "every application" is that this header can be indirectly included by applications using EGL:

$ output/host/usr/bin/pkg-config --cflags egl
-I/home/mth/pi/buildroot/output/host/usr/arm-pingux-linux-
musleabihf/sysroot/usr/include/
-I/home/mth/pi/buildroot/output/host/usr/arm-pingux-linux-
musleabihf/sysroot/usr/include/interface/vcos/pthreads/
-I/home/mth/pi/buildroot/output/host/usr/arm-pingux-linux-
musleabihf/sysroot/usr/include/interface/vmcs_host/linux/

In theory -D_HAVE_TIMER_H could be added to Cflags in egl.pc, but that might interfere with application packages. At least in the context of Buildroot, where none of the supported libcs require this typedef, disabling this check is the safest approach, in my opinion.

Also I wonder if there really is a platform on which this typedef helps: it would only help on a platform that does implement POSIX timers (it's an optional feature), but for some reason doesn't define timer_t. It just doesn't sound very likely...

Looking at the header again, I see it doesn't actually use timer_t anywhere. In fact, nowhere in the entire rpi_userland package is timer_t used. So the whole check + typedef can just be removed.

Quoted 4 lines

Also, could you submit those patches upstream? We don't like much to carry a lot of patches in Buildroot, so the more patches can be merged upstream, the better.

https://github.com/raspberrypi/userland/issues/202
https://github.com/raspberrypi/userland/pull/201

Signed-off-by Maarten ter Huurne <[email protected]>

---
The second version of this patch was missing the "v2" label; this is the third version.

The changes from v2, plus an additional change I made later were merged upstream. This patch bumps the git revision to the merge commit.

rpi-userland-002-remove-faulty-assert.patch had to be updated to match other changes in the code that are pulled in by the version bump. I checked that the updated patch compiles fine, but I have no idea whether it is still needed to fix or work around a runtime problem.

 .../rpi-userland-002-remove-faulty-assert.patch    | 25 ++++++++++++----------
 package/rpi-userland/rpi-userland.mk               |  2 +-
 2 files changed, 15 insertions(+), 12 deletions(-)

package/rpi-userland/rpi-userland-002-remove-faulty-assert.patch +14 -11

index c23c43a..450f287 100644
@@ -3,19 +3,22 @@ interface: remove faulty assert() to make weston happy at runtime
 This was removed after a discussion on IRC with the weston guys
 ('daniels' on irc.freenode.net/#wayland).
 
+Rebased on 4333d6d by Maarten ter Huurne <[email protected]>.
+
 Signed-off-by: "Yann E. MORIN" <[email protected]>
 ---
 Upstream status: no, will be pushed by weston guys later.
 If not, I'll do it.
 
-diff -durN rpi-userland-77d32cd.orig/interface/vmcs_host/vc_vchi_dispmanx.c rpi-userland-77d32cd/interface/vmcs_host/vc_vchi_dispmanx.c
---- rpi-userland-77d32cd.orig/interface/vmcs_host/vc_vchi_dispmanx.c	2013-10-04 17:43:44.000000000 +0200
-+++ rpi-userland-77d32cd/interface/vmcs_host/vc_vchi_dispmanx.c	2013-10-08 22:28:51.611433539 +0200
-@@ -1187,7 +1187,6 @@
-          continue;
-    
-       if(dispmanx_client.update_callback ) {
--         vcos_assert( dispmanx_client.pending_update_handle == (DISPMANX_UPDATE_HANDLE_T) dispmanx_client.notify_buffer[1]);
-          dispmanx_client.update_callback((DISPMANX_UPDATE_HANDLE_T) dispmanx_client.notify_buffer[1], dispmanx_client.update_callback_param);
-       }
-    }
+diff --git a/interface/vmcs_host/vc_vchi_dispmanx.c b/interface/vmcs_host/vc_vchi_dispmanx.c
+index 85b373c..59a01f8 100755
+--- a/interface/vmcs_host/vc_vchi_dispmanx.c
++++ b/interface/vmcs_host/vc_vchi_dispmanx.c
+@@ -1296,7 +1296,6 @@ static void *dispmanx_notify_func( void *arg ) {
+          // Decrement the use count - the corresponding "use" is in vc_dispmanx_update_submit.
+          vchi_service_release(dispmanx_client.notify_handle[0]);
+          if (dispmanx_client.update_callback ) {
+-            vcos_assert( dispmanx_client.pending_update_handle == handle);
+             dispmanx_client.update_callback(handle, dispmanx_client.update_callback_param);
+          }
+       } else {

package/rpi-userland/rpi-userland.mk +1 -1

index c738b62..8a71f93 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_USERLAND_VERSION = ffcc4bd7c4875b71376c4240116e251652c9bec0
+RPI_USERLAND_VERSION = 4333d6d023a1f0dcc763d0706a1fe6523f9b6005
 RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION))
 RPI_USERLAND_LICENSE = BSD-3c
 RPI_USERLAND_LICENSE_FILES = LICENCE

Signature · 1 line

1.8.4.5

Signed-off-by Maarten ter Huurne <[email protected]>

---
The second version of this patch was missing the "v2" label; this is the third version.

The changes from v2, plus an additional change I made later were merged upstream. This patch bumps the git revision to the merge commit.

rpi-userland-002-remove-faulty-assert.patch had to be updated to match other changes in the code that are pulled in by the version bump. I checked that the updated patch compiles fine, but I have no idea whether it is still needed to fix or work around a runtime problem.

 .../rpi-userland-002-remove-faulty-assert.patch    | 25 ++++++++++++----------
 package/rpi-userland/rpi-userland.mk               |  2 +-
 2 files changed, 15 insertions(+), 12 deletions(-)

package/rpi-userland/rpi-userland-002-remove-faulty-assert.patch +14 -11

index c23c43a..450f287 100644
@@ -3,19 +3,22 @@ interface: remove faulty assert() to make weston happy at runtime
 This was removed after a discussion on IRC with the weston guys
 ('daniels' on irc.freenode.net/#wayland).
 
+Rebased on 4333d6d by Maarten ter Huurne <[email protected]>.
+
 Signed-off-by: "Yann E. MORIN" <[email protected]>
 ---
 Upstream status: no, will be pushed by weston guys later.
 If not, I'll do it.
 
-diff -durN rpi-userland-77d32cd.orig/interface/vmcs_host/vc_vchi_dispmanx.c rpi-userland-77d32cd/interface/vmcs_host/vc_vchi_dispmanx.c
---- rpi-userland-77d32cd.orig/interface/vmcs_host/vc_vchi_dispmanx.c	2013-10-04 17:43:44.000000000 +0200
-+++ rpi-userland-77d32cd/interface/vmcs_host/vc_vchi_dispmanx.c	2013-10-08 22:28:51.611433539 +0200
-@@ -1187,7 +1187,6 @@
-          continue;
-    
-       if(dispmanx_client.update_callback ) {
--         vcos_assert( dispmanx_client.pending_update_handle == (DISPMANX_UPDATE_HANDLE_T) dispmanx_client.notify_buffer[1]);
-          dispmanx_client.update_callback((DISPMANX_UPDATE_HANDLE_T) dispmanx_client.notify_buffer[1], dispmanx_client.update_callback_param);
-       }
-    }
+diff --git a/interface/vmcs_host/vc_vchi_dispmanx.c b/interface/vmcs_host/vc_vchi_dispmanx.c
+index 85b373c..59a01f8 100755
+--- a/interface/vmcs_host/vc_vchi_dispmanx.c
++++ b/interface/vmcs_host/vc_vchi_dispmanx.c
+@@ -1296,7 +1296,6 @@ static void *dispmanx_notify_func( void *arg ) {
+          // Decrement the use count - the corresponding "use" is in vc_dispmanx_update_submit.
+          vchi_service_release(dispmanx_client.notify_handle[0]);
+          if (dispmanx_client.update_callback ) {
+-            vcos_assert( dispmanx_client.pending_update_handle == handle);
+             dispmanx_client.update_callback(handle, dispmanx_client.update_callback_param);
+          }
+       } else {

package/rpi-userland/rpi-userland.mk +1 -1

index c738b62..8a71f93 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_USERLAND_VERSION = ffcc4bd7c4875b71376c4240116e251652c9bec0
+RPI_USERLAND_VERSION = 4333d6d023a1f0dcc763d0706a1fe6523f9b6005
 RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION))
 RPI_USERLAND_LICENSE = BSD-3c
 RPI_USERLAND_LICENSE_FILES = LICENCE

Signature · 1 line

1.8.4.5

On 2014-10-17 17:57 +0200, Maarten ter Huurne spake thusly:

Quoted 5 lines

Signed-off-by Maarten ter Huurne <[email protected]>

---
The second version of this patch was missing the "v2" label; this is the third version.

Quoted 7 lines

The changes from v2, plus an additional change I made later were merged upstream. This patch bumps the git revision to the merge commit.

rpi-userland-002-remove-faulty-assert.patch had to be updated to match other changes in the code that are pulled in by the version bump. I checked that the updated patch compiles fine, but I have no idea whether it is still needed to fix or work around a runtime problem.

So, I have tested this bump: weston on the rpi no longer works, with or without the asser patch.

So, I NAK this bump for now.

I'll see to bisect rpi-userland to see where it breaks.

Maarten, All,

On 2014-10-18 13:05 +0200, Yann E. MORIN spake thusly:

Quoted 20 lines

On 2014-10-17 17:57 +0200, Maarten ter Huurne spake thusly:

Quoted 5 lines

Signed-off-by Maarten ter Huurne <[email protected]>

---
The second version of this patch was missing the "v2" label; this is the third version.

Quoted 8 lines

The changes from v2, plus an additional change I made later were merged
upstream. This patch bumps the git revision to the merge commit.

rpi-userland-002-remove-faulty-assert.patch had to be updated to match other changes in the code that are pulled in by the version bump. I checked that the updated patch compiles fine, but I have no idea whether it is still needed to fix or work around a runtime problem.

So, I have tested this bump: weston on the rpi no longer works, with or without the asser patch.

So, I NAK this bump for now.

Quoted 1 line

I'll see to bisect rpi-userland to see where it breaks.

The culprit is:
66338d3 vc_dispmanx: Fix vsync service use counting

Unfortunately, weston has yet no fix for that, and I could not spot any fix for rpi-userland either... :-/

So, still NAK for this bump. We can still bump it up to ba753c1 as this still works, but is not enough to get the musl fixes.

Maybe we could just hide it for musl for now?

Quoted 25 lines

Maarten, All,

On 2014-10-18 13:05 +0200, Yann E. MORIN spake thusly:

Quoted 21 lines

On 2014-10-17 17:57 +0200, Maarten ter Huurne spake thusly:

Quoted 5 lines

Signed-off-by Maarten ter Huurne <[email protected]>

---
The second version of this patch was missing the "v2" label; this is the third version.

Quoted 8 lines

The changes from v2, plus an additional change I made later were merged
upstream. This patch bumps the git revision to the merge commit.

rpi-userland-002-remove-faulty-assert.patch had to be updated to match other changes in the code that are pulled in by the version bump. I checked that the updated patch compiles fine, but I have no idea whether it is still needed to fix or work around a runtime problem.

So, I have tested this bump: weston on the rpi no longer works, with or without the asser patch.

So, I NAK this bump for now.

I'll see to bisect rpi-userland to see where it breaks.

Quoted 5 lines

The culprit is:
66338d3 vc_dispmanx: Fix vsync service use counting

Unfortunately, weston has yet no fix for that, and I could not spot any fix for rpi-userland either... :-/

That commit is less than a week old; rpi-userland might not be aware of the problem. Will you or the Weston devs file a bug for it or alert the author?

By the way, 66338d3 is the commit that gives a NULL handle a special meaning. If the assert no longer triggers, perhaps the assert used to trigger on the handle being NULL by accident?

Quoted 4 lines

So, still NAK for this bump. We can still bump it up to ba753c1 as this still works, but is not enough to get the musl fixes.

Maybe we could just hide it for musl for now?

I think it would be a pity to hide it when we have a fix for the musl compile problem.

The only differences between the the proposed bump (4333d6d) and the last working version (ba753c1) are the commit that breaks Weston (66338d3) and the musl compile fixes. So I could create a v4 patch which bumps the version to 4333d6d and contains a patch to revert 66338d3.

Alternatively, I could create a v4 patch which bumps the version to ba753c1 and adds the musl compile fixes as separate patches. While the number of patches would be greater (5 vs 1), the number of changed lines would be smaller, since most of the compile fixes change one line each.

Or I could create a v4 patch which bumps the version to ba753c1 and adds the musl compile fixes as a single patch. Since we know they have been accepted upstream in the same merge commit (4333d6d), we can drop all of them at the same time once we can safely bump beyond that merge commit.

At the moment I prefer bumping to ba753c1 + squashed musl compile fixes, but I'd like a second opinion.

Maarten, All,

On 2014-10-18 14:15 +0200, Maarten ter Huurne spake thusly:

Quoted 29 lines · On Saturday 18 October 2014 13:34:46 Yann E. MORIN wrote:

Quoted 5 lines

So, still NAK for this bump. We can still bump it up to ba753c1 as this
still works, but is not enough to get the musl fixes.

Maybe we could just hide it for musl for now?

I think it would be a pity to hide it when we have a fix for the musl compile problem.

The only differences between the the proposed bump (4333d6d) and the last
working version (ba753c1) are the commit that breaks Weston (66338d3) and
the musl compile fixes. So I could create a v4 patch which bumps the version to 4333d6d and contains a patch to revert 66338d3.

Alternatively, I could create a v4 patch which bumps the version to ba753c1 and adds the musl compile fixes as separate patches. While the number of patches would be greater (5 vs 1), the number of changed lines would be smaller, since most of the compile fixes change one line each.

Or I could create a v4 patch which bumps the version to ba753c1 and adds the musl compile fixes as a single patch. Since we know they have been accepted upstream in the same merge commit (4333d6d), we can drop all of them at the same time once we can safely bump beyond that merge commit.

Quoted 2 lines

At the moment I prefer bumping to ba753c1 + squashed musl compile fixes, but I'd like a second opinion.

Well, I do not want to have weston break. weston is, as far as I can see, the only package in Buildroot that can make use of rpi-userland. Breaking it is out of the equation.

If the backport on-top of ba753c1 is easy, then that's OK for me. The patches are upstream, so it's OK to bundle them until either rpi-userland or/and weston upstream fix the issue.

Quoted 3 lines

Well, I do not want to have weston break. weston is, as far as I can see, the only package in Buildroot that can make use of rpi-userland. Breaking it is out of the equation.

rpi-userland provides GL ES (BR2_PACKAGE_HAS_LIBGLES) among other features, so there are several more packages that depend on it.

I have a git clone of rpi-userland set up already to be able to submit the patches upstream, so creating a combined patch is not much work. I'll do that.

On 2014-10-18 18:46 +0200, Maarten ter Huurne spake thusly:

Quoted 3 lines

I have a git clone of rpi-userland set up already to be able to submit the patches upstream, so creating a combined patch is not much work. I'll do that.

So, I take it you have a fix for this issue?

Signed-off-by Maarten ter Huurne <[email protected]>

---
 .../rpi-userland-003-fix-musl-compile.patch        | 113 +++++++++++++++++++++
 package/rpi-userland/rpi-userland.mk               |   2 +-
 2 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 package/rpi-userland/rpi-userland-003-fix-musl-compile.patch

package/rpi-userland/rpi-userland-003-fix-musl-compile.patch new file +113 -0

new file mode 100644
index 0000000..f960482
@@ -0,0 +1,113 @@
+From 198d93fab0659f7a548329d742de8b3e27cfd977 Mon Sep 17 00:00:00 2001
+From: Maarten ter Huurne <[email protected]>
+Date: Fri, 12 Sep 2014 18:28:51 +0200
+Subject: [PATCH] Combined musl compile fixes
+
+The individual patches and their descriptions can be found here:
+https://github.com/raspberrypi/userland/pull/201
+
+Upstream status: accepted (4333d6d)
+However, bumping to that revision is currently not an option since that
+also pulls in 66338d3 which breaks Weston:
+http://lists.busybox.net/pipermail/buildroot/2014-October/109309.html
+
+Signed-off-by: Maarten ter Huurne <[email protected]>
+---
+ containers/CMakeLists.txt                                  | 2 +-
+ host_applications/linux/apps/hello_pi/CMakeLists.txt       | 2 +-
+ host_applications/linux/apps/hello_pi/libs/vgfont/Makefile | 1 -
+ interface/vcos/pthreads/vcos_platform.h                    | 3 ---
+ interface/vcos/pthreads/vcos_pthreads.c                    | 2 +-
+ interface/vmcs_host/linux/vcfilesys.c                      | 4 ++--
+ 6 files changed, 5 insertions(+), 9 deletions(-)
+
+diff --git a/containers/CMakeLists.txt b/containers/CMakeLists.txt
+index 721f74f..a29a885 100644
+--- a/containers/CMakeLists.txt
++++ b/containers/CMakeLists.txt
+@@ -13,7 +13,7 @@ add_definitions(-DDL_PATH_PREFIX="${VMCS_PLUGIN_DIR}/")
+ 
+ SET( GCC_COMPILER_FLAGS -Wall -g -O2 -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wcast-qual -Wwrite-strings -Wundef )
+ SET( GCC_COMPILER_FLAGS ${GCC_COMPILER_FLAGS} -Wextra )#-Wno-missing-field-initializers )
+-SET( GCC_COMPILER_FLAGS ${GCC_COMPILER_FLAGS} -D__STDC_VERSION__=199901L )
++SET( GCC_COMPILER_FLAGS ${GCC_COMPILER_FLAGS} -std=c99 -D_POSIX_C_SOURCE=199309L )
+ SET( GCC_COMPILER_FLAGS ${GCC_COMPILER_FLAGS} -Wno-missing-field-initializers )
+ SET( GCC_COMPILER_FLAGS ${GCC_COMPILER_FLAGS} -Wno-unused-value )
+ 
+diff --git a/host_applications/linux/apps/hello_pi/CMakeLists.txt b/host_applications/linux/apps/hello_pi/CMakeLists.txt
+index ab4dae3..f2c6aef 100644
+--- a/host_applications/linux/apps/hello_pi/CMakeLists.txt
++++ b/host_applications/linux/apps/hello_pi/CMakeLists.txt
+@@ -24,7 +24,7 @@ add_subdirectory(hello_teapot)
+ 
+ if(BUILD_FONT)
+ set(VGFONT_SRCS libs/vgfont/font.c libs/vgfont/vgft.c libs/vgfont/graphics.c)
+-set_source_files_properties(${VGFONT_SRCS} PROPERTIES COMPILE_DEFINITIONS "_HAVE_TIMER_T")
++set_source_files_properties(${VGFONT_SRCS} PROPERTIES COMPILE_DEFINITIONS)
+ add_library(vgfont ${VGFONT_SRCS})
+ 
+ add_subdirectory(hello_font)
+diff --git a/host_applications/linux/apps/hello_pi/libs/vgfont/Makefile b/host_applications/linux/apps/hello_pi/libs/vgfont/Makefile
+index d04fb08..1e2a22b 100755
+--- a/host_applications/linux/apps/hello_pi/libs/vgfont/Makefile
++++ b/host_applications/linux/apps/hello_pi/libs/vgfont/Makefile
+@@ -2,7 +2,6 @@ OBJS=font.o vgft.o graphics.o
+ LIB=libvgfont.a
+ 
+ INCLUDES+=-I$(SDKSTAGE)/usr/include/freetype2 -I$(SDKSTAGE)/usr/include -I$(SDKSTAGE)/usr/include/arm-linux-gnueabi
+-CFLAGS+=-D_HAVE_TIMER_T
+ 
+ include ../../Makefile.include
+ 
+diff --git a/interface/vcos/pthreads/vcos_platform.h b/interface/vcos/pthreads/vcos_platform.h
+index 468098b..2095e25 100755
+--- a/interface/vcos/pthreads/vcos_platform.h
++++ b/interface/vcos/pthreads/vcos_platform.h
+@@ -120,9 +120,6 @@ typedef struct
+ 
+ #define VCOS_ONCE_INIT        PTHREAD_ONCE_INIT
+ 
+-#if defined(__arm__) && !defined(_HAVE_TIMER_T) && !defined(ANDROID)
+-typedef __timer_t timer_t;
+-#endif
+ typedef struct VCOS_TIMER_T
+ {
+    pthread_t thread;                      /**< id of the timer thread */
+diff --git a/interface/vcos/pthreads/vcos_pthreads.c b/interface/vcos/pthreads/vcos_pthreads.c
+index 668f647..fdc8bc4 100644
+--- a/interface/vcos/pthreads/vcos_pthreads.c
++++ b/interface/vcos/pthreads/vcos_pthreads.c
+@@ -33,7 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <sys/time.h>
+-#include <sys/param.h>
++#include <linux/param.h>
+ 
+ /* Cygwin doesn't always have prctl.h and it doesn't have PR_SET_NAME */
+ #if defined( __linux__ )
+diff --git a/interface/vmcs_host/linux/vcfilesys.c b/interface/vmcs_host/linux/vcfilesys.c
+index ab65e3e..53c7486 100644
+--- a/interface/vmcs_host/linux/vcfilesys.c
++++ b/interface/vmcs_host/linux/vcfilesys.c
+@@ -49,7 +49,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #include <ctype.h>
+ #include <limits.h>
+ 
+-#if !defined(ANDROID) && !defined( __USE_FILE_OFFSET64 )
++#if defined(__GLIBC__) && !defined( __USE_FILE_OFFSET64 )
+ #error   "__USE_FILE_OFFSET64 isn't defined"
+ #endif
+ 
+@@ -916,7 +916,7 @@ int vc_hostfs_set_attr(const char *path, fattributes_t attr)
+ 
+    if (pathbuf)
+    {
+-      __mode_t mode = 0;
++      mode_t mode = 0;
+       struct stat sb;
+ 
+       backslash_to_slash(pathbuf);
+-- 
+1.8.4.5
+

package/rpi-userland/rpi-userland.mk +1 -1

index c738b62..feac277 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_USERLAND_VERSION = ffcc4bd7c4875b71376c4240116e251652c9bec0
+RPI_USERLAND_VERSION = ba753c1a7f68d7a2e00edaf03364eef001e233ef
 RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION))
 RPI_USERLAND_LICENSE = BSD-3c
 RPI_USERLAND_LICENSE_FILES = LICENCE

Signature · 1 line

1.8.4.5

Signed-off-by Maarten ter Huurne <[email protected]>

---
 .../rpi-userland-003-fix-musl-compile.patch        | 113 +++++++++++++++++++++
 package/rpi-userland/rpi-userland.mk               |   2 +-
 2 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 package/rpi-userland/rpi-userland-003-fix-musl-compile.patch