options/linux: split headers into linux-headers

meson.build

@@ -87,7 +87,7 @@ internal_conf.set('MLIBC_STATIC_BUILD', static)
 
 # Process sysdeps first, as sysdeps might want to disable unsupported options.
 if host_machine.system() == 'linux'
-	disable_linux_option = true
+	disable_linux_headers = true
 	rtdl_include_dirs += include_directories('sysdeps/linux/include')
 	libc_include_dirs += include_directories('sysdeps/linux/include')
 	subdir('sysdeps/linux')
@@ -153,10 +153,16 @@ if not disable_intl_option
 	libc_include_dirs += include_directories('options/intl/include')
 endif
 
+if not disable_linux_option
+	rtdl_include_dirs += include_directories('options/linux/include')
+	libc_include_dirs += include_directories('options/linux/include')
+endif
+
+
+rtdl_include_dirs += include_directories('options/linux-headers/include')
+libc_include_dirs += include_directories('options/linux-headers/include')
 rtdl_include_dirs += include_directories('options/elf/include')
-rtdl_include_dirs += include_directories('options/linux/include')
 libc_include_dirs += include_directories('options/elf/include')
-libc_include_dirs += include_directories('options/linux/include')
 libc_include_dirs += include_directories('.')
 
 #----------------------------------------------------------------------------------------

options/glibc/include/sys/ioctl.h

@@ -4,10 +4,9 @@
 #include <mlibc-config.h>
 
 // On Linux, sys/ioctl.h includes the termios ioctls.
-// TODO(geert): fix this!!
-// #ifdef __MLIBC_LINUX_OPTION
+#ifdef __MLIBC_LINUX_OPTION
 #	include <asm/ioctls.h>
-// #endif
+#endif
 
 #ifdef __cplusplus
 extern "C" {

options/linux-headers/meson.build

@@ -0,0 +1,42 @@
+
+if disable_linux_headers
+	subdir_done()
+endif
+
+if not no_headers
+	install_headers(
+		'include/asm/ioctl.h',
+		'include/asm/ioctls.h',
+		subdir: 'asm'
+	)
+	install_headers(
+		'include/linux/bpf_common.h',
+		'include/linux/bsg.h',
+		'include/linux/cdrom.h',
+		'include/linux/filter.h',
+		'include/linux/fs.h',
+		'include/linux/hdreg.h',
+		'include/linux/input-event-codes.h',
+		'include/linux/input.h',
+		'include/linux/ioctl.h',
+		'include/linux/kd.h',
+		'include/linux/magic.h',
+		'include/linux/major.h',
+		'include/linux/netlink.h',
+		'include/linux/pci_regs.h',
+		'include/linux/route.h',
+		'include/linux/sched.h',
+		'include/linux/sockios.h',
+		'include/linux/types.h',
+		'include/linux/videodev2.h',
+		'include/linux/vt.h',
+		'include/linux/rtnetlink.h',
+		subdir: 'linux'
+	)
+	install_headers(
+		'include/scsi/scsi.h',
+		'include/scsi/scsi_ioctl.h',
+		'include/scsi/sg.h',
+		subdir: 'scsi'
+	)
+endif

options/linux/meson.build

@@ -36,49 +36,14 @@ if not no_headers
 		'include/values.h',
 		'include/lastlog.h',
 	)
-	install_headers(
-		'include/asm/ioctl.h',
-		'include/asm/ioctls.h',
-		subdir: 'asm'
-	)
 	install_headers(
 		'include/bits/linux/linux_unistd.h',
 		subdir: 'bits/linux'
 	)
-	install_headers(
-		'include/linux/bpf_common.h',
-		'include/linux/bsg.h',
-		'include/linux/cdrom.h',
-		'include/linux/filter.h',
-		'include/linux/fs.h',
-		'include/linux/hdreg.h',
-		'include/linux/input-event-codes.h',
-		'include/linux/input.h',
-		'include/linux/ioctl.h',
-		'include/linux/kd.h',
-		'include/linux/magic.h',
-		'include/linux/major.h',
-		'include/linux/netlink.h',
-		'include/linux/pci_regs.h',
-		'include/linux/route.h',
-		'include/linux/sched.h',
-		'include/linux/sockios.h',
-		'include/linux/types.h',
-		'include/linux/videodev2.h',
-		'include/linux/vt.h',
-		'include/linux/rtnetlink.h',
-		subdir: 'linux'
-	)
 	install_headers(
 		'include/net/if_arp.h',
 		subdir: 'net'
 	)
-	install_headers(
-		'include/scsi/scsi.h',
-		'include/scsi/scsi_ioctl.h',
-		'include/scsi/sg.h',
-		subdir: 'scsi'
-	)
 	install_headers(
 		'include/sys/epoll.h',
 		'include/sys/inotify.h',