mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 21:27:45 +00:00
AK+Lagom: Make it possible to build for iOS
This commit makes it possible to build AK and most of Lagom for iOS, based on the work for the Ladybird build demoed on discord: https://discord.com/channels/830522505605283862/830525031720943627/1211987732646068314
This commit is contained in:
Filiph Siitam Sandström
Andrew Kaster
parent
2dce453f11
commit
fd694e8672
17 changed files with 44 additions and 31 deletions
|
|
@ -55,7 +55,7 @@ if (SERENITYOS)
|
|||
list(APPEND SOURCES FileWatcherSerenity.cpp)
|
||||
elseif (LINUX AND NOT EMSCRIPTEN)
|
||||
list(APPEND SOURCES FileWatcherLinux.cpp)
|
||||
elseif (APPLE)
|
||||
elseif (APPLE AND NOT IOS)
|
||||
list(APPEND SOURCES FileWatcherMacOS.mm)
|
||||
else()
|
||||
list(APPEND SOURCES FileWatcherUnimplemented.cpp)
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
#include "Environment.h"
|
||||
#include <AK/ByteString.h>
|
||||
|
||||
#if defined(AK_OS_MACOS)
|
||||
#if defined(AK_OS_MACOS) || defined(AK_OS_IOS)
|
||||
# include <crt_externs.h>
|
||||
#else
|
||||
extern char** environ;
|
||||
|
|
@ -20,7 +20,7 @@ namespace Core::Environment {
|
|||
|
||||
char** raw_environ()
|
||||
{
|
||||
#if defined(AK_OS_MACOS)
|
||||
#if defined(AK_OS_MACOS) || defined(AK_OS_IOS)
|
||||
return *_NSGetEnviron();
|
||||
#else
|
||||
return environ;
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ bool LocalServer::listen(ByteString const& address)
|
|||
fcntl(m_fd, F_SETFD, FD_CLOEXEC);
|
||||
#endif
|
||||
VERIFY(m_fd >= 0);
|
||||
#ifndef AK_OS_MACOS
|
||||
#if !defined(AK_OS_MACOS) && !defined(AK_OS_IOS)
|
||||
rc = fchmod(m_fd, 0600);
|
||||
if (rc < 0) {
|
||||
perror("fchmod");
|
||||
|
|
@ -118,7 +118,7 @@ ErrorOr<NonnullOwnPtr<LocalSocket>> LocalServer::accept()
|
|||
VERIFY(m_listening);
|
||||
sockaddr_un un;
|
||||
socklen_t un_size = sizeof(un);
|
||||
#if !defined(AK_OS_MACOS) && !defined(AK_OS_HAIKU)
|
||||
#if !defined(AK_OS_MACOS) && !defined(AK_OS_IOS) && !defined(AK_OS_HAIKU)
|
||||
int accepted_fd = ::accept4(m_fd, (sockaddr*)&un, &un_size, SOCK_NONBLOCK | SOCK_CLOEXEC);
|
||||
#else
|
||||
int accepted_fd = ::accept(m_fd, (sockaddr*)&un, &un_size);
|
||||
|
|
@ -127,7 +127,7 @@ ErrorOr<NonnullOwnPtr<LocalSocket>> LocalServer::accept()
|
|||
return Error::from_syscall("accept"sv, -errno);
|
||||
}
|
||||
|
||||
#if defined(AK_OS_MACOS) || defined(AK_OS_HAIKU)
|
||||
#if defined(AK_OS_MACOS) || defined(AK_OS_IOS) || defined(AK_OS_HAIKU)
|
||||
int option = 1;
|
||||
ioctl(m_fd, FIONBIO, &option);
|
||||
(void)fcntl(accepted_fd, F_SETFD, FD_CLOEXEC);
|
||||
|
|
|
|||
|
|
@ -358,7 +358,7 @@ ErrorOr<void> LocalSocket::send_fd(int fd)
|
|||
|
||||
ErrorOr<pid_t> LocalSocket::peer_pid() const
|
||||
{
|
||||
#ifdef AK_OS_MACOS
|
||||
#if defined(AK_OS_MACOS) || defined(AK_OS_IOS)
|
||||
pid_t pid;
|
||||
socklen_t pid_size = sizeof(pid);
|
||||
#elif defined(AK_OS_FREEBSD)
|
||||
|
|
@ -380,7 +380,7 @@ ErrorOr<pid_t> LocalSocket::peer_pid() const
|
|||
socklen_t creds_size = sizeof(creds);
|
||||
#endif
|
||||
|
||||
#ifdef AK_OS_MACOS
|
||||
#if defined(AK_OS_MACOS) || defined(AK_OS_IOS)
|
||||
TRY(System::getsockopt(m_helper.fd(), SOL_LOCAL, LOCAL_PEERPID, &pid, &pid_size));
|
||||
return pid;
|
||||
#elif defined(AK_OS_FREEBSD)
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ static int memfd_create(char const* name, unsigned int flags)
|
|||
}
|
||||
#endif
|
||||
|
||||
#if defined(AK_OS_MACOS)
|
||||
#if defined(AK_OS_MACOS) || defined(AK_OS_IOS)
|
||||
# include <mach-o/dyld.h>
|
||||
# include <sys/mman.h>
|
||||
#else
|
||||
|
|
@ -140,7 +140,7 @@ static ErrorOr<Optional<struct group>> getgrent_impl(Span<char> buffer)
|
|||
namespace Core::System {
|
||||
|
||||
#ifndef HOST_NAME_MAX
|
||||
# ifdef AK_OS_MACOS
|
||||
# if defined(AK_OS_MACOS) || defined(AK_OS_IOS)
|
||||
# define HOST_NAME_MAX 255
|
||||
# else
|
||||
# define HOST_NAME_MAX 64
|
||||
|
|
@ -399,7 +399,7 @@ ErrorOr<Optional<struct spwd>> getspnam(StringView name)
|
|||
}
|
||||
#endif
|
||||
|
||||
#if !defined(AK_OS_MACOS) && !defined(AK_OS_HAIKU)
|
||||
#if !defined(AK_OS_MACOS) && !defined(AK_OS_IOS) && !defined(AK_OS_HAIKU)
|
||||
ErrorOr<int> accept4(int sockfd, sockaddr* address, socklen_t* address_length, int flags)
|
||||
{
|
||||
auto fd = ::accept4(sockfd, address, address_length, flags);
|
||||
|
|
@ -898,17 +898,19 @@ ErrorOr<Optional<struct group>> getgrnam(StringView name)
|
|||
return Optional<struct group> {};
|
||||
}
|
||||
|
||||
#if !defined(AK_OS_IOS)
|
||||
ErrorOr<void> clock_settime(clockid_t clock_id, struct timespec* ts)
|
||||
{
|
||||
#ifdef AK_OS_SERENITY
|
||||
# ifdef AK_OS_SERENITY
|
||||
int rc = syscall(SC_clock_settime, clock_id, ts);
|
||||
HANDLE_SYSCALL_RETURN_VALUE("clocksettime", rc, {});
|
||||
#else
|
||||
# else
|
||||
if (::clock_settime(clock_id, ts) < 0)
|
||||
return Error::from_syscall("clocksettime"sv, -errno);
|
||||
return {};
|
||||
#endif
|
||||
# endif
|
||||
}
|
||||
#endif
|
||||
|
||||
static ALWAYS_INLINE ErrorOr<pid_t> posix_spawn_wrapper(StringView path, posix_spawn_file_actions_t const* file_actions, posix_spawnattr_t const* attr, char* const arguments[], char* const envp[], StringView function_name, decltype(::posix_spawn) spawn_function)
|
||||
{
|
||||
|
|
@ -1379,7 +1381,7 @@ ErrorOr<void> exec(StringView filename, ReadonlySpan<StringView> arguments, Sear
|
|||
envp[environment->size()] = nullptr;
|
||||
|
||||
if (search_in_path == SearchInPath::Yes && !filename.contains('/')) {
|
||||
# if defined(AK_OS_MACOS) || defined(AK_OS_FREEBSD) || defined(AK_OS_SOLARIS)
|
||||
# if defined(AK_OS_MACOS) || defined(AK_OS_IOS) || defined(AK_OS_FREEBSD) || defined(AK_OS_SOLARIS)
|
||||
// These BSDs don't support execvpe(), so we'll have to manually search the PATH.
|
||||
ScopedValueRollback errno_rollback(errno);
|
||||
|
||||
|
|
@ -1782,7 +1784,7 @@ ErrorOr<ByteString> current_executable_path()
|
|||
size_t len = sizeof(path);
|
||||
if (sysctl(mib, 4, path, &len, nullptr, 0) < 0)
|
||||
return Error::from_syscall("sysctl"sv, -errno);
|
||||
#elif defined(AK_OS_MACOS)
|
||||
#elif defined(AK_OS_MACOS) || defined(AK_OS_IOS)
|
||||
u32 size = sizeof(path);
|
||||
auto ret = _NSGetExecutablePath(path, &size);
|
||||
if (ret != 0)
|
||||
|
|
|
|||
|
|
@ -152,7 +152,11 @@ ErrorOr<Optional<struct group>> getgrnam(StringView name);
|
|||
ErrorOr<Optional<struct passwd>> getpwuid(uid_t);
|
||||
ErrorOr<Optional<struct group>> getgrent(Span<char> buffer);
|
||||
ErrorOr<Optional<struct group>> getgrgid(gid_t);
|
||||
|
||||
#if !defined(AK_OS_IOS)
|
||||
ErrorOr<void> clock_settime(clockid_t clock_id, struct timespec* ts);
|
||||
#endif
|
||||
|
||||
ErrorOr<pid_t> posix_spawn(StringView path, posix_spawn_file_actions_t const* file_actions, posix_spawnattr_t const* attr, char* const arguments[], char* const envp[]);
|
||||
ErrorOr<pid_t> posix_spawnp(StringView path, posix_spawn_file_actions_t* const file_actions, posix_spawnattr_t* const attr, char* const arguments[], char* const envp[]);
|
||||
ErrorOr<off_t> lseek(int fd, off_t, int whence);
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ ErrorOr<NonnullOwnPtr<TCPSocket>> TCPServer::accept()
|
|||
VERIFY(m_listening);
|
||||
sockaddr_in in;
|
||||
socklen_t in_size = sizeof(in);
|
||||
#if !defined(AK_OS_MACOS) && !defined(AK_OS_HAIKU)
|
||||
#if !defined(AK_OS_MACOS) && !defined(AK_OS_IOS) && !defined(AK_OS_HAIKU)
|
||||
int accepted_fd = TRY(Core::System::accept4(m_fd, (sockaddr*)&in, &in_size, SOCK_NONBLOCK | SOCK_CLOEXEC));
|
||||
#else
|
||||
int accepted_fd = TRY(Core::System::accept(m_fd, (sockaddr*)&in, &in_size));
|
||||
|
|
@ -88,7 +88,7 @@ ErrorOr<NonnullOwnPtr<TCPSocket>> TCPServer::accept()
|
|||
|
||||
auto socket = TRY(TCPSocket::adopt_fd(accepted_fd));
|
||||
|
||||
#if defined(AK_OS_MACOS) || defined(AK_OS_HAIKU)
|
||||
#if defined(AK_OS_MACOS) || defined(AK_OS_IOS) || defined(AK_OS_HAIKU)
|
||||
// FIXME: Ideally, we should let the caller decide whether it wants the
|
||||
// socket to be nonblocking or not, but there are currently places
|
||||
// which depend on this.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue