Added HAVE_SYS_TTYDEFAULTS_H to only include <sys/ttydefaults.h> on L…

…inux for musl libc
raforg · Mar 1, 2021 · 6b28c54 · 6b28c54
1 parent 13fee0c
commit 6b28c54
Show file tree

Hide file tree

Showing 15 changed files with 57 additions and 0 deletions.
diff --git a/conf/freebsd b/conf/freebsd
@@ -143,4 +143,8 @@ perl -pi \
 	-e 's/^#define (HAVE_POLL_THAT_ABORTS_WHEN_POLLFDS_IS_NULL) 1$/\/* #undef $1 *\//;' \
 	`find . -name config.h`
 
+perl -pi \
+	-e 's/^#define (HAVE_SYS_TTYDEFAULTS_H) 1$/\/\* #undef $1 \*\//;' \
+	config.h
+
 # vi:set ts=4 sw=4:
diff --git a/conf/gnuhurd b/conf/gnuhurd
@@ -143,4 +143,8 @@ perl -pi \
 	-e 's/^#define (HAVE_POLL_THAT_ABORTS_WHEN_POLLFDS_IS_NULL) 1$/\/* #undef $1 *\//;' \
 	`find . -name config.h`
 
+perl -pi \
+	-e 's/^#define (HAVE_SYS_TTYDEFAULTS_H) 1$/\/\* #undef $1 \*\//;' \
+	config.h
+
 # vi:set ts=4 sw=4:
diff --git a/conf/kfreebsd b/conf/kfreebsd
@@ -143,4 +143,8 @@ perl -pi \
 	-e 's/^#define (HAVE_POLL_THAT_ABORTS_WHEN_POLLFDS_IS_NULL) 1$/\/* #undef $1 *\//;' \
 	`find . -name config.h`
 
+perl -pi \
+	-e 's/^#define (HAVE_SYS_TTYDEFAULTS_H) 1$/\/\* #undef $1 \*\//;' \
+	config.h
+
 # vi:set ts=4 sw=4:
diff --git a/conf/linux b/conf/linux
@@ -143,6 +143,10 @@ perl -pi \
 	-e 's/^#define (HAVE_POLL_THAT_ABORTS_WHEN_POLLFDS_IS_NULL) 1$/\/* #undef $1 *\//;' \
 	`find . -name config.h`
 
+perl -pi \
+	-e 's/^\/\* #undef (HAVE_SYS_TTYDEFAULTS_H) \*\/$/#define $1 1/;' \
+	config.h
+
 conf/test-logind
 
 # vi:set ts=4 sw=4:
diff --git a/conf/macosx b/conf/macosx
@@ -143,6 +143,10 @@ perl -pi \
 	-e 's/^\/\* #undef (HAVE_POLL_THAT_ABORTS_WHEN_POLLFDS_IS_NULL) \*\/$/#define $1 1/;' \
 	`find . -name config.h`
 
+perl -pi \
+	-e 's/^#define (HAVE_SYS_TTYDEFAULTS_H) 1$/\/\* #undef $1 \*\//;' \
+	config.h
+
 # Old versions of macOS (e.g. 10.6.8) don't handle some newer clang -Wno-* options.
 # But don't test if macports (which uses a newer compiler than Xcode's).
 # We know it's macports because CC is set.

diff --git a/conf/netbsd b/conf/netbsd
@@ -143,4 +143,8 @@ perl -pi \
 	-e 's/^#define (HAVE_POLL_THAT_ABORTS_WHEN_POLLFDS_IS_NULL) 1$/\/* #undef $1 *\//;' \
 	`find . -name config.h`
 
+perl -pi \
+	-e 's/^#define (HAVE_SYS_TTYDEFAULTS_H) 1$/\/\* #undef $1 \*\//;' \
+	config.h
+
 # vi:set ts=4 sw=4:
diff --git a/conf/openbsd b/conf/openbsd
@@ -143,4 +143,8 @@ perl -pi \
 	-e 's/^#define (HAVE_POLL_THAT_ABORTS_WHEN_POLLFDS_IS_NULL) 1$/\/* #undef $1 *\//;' \
 	`find . -name config.h`
 
+perl -pi \
+	-e 's/^#define (HAVE_SYS_TTYDEFAULTS_H) 1$/\/\* #undef $1 \*\//;' \
+	config.h
+
 # vi:set ts=4 sw=4:
diff --git a/conf/solaris10-cc b/conf/solaris10-cc
@@ -154,4 +154,8 @@ perl -pi \
 	-e 's/^#define (HAVE_POLL_THAT_ABORTS_WHEN_POLLFDS_IS_NULL) 1$/\/* #undef $1 *\//;' \
 	`find . -name config.h`
 
+perl -pi \
+	-e 's/^#define (HAVE_SYS_TTYDEFAULTS_H) 1$/\/\* #undef $1 \*\//;' \
+	config.h
+
 # vi:set ts=4 sw=4:
diff --git a/conf/solaris10-gcc b/conf/solaris10-gcc
@@ -170,4 +170,8 @@ perl -pi \
 	-e 's/^\/\* #undef (HAVE_POLL_THAT_ABORTS_WHEN_POLLFDS_IS_NULL) \*\/$/#define $1 1/;' \
 	`find . -name config.h`
 
+perl -pi \
+	-e 's/^#define (HAVE_SYS_TTYDEFAULTS_H) 1$/\/\* #undef $1 \*\//;' \
+	config.h
+
 # vi:set ts=4 sw=4:
diff --git a/conf/solaris6-cc b/conf/solaris6-cc
@@ -143,4 +143,8 @@ perl -pi \
 	-e 's/^#define (HAVE_POLL_THAT_ABORTS_WHEN_POLLFDS_IS_NULL) 1$/\/* #undef $1 *\//;' \
 	`find . -name config.h`
 
+perl -pi \
+	-e 's/^#define (HAVE_SYS_TTYDEFAULTS_H) 1$/\/\* #undef $1 \*\//;' \
+	config.h
+
 # vi:set ts=4 sw=4:
diff --git a/conf/solaris6-gcc b/conf/solaris6-gcc
@@ -143,4 +143,8 @@ perl -pi \
 	-e 's/^#define (HAVE_POLL_THAT_ABORTS_WHEN_POLLFDS_IS_NULL) 1$/\/* #undef $1 *\//;' \
 	`find . -name config.h`
 
+perl -pi \
+	-e 's/^#define (HAVE_SYS_TTYDEFAULTS_H) 1$/\/\* #undef $1 \*\//;' \
+	config.h
+
 # vi:set ts=4 sw=4:
diff --git a/conf/solaris8-cc b/conf/solaris8-cc
@@ -143,4 +143,8 @@ perl -pi \
 	-e 's/^#define (HAVE_POLL_THAT_ABORTS_WHEN_POLLFDS_IS_NULL) 1$/\/* #undef $1 *\//;' \
 	`find . -name config.h`
 
+perl -pi \
+	-e 's/^#define (HAVE_SYS_TTYDEFAULTS_H) 1$/\/\* #undef $1 \*\//;' \
+	config.h
+
 # vi:set ts=4 sw=4:
diff --git a/conf/solaris8-gcc b/conf/solaris8-gcc
@@ -143,4 +143,8 @@ perl -pi \
 	-e 's/^\/\* #undef (HAVE_POLL_THAT_ABORTS_WHEN_POLLFDS_IS_NULL) \*\/$/#define $1 1/;' \
 	`find . -name config.h`
 
+perl -pi \
+	-e 's/^#define (HAVE_SYS_TTYDEFAULTS_H) 1$/\/\* #undef $1 \*\//;' \
+	config.h
+
 # vi:set ts=4 sw=4:
diff --git a/config.h b/config.h
@@ -25,6 +25,9 @@
 /* Define if we have systemd's logind or elogind (i.e. libsystemd or libelogind) */
 /* #undef HAVE_LOGIND */
 
+/* Define if we have <sys/ttydefaults.h> and need it for CEOF in musl libc (Linux only)  */
+#define HAVE_SYS_TTYDEFAULTS_H 1
+
 #endif
 
 /* vi:set ts=4 sw=4: */
diff --git a/daemon.c b/daemon.c
@@ -940,7 +940,9 @@ I<elogind(8)>
 #ifdef _RESTORE_POSIX_SOURCE
 #define _POSIX_SOURCE
 #endif
+#ifdef HAVE_SYS_TTYDEFAULTS_H /* For CEOF in musl libc (Linux only) */
 #include <sys/ttydefaults.h>
+#endif
 #include <dirent.h>
 #include <sys/wait.h>
 #include <sys/stat.h>