Changes in uspace/lib/c/meson.build [de19d4a:163e34c] in mainline

File:

• uspace/lib/c/meson.build (modified) (9 diffs)

uspace/lib/c/meson.build

@@ -1 +1 @@
 #
+# Copyright (c) 2025 Jiri Svoboda
 # Copyright (c) 2005 Martin Decky
 # Copyright (c) 2007 Jakub Jermar
@@ -41 +42 @@
         root_path / 'abi' / 'arch' / UARCH / 'include',
         root_path / 'abi' / 'include',
+        root_path / 'common' / 'include',
 ]
 
@@ -46 +48 @@
 
 allow_shared = true
-
-# FIXME: symlinks from uspace to kernel will break in future Meson version
-#        we should instead move the duplicated library parts into a shared location.
 
 uspace_lib_devel_install_script_text += 'mkdir -p "${DESTDIR}include/libc"'
@@ -54 +53 @@
         _sdir = meson.current_source_dir() / idir
         uspace_lib_devel_install_script_text += 'cp -R -L -T "@0@" "${DESTDIR}include/libc"'.format(_sdir)
+        exported_devel_files += ['include', _sdir, 'libc']
 endforeach
 
@@ -59 +59 @@
 
 src += files(
-        'generic/libc.c',
-        'generic/ddi.c',
+        'common/adt/bitmap.c',
+        'common/adt/checksum.c',
+        'common/adt/circ_buf.c',
+        'common/adt/hash_table.c',
+        'common/adt/list.c',
+        'common/adt/odict.c',
+        'common/gsort.c',
+        'common/printf/printf_core.c',
+        'common/stdc/bsearch.c',
+        'common/stdc/calloc.c',
+        'common/stdc/ctype.c',
+        'common/stdc/mem.c',
+        'common/stdc/qsort.c',
+        'common/stdc/snprintf.c',
+        'common/stdc/uchar.c',
+        'common/stdc/vsnprintf.c',
+        'common/stdc/wchar.c',
+        'common/str.c',
+        'common/str_error.c',
+        'common/strtol.c',
+
+        'generic/adt/prodcons.c',
+        'generic/arg_parse.c',
         'generic/as.c',
-        'generic/bd.c',
-        'generic/bd_srv.c',
-        'generic/perm.c',
+        'generic/assert.c',
+        'generic/async/client.c',
+        'generic/async/ports.c',
+        'generic/async/server.c',
         'generic/capa.c',
-        'generic/clipboard.c',
         'generic/config.c',
         'generic/context.c',
-        'generic/corecfg.c',
-        'generic/ctype.c',
-        'generic/devman.c',
+        'generic/dbgcon.c',
+        'generic/ddi.c',
+        'generic/device/clock_dev.c',
         'generic/device/hw_res.c',
         'generic/device/hw_res_parsed.c',
         'generic/device/pio_window.c',
-        'generic/device/clock_dev.c',
-        'generic/device/led_dev.c',
         'generic/dirent.c',
-        'generic/dhcp.c',
-        'generic/dnsr.c',
         'generic/dlfcn.c',
+        'generic/double_to_str.c',
         'generic/elf/elf.c',
         'generic/elf/elf_load.c',
         'generic/elf/elf_mod.c',
+        'generic/errno.c',
         'generic/event.c',
-        'generic/errno.c',
-        'generic/gsort.c',
+        'generic/getopt.c',
+        'generic/ieee_double.c',
+        'generic/imath.c',
         'generic/inttypes.c',
-        'generic/ipc_test.c',
-        'generic/loc.c',
-        'generic/mem.c',
-        'generic/str.c',
-        'generic/string.c',
-        'generic/str_error.c',
-        'generic/strtol.c',
-        'generic/l18n/langs.c',
-        'generic/pcb.c',
-        'generic/smc.c',
-        'generic/task.c',
-        'generic/imath.c',
-        'generic/inet/addr.c',
-        'generic/inet/endpoint.c',
-        'generic/inet/host.c',
-        'generic/inet/hostname.c',
-        'generic/inet/hostport.c',
-        'generic/inet/tcp.c',
-        'generic/inet/udp.c',
-        'generic/inet.c',
-        'generic/inetcfg.c',
-        'generic/inetping.c',
         'generic/io/asprintf.c',
-        'generic/io/input.c',
         'generic/io/io.c',
-        'generic/io/chardev.c',
-        'generic/io/chardev_srv.c',
-        'generic/io/chargrid.c',
-        'generic/io/output.c',
-        'generic/io/printf.c',
+        'generic/io/kio.c',
+        'generic/io/klog.c',
         'generic/io/log.c',
         'generic/io/logctl.c',
-        'generic/io/label.c',
-        'generic/io/kio.c',
-        'generic/io/klog.c',
-        'generic/io/serial.c',
-        'generic/io/snprintf.c',
+        'generic/io/printf.c',
+        'generic/io/table.c',
         'generic/io/vprintf.c',
-        'generic/io/vsnprintf.c',
-        'generic/io/printf_core.c',
-        'generic/io/con_srv.c',
-        'generic/io/console.c',
-        'generic/io/table.c',
-        'generic/iplink.c',
-        'generic/iplink_srv.c',
-        'generic/irc.c',
+        'generic/ipc.c',
         'generic/irq.c',
-        'generic/ieee_double.c',
+        'generic/l18n/langs.c',
+        'generic/libc.c',
+        'generic/loader.c',
+        'generic/loc.c',
+        'generic/malloc.c',
+        'generic/ns.c',
+        'generic/pcb.c',
+        'generic/perm.c',
+        'generic/pio_trace.c',
         'generic/power_of_ten.c',
-        'generic/double_to_str.c',
-        'generic/malloc.c',
         'generic/rndgen.c',
+        'generic/setjmp.c',
+        'generic/shutdown.c',
+        'generic/smc.c',
+        'generic/stack.c',
+        'generic/stacktrace.c',
+        'generic/stats.c',
+        'generic/stdio.c',
         'generic/stdio/scanf.c',
         'generic/stdio/sprintf.c',
@@ -145 +142 @@
         'generic/stdio/sstream.c',
         'generic/stdio/vsprintf.c',
+        'generic/stdlib.c',
+        'generic/string.c',
+        'generic/sysinfo.c',
+        'generic/task.c',
         'generic/thread/fibril.c',
         'generic/thread/fibril_synch.c',
+        'generic/thread/futex.c',
+        'generic/thread/mpsc.c',
         'generic/thread/thread.c',
         'generic/thread/tls.c',
-        'generic/thread/futex.c',
-        'generic/thread/mpsc.c',
-        'generic/sysinfo.c',
-        'generic/ipc.c',
-        'generic/ns.c',
-        'generic/async/client.c',
-        'generic/async/server.c',
-        'generic/async/ports.c',
-        'generic/loader.c',
-        'generic/getopt.c',
-        'generic/adt/checksum.c',
-        'generic/adt/circ_buf.c',
-        'generic/adt/list.c',
-        'generic/adt/hash_table.c',
-        'generic/adt/odict.c',
-        'generic/adt/prodcons.c',
         'generic/time.c',
         'generic/tmpfile.c',
-        'generic/stdio.c',
-        'generic/stdlib.c',
+        'generic/ubsan.c',
         'generic/udebug.c',
+        'generic/uuid.c',
         'generic/vfs/canonify.c',
         'generic/vfs/inbox.c',
         'generic/vfs/mtab.c',
         'generic/vfs/vfs.c',
-        'generic/setjmp.c',
-        'generic/stack.c',
-        'generic/stacktrace.c',
-        'generic/arg_parse.c',
-        'generic/stats.c',
-        'generic/assert.c',
-        'generic/bsearch.c',
-        'generic/pci.c',
-        'generic/pio_trace.c',
-        'generic/qsort.c',
-        'generic/ubsan.c',
-        'generic/uuid.c',
-        'generic/vbd.c',
-        'generic/vol.c',
 )
 
 if CONFIG_RTLD
         src += files(
-                'generic/rtld/rtld.c',
                 'generic/rtld/dynamic.c',
                 'generic/rtld/module.c',
+                'generic/rtld/rtld.c',
                 'generic/rtld/symbol.c',
         )
@@ -212 +185 @@
         'test/inttypes.c',
         'test/io/table.c',
+        'test/loc.c',
         'test/main.c',
         'test/mem.c',
@@ -218 +192 @@
         'test/qsort.c',
         'test/sprintf.c',
+        'test/stdio.c',
         'test/stdio/scanf.c',
-        'test/stdio.c',
         'test/stdlib.c',
         'test/str.c',
         'test/string.c',
         'test/strtol.c',
+        'test/uchar.c',
         'test/uuid.c',
 )
@@ -241 +216 @@
         pic: false,
 )
+exported_devel_files += ['staticlib', libstartfiles, 'libstartfiles.a']
 
 if CONFIG_DEVEL_FILES