Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ jobs:
- name: Test mlibc
run: 'meson test -v -C pkg-builds/${{matrix.builds}}'
working-directory: build/
env:
LOCPATH: "${{ github.workspace }}/build/packages/locale-data/usr/lib/locale/"

compile-sysdeps:
strategy:
Expand Down
27 changes: 27 additions & 0 deletions ci/bootstrap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ sources:
tag: 'libdrm-2.4.124'
version: '2.4.124'

- name: glibc
git: 'https://sourceware.org/git/glibc.git'
tag: 'glibc-2.42'
version: '2.42'

tools: []

packages:
Expand All @@ -30,6 +35,7 @@ packages:
pkgs_required:
- linux-headers
- libdrm-headers
- locale-data
configure:
- args:
- 'meson'
Expand Down Expand Up @@ -65,6 +71,7 @@ packages:
pkgs_required:
- linux-headers
- libdrm-headers
- locale-data
configure:
- args:
- 'meson'
Expand Down Expand Up @@ -97,6 +104,7 @@ packages:
pkgs_required:
- linux-headers
- libdrm-headers
- locale-data
configure:
- args:
- 'meson'
Expand Down Expand Up @@ -130,6 +138,7 @@ packages:
pkgs_required:
- linux-headers
- libdrm-headers
- locale-data
configure:
- args:
- 'meson'
Expand Down Expand Up @@ -226,3 +235,21 @@ packages:
libdrm_dep = declare_dependency(include_directories: include_directories('include'))
EOF
- args: ['cp', '-r', '@THIS_SOURCE_DIR@/include', '@THIS_COLLECT_DIR@/usr/src/libdrm-headers/include']

- name: locale-data
architecture: noarch
from_source: 'glibc'
build:
- args: |
ARCH="@OPTION:arch@"
LOCALEDEF_FLAGS=""
if [ "$ARCH" == "m68k" ]; then
LOCALEDEF_FLAGS="--big-endian"
fi
mkdir -p @THIS_COLLECT_DIR@/usr/lib/locale/
localedef $LOCALEDEF_FLAGS -fUTF-8 -ide_DE --prefix=@THIS_COLLECT_DIR@ --no-archive de_DE.utf8
localedef $LOCALEDEF_FLAGS -fUTF-8 -ide_DE --prefix=@THIS_COLLECT_DIR@ --no-archive de_DE
localedef $LOCALEDEF_FLAGS -fUTF-8 -iru_RU --prefix=@THIS_COLLECT_DIR@ --no-archive ru_RU.utf8
localedef $LOCALEDEF_FLAGS -fUTF-8 -ien_US --prefix=@THIS_COLLECT_DIR@ --no-archive en_US.utf8
environ:
I18NPATH: '@THIS_SOURCE_DIR@/localedata/'
12 changes: 12 additions & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,14 @@ if not headers_only
libc_deps += frigg_dep
rtld_deps += frigg_dep

libsmarter_dep = dependency(
'libsmarter',
default_options: [],
fallback: ['libsmarter', 'libsmarter_dep'],
)
libc_deps += libsmarter_dep
rtld_deps += libsmarter_dep

add_project_arguments('-Wno-unused-function', '-D__MLIBC_BUILDING_MLIBC', language: ['c', 'cpp'])
add_project_arguments('-nostdinc', '-fno-builtin', '-ffreestanding', language: ['c', 'cpp'])
add_project_arguments('-Werror=misleading-indentation', language: ['c', 'cpp'])
Expand Down Expand Up @@ -221,6 +229,7 @@ if host_machine.system() == 'linux'

internal_conf.set10('MLIBC_MAP_DSO_SEGMENTS', true)
internal_conf.set10('MLIBC_MMAP_ALLOCATE_DSO', true)
internal_conf.set10('MLIBC_MAP_FILE_WINDOWS', true)
subdir('sysdeps/linux')
elif host_machine.system() == 'aero'
rtld_include_dirs += include_directories('sysdeps/aero/include')
Expand Down Expand Up @@ -371,8 +380,10 @@ configure_file(input: 'mlibc-config.h.in',

internal_sources = [
'options/internal/generic/allocator.cpp',
'options/internal/generic/c-locale-defaults.cpp',
'options/internal/generic/charcode.cpp',
'options/internal/generic/charset.cpp',
'options/internal/generic/ctype.cpp',
'options/internal/generic/debug.cpp',
'options/internal/generic/ensure.cpp',
'options/internal/generic/essential.cpp',
Expand All @@ -381,6 +392,7 @@ internal_sources = [
'options/internal/generic/global-config.cpp',
'options/internal/generic/inline-emitter.cpp',
'options/internal/generic/locale.cpp',
'options/internal/generic/locale-defaults.cpp',
'options/internal/generic/sigset.cpp',
'options/internal/generic/strings.cpp',
'options/internal/generic/ubsan.cpp',
Expand Down
Loading