mirror of
https://git.busybox.net/buildroot.git
synced 2024-11-23 05:23:39 +08:00
d201f2f5cd
This commit adds 3 patches that fix various implicit declarations error that arise with GCC 14.x. Fixes host-android-tools build issues: http://autobuild.buildroot.net/results/1fd0d0a9547d4ad2a24916eb79230d49a825e694 http://autobuild.buildroot.net/results/9e3bb951d7db1c8a8725b5570c54f6dec0e8b344 http://autobuild.buildroot.net/results/8c9345fcad6e935c13b16c318bbb27282de10ac1 http://autobuild.buildroot.net/results/4e8a2ce69bfb8a86da2711cb32a99ad51b0bdf5f http://autobuild.buildroot.net/results/ca6310cfcb0a9787eb5cec3c33aab903f4964cab http://autobuild.buildroot.net/results/a77509d4df8281d666d870faeb008f9196d3bbc3 http://autobuild.buildroot.net/results/74cdcbcbe8bab244b1c368260162e3cef133376f http://autobuild.buildroot.net/results/225b2722b030b1ea1706db8dd54d62da81d8725b As well as android-tools build issues: http://autobuild.buildroot.net/results/abfaf53328d0b29c778f75e105cc7043f2ad44fe http://autobuild.buildroot.net/results/d2467a2ac4a915d850cc8bc2341d9803346604a9 http://autobuild.buildroot.net/results/a4cf59ce479b7db7f0a3269c0462ce1ccc9f600e http://autobuild.buildroot.net/results/667a49bff45b226dec4349d54f977c8bd6abadd5 http://autobuild.buildroot.net/results/92cf3eea0e0d7531220cd9850993e269a3a4744d Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
55 lines
1.7 KiB
Diff
55 lines
1.7 KiB
Diff
From 83f9bed233b86dd2bbf603611b13b673caeccb69 Mon Sep 17 00:00:00 2001
|
||
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||
Date: Sun, 14 Jul 2024 11:46:51 +0200
|
||
Subject: [PATCH] extras/ext4_utils/make_ext4fs_main.c: disable
|
||
Android-specific code
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
Since we are not building with the Android code, we do not have the
|
||
implementation of the selinux_android_file_context_handle(). However,
|
||
its only call site is when 'mountpoint' is set, and 'mountpoint'
|
||
cannot be non-NULL in non-Android cases due to how the -a option is
|
||
parsed:
|
||
|
||
case 'a':
|
||
#ifdef ANDROID
|
||
fs_config_func = fs_config;
|
||
mountpoint = optarg;
|
||
#else
|
||
fprintf(stderr, "can't set android permissions - built without android support\n");
|
||
usage(argv[0]);
|
||
exit(EXIT_FAILURE);
|
||
#endif
|
||
|
||
So also compile out the code calling
|
||
selinux_android_file_context_handle() when ANDROID is not set.
|
||
|
||
Fixes:
|
||
|
||
make_ext4fs_main.c:155:25: error: implicit declaration of function ‘selinux_android_file_context_handle’ [-Wimplicit-function-declaration]
|
||
|
||
Upstream: N/A, we're too far from upstream
|
||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||
---
|
||
extras/ext4_utils/make_ext4fs_main.c | 2 +-
|
||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
||
diff --git a/extras/ext4_utils/make_ext4fs_main.c b/extras/ext4_utils/make_ext4fs_main.c
|
||
index 17d3735..cb58011 100644
|
||
--- a/extras/ext4_utils/make_ext4fs_main.c
|
||
+++ b/extras/ext4_utils/make_ext4fs_main.c
|
||
@@ -149,7 +149,7 @@ int main(int argc, char **argv)
|
||
}
|
||
}
|
||
|
||
-#if !defined(HOST)
|
||
+#if !defined(HOST) && defined(ANDROID)
|
||
// Use only if -S option not requested
|
||
if (!sehnd && mountpoint) {
|
||
sehnd = selinux_android_file_context_handle();
|
||
--
|
||
2.45.2
|
||
|