Meson: specify default system directories in machine files (#227)

lovell · Mar 24, 2024 · 6e83482 · 6e83482
1 parent aaff2e7
commit 6e83482
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 2 deletions.
diff --git a/build/lin.sh b/build/lin.sh
@@ -379,8 +379,7 @@ mkdir ${DEPS}/fontconfig
 $CURL https://www.freedesktop.org/software/fontconfig/release/fontconfig-${VERSION_FONTCONFIG}.tar.xz | tar xJC ${DEPS}/fontconfig --strip-components=1
 cd ${DEPS}/fontconfig
 meson setup _build --default-library=static --buildtype=release --strip --prefix=${TARGET} ${MESON} \
-  -Dcache-build=disabled -Ddoc=disabled -Dnls=disabled -Dtests=disabled -Dtools=disabled \
-  ${LINUX:+--sysconfdir=/etc} ${DARWIN:+--sysconfdir=/usr/local/etc}
+  -Dcache-build=disabled -Ddoc=disabled -Dnls=disabled -Dtests=disabled -Dtools=disabled
 meson install -C _build --tag devel
 
 mkdir ${DEPS}/harfbuzz

diff --git a/platforms/darwin-arm64v8/meson.ini b/platforms/darwin-arm64v8/meson.ini
@@ -12,4 +12,8 @@ objcpp = 'clang++'
 strip = ['strip', '-x']
 
 [built-in options]
+datadir = '/usr/local/share'
+localedir = '/usr/local/share/locale'
+sysconfdir = '/usr/local/etc'
+localstatedir = '/usr/local/var'
 wrap_mode = 'nofallback'
diff --git a/platforms/darwin-x64/meson.ini b/platforms/darwin-x64/meson.ini
@@ -2,4 +2,8 @@
 strip = ['strip', '-x']
 
 [built-in options]
+datadir = '/usr/local/share'
+localedir = '/usr/local/share/locale'
+sysconfdir = '/usr/local/etc'
+localstatedir = '/usr/local/var'
 wrap_mode = 'nofallback'
diff --git a/platforms/linux-arm64v8/meson.ini b/platforms/linux-arm64v8/meson.ini
@@ -4,4 +4,8 @@ pkg-config = ['pkg-config', '--static']
 
 [built-in options]
 libdir = 'lib'
+datadir = '/usr/share'
+localedir = '/usr/share/locale'
+sysconfdir = '/etc'
+localstatedir = '/var'
 wrap_mode = 'nofallback'
diff --git a/platforms/linux-armv6/meson.ini b/platforms/linux-armv6/meson.ini
@@ -16,4 +16,8 @@ pkg-config = ['arm-linux-gnueabihf-pkg-config', '--static']
 
 [built-in options]
 libdir = 'lib'
+datadir = '/usr/share'
+localedir = '/usr/share/locale'
+sysconfdir = '/etc'
+localstatedir = '/var'
 wrap_mode = 'nofallback'
diff --git a/platforms/linux-armv7/meson.ini b/platforms/linux-armv7/meson.ini
@@ -16,4 +16,8 @@ pkg-config = ['arm-linux-gnueabihf-pkg-config', '--static']
 
 [built-in options]
 libdir = 'lib'
+datadir = '/usr/share'
+localedir = '/usr/share/locale'
+sysconfdir = '/etc'
+localstatedir = '/var'
 wrap_mode = 'nofallback'
diff --git a/platforms/linux-s390x/meson.ini b/platforms/linux-s390x/meson.ini
@@ -17,4 +17,8 @@ pkg-config = ['s390x-linux-gnu-pkg-config', '--static']
 
 [built-in options]
 libdir = 'lib'
+datadir = '/usr/share'
+localedir = '/usr/share/locale'
+sysconfdir = '/etc'
+localstatedir = '/var'
 wrap_mode = 'nofallback'
diff --git a/platforms/linux-x64/meson.ini b/platforms/linux-x64/meson.ini
@@ -4,4 +4,8 @@ pkg-config = ['pkg-config', '--static']
 
 [built-in options]
 libdir = 'lib'
+datadir = '/usr/share'
+localedir = '/usr/share/locale'
+sysconfdir = '/etc'
+localstatedir = '/var'
 wrap_mode = 'nofallback'
diff --git a/platforms/linuxmusl-arm64v8/meson.ini b/platforms/linuxmusl-arm64v8/meson.ini
@@ -21,4 +21,8 @@ has_function_inotify_init1 = false
 
 [built-in options]
 libdir = 'lib'
+datadir = '/usr/share'
+localedir = '/usr/share/locale'
+sysconfdir = '/etc'
+localstatedir = '/var'
 wrap_mode = 'nofallback'
diff --git a/platforms/linuxmusl-x64/meson.ini b/platforms/linuxmusl-x64/meson.ini
@@ -8,4 +8,8 @@ pkg-config = ['pkg-config', '--static']
 has_function_inotify_init1 = false
 
 [built-in options]
+datadir = '/usr/share'
+localedir = '/usr/share/locale'
+sysconfdir = '/etc'
+localstatedir = '/var'
 wrap_mode = 'nofallback'