package/libapparmor: fix build on musl

Fix build of version 3.0.0 with musl. Since the apparmor and
libapparmor packages share the same sources, we also share their
patches: this is why the patch is added in package/libapparmor/3.0.0,
and a symlink package/apparmor/3.0.0 -> package/libapparmor/3.0.0 is
added.

Fixes:
 - http://autobuild.buildroot.org/results/22fb440240aa698acc68f026be790d5366c8f908

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine 2020-10-15 18:24:13 +02:00 committed by Thomas Petazzoni
parent a13999718d
commit dad3f09b6b
2 changed files with 36 additions and 0 deletions

1
package/apparmor/3.0.0 Symbolic link
View File

@ -0,0 +1 @@
../libapparmor/3.0.0/

View File

@ -0,0 +1,35 @@
From 47263a3a74d7973e7a54b17db6aa903701468ffd Mon Sep 17 00:00:00 2001
From: Patrick Steinhardt <ps@pks.im>
Date: Sat, 3 Oct 2020 20:37:55 +0200
Subject: [PATCH] libapparmor: add missing include for `socklen_t`
While `include/sys/apparmor.h` makes use of `socklen_t`, it doesn't
include the `<sys/socket.h>` header to make its declaration available.
While this works on systems using glibc via transitive includes, it
breaks compilation on musl libc.
Fix the issue by including the header.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
[Retrieved from:
https://gitlab.com/apparmor/apparmor/-/commit/47263a3a74d7973e7a54b17db6aa903701468ffd]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
libraries/libapparmor/include/sys/apparmor.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/libraries/libapparmor/include/sys/apparmor.h b/libraries/libapparmor/include/sys/apparmor.h
index 32892d065..d70eff947 100644
--- a/libraries/libapparmor/include/sys/apparmor.h
+++ b/libraries/libapparmor/include/sys/apparmor.h
@@ -21,6 +21,7 @@
#include <stdbool.h>
#include <stdint.h>
#include <unistd.h>
+#include <sys/socket.h>
#include <sys/types.h>
#ifdef __cplusplus
--
GitLab