mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/mbpfan: fix musl / uclibc-ng patch

Browse Source 
Commit 759a08633e ("package/mbpfan: fix build on musl / uclibc-ng") added a
patch for musl / uclibc-ng, but the upstream patch did not correctly apply
to the 2.4.0 release, breaking the build.

Fix that.  In the mean time the patch has been applied upstream, so add a
reference to the upstream commit.

Fixes:

  https://autobuild.buildroot.net/results/785be6231c1edc4e5461ce083a3d65fd27fc5843/

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 717138c83c)
Signed-off-by: Thomas Perale <thomas.perale@mind.be>
This commit is contained in:
Peter Korsgaard
2025-09-04 21:48:17 +02:00
committed by Thomas Perale
parent 920c47a61c
commit bfc214fedf
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
package/mbpfan/0001-Makefile-util.c-fix-build-on-musl-uClibc-ng.patch
View File

@@ -1,4 +1,4 @@
From 924e38f159e4f5906f88cd8ddbe27f273c601cb0 Mon Sep 17 00:00:00 2001 From 2e6ae7ce5c28acaff9b3e77d7a693b7224a46003 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com> From: Peter Korsgaard <peter@korsgaard.com>
Date: Mon, 1 Sep 2025 12:08:53 +0200 Date: Mon, 1 Sep 2025 12:08:53 +0200
Subject: [PATCH] {Makefile,util.c}: fix build on musl / uClibc-ng Subject: [PATCH] {Makefile,util.c}: fix build on musl / uClibc-ng
@@ -27,6 +27,8 @@ _DEFAULT_SOURCE is:
https://github.com/bminor/glibc/blob/master/include/features.h#L417-L419 https://github.com/bminor/glibc/blob/master/include/features.h#L417-L419
Upstream: https://github.com/linux-on-mac/mbpfan/pull/271 Upstream: https://github.com/linux-on-mac/mbpfan/pull/271
(cherry picked from commit 25c2a09bd0d74e19c3843ce35ac54b5e288480ab)
[Peter: backport to 2.4.0]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
--- ---
Makefile | 2 +- Makefile | 2 +-
@@ -34,29 +36,29 @@ Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2 files changed, 1 insertion(+), 2 deletions(-) 2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 94d72ee..ff1b7e6 100644 index 41873fa..bb6c913 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -19,7 +19,7 @@ BINFLAG = -o @@ -19,7 +19,7 @@ BINFLAG = -o
INCLUDES = INCLUDES =
LIBS = -lm LIBS = -lm
LIBPATH = LIBPATH =
-CFLAGS += $(COPT) -g $(INCLUDES) -Wall -Wextra -Wno-unused-function -Wno-unused-parameter -std=c99 -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=500 -CFLAGS += $(COPT) -g $(INCLUDES) -Wall -Wextra -Wno-unused-function -std=c99 -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=500
+CFLAGS += $(COPT) -g $(INCLUDES) -Wall -Wextra -Wno-unused-function -Wno-unused-parameter -std=c99 -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE +CFLAGS += $(COPT) -g $(INCLUDES) -Wall -Wextra -Wno-unused-function -std=c99 -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE
LDFLAGS += $(LIBPATH) -g LDFLAGS += $(LIBPATH) -g
OBJS := $(patsubst %.$(C),%.$(OBJ),$(wildcard $(SOURCE_PATH)*.$(C))) OBJS := $(patsubst %.$(C),%.$(OBJ),$(wildcard $(SOURCE_PATH)*.$(C)))
diff --git a/src/util.c b/src/util.c diff --git a/src/util.c b/src/util.c
index df5b03f..25415b9 100644 index c66e6d7..b7fe71e 100644
--- a/src/util.c --- a/src/util.c
+++ b/src/util.c +++ b/src/util.c
@@ -1,6 +1,5 @@ @@ -1,6 +1,5 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
-#define __USE_MISC -#define __USE_MISC
#define _GNU_SOURCE
#include <syslog.h> #include <syslog.h>
#include "global.h"
-- --
2.39.5 2.39.5