Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

darwin.system_cmds: fix build with clang 16 #235487

Merged
merged 1 commit into from
Jun 11, 2023
Merged

darwin.system_cmds: fix build with clang 16 #235487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,12 @@ appleDerivation {
"-DAU_SESSION_FLAG_HAS_AUTHENTICATED=0x4000"
] ++ lib.optional (!stdenv.isLinux) " -D__FreeBSD__ ");

patchPhase = ''
patches = [
# Fix implicit declarations that cause builds to fail when built with clang 16.
./fix-implicit-declarations.patch
];

postPatch = ''
substituteInPlace login.tproj/login.c \
--replace bsm/audit_session.h bsm/audit.h
substituteInPlace login.tproj/login_audit.c \
Expand Down
48 changes: 48 additions & 0 deletions pkgs/os-specific/darwin/apple-source-releases/system_cmds/fix-implicit-declarations.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
diff -ur a/getty.tproj/main.c b/getty.tproj/main.c
--- a/getty.tproj/main.c 2008-06-10 14:50:19.000000000 -0400
+++ b/getty.tproj/main.c 2023-05-31 18:06:40.121028558 -0400
@@ -67,6 +67,7 @@
#include <syslog.h>
#include <termios.h>
#include <time.h>
+#include <util.h>
#include <unistd.h>

#ifdef __APPLE__
@@ -152,7 +153,7 @@
static void putpad(const char *);
static void puts(const char *);
static void timeoverrun(int);
-static char *getline(int);
+static char *get_line(int);
toonn marked this conversation as resolved.
Show resolved Hide resolved
static void setttymode(int);
static int opentty(const char *, int);

@@ -352,7 +353,7 @@
if ((fd = open(IF, O_RDONLY)) != -1) {
char * cp;

- while ((cp = getline(fd)) != NULL) {
+ while ((cp = get_line(fd)) != NULL) {
putf(cp);
}
close(fd);
@@ -744,7 +745,7 @@


static char *
-getline(int fd)
+get_line(int fd)
{
int i = 0;
static char linebuf[512];
--- a/newgrp.tproj/newgrp.c 2021-10-06 01:38:52.000000000 -0400
+++ b/newgrp.tproj/newgrp.c 2023-05-31 22:26:50.656157841 -0400
@@ -47,6 +47,7 @@
#include <string.h>
#include <unistd.h>
#ifdef __APPLE__
+#include <membership.h>
#include <paths.h>
#endif /* __APPLE__ */
static void addgroup(const char *grpname);