From: Andreas Schwab <schwab@suse.de>
Date: Wed, 18 Jun 2025 11:17:29 +0000 (+0200)
Subject: Fix termios related targets
X-Git-Tag: glibc-2.42~111
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0dbbc44bfd256683705c391d97c4052320e2e64e;p=thirdparty%2Fglibc.git

Fix termios related targets

Move Linux-specific termios headers and tests from misc to termios subdir
and install newly added bits/termios-cbaud.h.
---

diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 913fe736bc..c6b2db8377 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -151,14 +151,6 @@ sysdep_headers += \
   bits/struct_stat.h \
   bits/struct_stat_time64_helper.h \
   bits/syscall.h \
-  bits/termios-c_cc.h \
-  bits/termios-c_cflag.h \
-  bits/termios-c_iflag.h \
-  bits/termios-c_lflag.h \
-  bits/termios-c_oflag.h \
-  bits/termios-misc.h \
-  bits/termios-struct.h \
-  bits/termios-tcflow.h \
   bits/timerfd.h \
   bits/types/struct_msqid64_ds.h \
   bits/types/struct_msqid64_ds_helper.h \
@@ -236,7 +228,6 @@ tests += \
   tst-sysvmsg-linux \
   tst-sysvsem-linux \
   tst-sysvshm-linux \
-  tst-termios-linux \
   tst-tgkill \
   tst-timerfd \
   tst-ttyname-direct \
@@ -421,6 +412,24 @@ tst-rseq-disable-static-ENV = GLIBC_TUNABLES=glibc.pthread.rseq=0
 
 endif # $(subdir) == misc
 
+ifeq ($(subdir),termios)
+sysdep_headers += \
+  bits/termios-c_cc.h \
+  bits/termios-c_cflag.h \
+  bits/termios-c_iflag.h \
+  bits/termios-c_lflag.h \
+  bits/termios-c_oflag.h \
+  bits/termios-cbaud.h \
+  bits/termios-misc.h \
+  bits/termios-struct.h \
+  bits/termios-tcflow.h \
+  # sysdep_headers
+
+tests += \
+  tst-termios-linux \
+  # tests
+endif
+
 ifeq ($(subdir),time)
 sysdep_headers += \
   bits/timex.h \