From 05983d5f1fd8b8c42f097891e10ba53276ef67e8 Mon Sep 17 00:00:00 2001 From: tihmstar Date: Mon, 10 Apr 2023 11:00:32 +0200 Subject: [PATCH] fix a general compilation error and one tvOS specific compilation error --- Makefile | 1 + makefiles/system-cmds.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 685f0f7f36..673add70c4 100644 --- a/Makefile +++ b/Makefile @@ -1474,6 +1474,7 @@ endif @sed -E s/'__IOS_PROHIBITED|__TVOS_PROHIBITED|__WATCHOS_PROHIBITED'//g < $(TARGET_SYSROOT)/usr/include/unistd.h > $(BUILD_BASE)$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/include/unistd.h @sed -E s/'__IOS_PROHIBITED|__TVOS_PROHIBITED|__WATCHOS_PROHIBITED'//g < $(TARGET_SYSROOT)/usr/include/mach/task.h > $(BUILD_BASE)$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/include/mach/task.h @sed -E s/'__IOS_PROHIBITED|__TVOS_PROHIBITED|__WATCHOS_PROHIBITED'//g < $(TARGET_SYSROOT)/usr/include/mach/mach_host.h > $(BUILD_BASE)$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/include/mach/mach_host.h + @sed -E s/'__IOS_PROHIBITED|__TVOS_PROHIBITED|__WATCHOS_PROHIBITED'//g < $(TARGET_SYSROOT)/usr/include/mach/thread_act.h > $(BUILD_BASE)$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/include/mach/thread_act.h @sed -E s/'__IOS_PROHIBITED|__TVOS_PROHIBITED|__WATCHOS_PROHIBITED'//g < $(TARGET_SYSROOT)/usr/include/ucontext.h > $(BUILD_BASE)$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/include/ucontext.h @sed -E s/'__IOS_PROHIBITED|__TVOS_PROHIBITED|__WATCHOS_PROHIBITED'//g < $(TARGET_SYSROOT)/usr/include/signal.h > $(BUILD_BASE)$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/include/signal.h @sed -E /'__API_UNAVAILABLE'/d < $(TARGET_SYSROOT)/usr/include/pthread.h > $(BUILD_BASE)$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/include/pthread.h diff --git a/makefiles/system-cmds.mk b/makefiles/system-cmds.mk index 917d5d676f..cf0758ba23 100644 --- a/makefiles/system-cmds.mk +++ b/makefiles/system-cmds.mk @@ -43,7 +43,7 @@ endif sed -i 's|#include |#include |' $(BUILD_WORK)/system-cmds/memory_pressure.tproj/memory_pressure.c # Allow placing kernels from [redacted] sources on rootless sed -i 's|/System/Library/Kernels/kernel.development|$(MEMO_PREFIX)/Library/Kernels/kernel.development|' $(BUILD_WORK)/system-cmds/latency.tproj/latency.{1,c} - + sed -i 's/plonk(sc_token);/plonk(sc_tokid);/g' $(BUILD_WORK)/system-cmds/at.tproj/parsetime.c ### # TODO: Once I implement pam_chauthtok() in pam_unix.so, use PAM for passwd ###