mirror of https://git.FreeBSD.org/ports.git
Mk/Uses/meson.mk: pass --localstatedir like GNU_CONFIGURE after 9f4546a03c
Meson defaults to --localstatedir=/var/local if --prefix=/usr/local
but this is not valid for ports/ or FreeBSD hier(7).
See also 68edbeeaae and
https://github.com/mesonbuild/meson/commit/24549dbed5fe
PR: 273605
Analyzed by: Tatsuki Makino
Exp-run by: antoine
This commit is contained in:
Jan Beich
parent
7b20f87790
commit
f735bc3d93
|
|
@ -33,6 +33,7 @@ BUILD_DEPENDS+= meson:devel/meson
|
|||
USE_LOCALE?= en_US.UTF-8
|
||||
|
||||
CONFIGURE_ARGS+= --prefix ${PREFIX} \
|
||||
--localstatedir /var \
|
||||
--infodir ${INFO_PATH}
|
||||
|
||||
# Enable all optional features to make builds deterministic. Consumers can
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ MESON_ARGS= -Db_lundef=false \
|
|||
-Dinstalled_tests=false \
|
||||
-Dintrospection=disabled \
|
||||
-Dlibmount=disabled \
|
||||
-Dlocalstatedir=/var \
|
||||
-Druntime_dir=/var/run \
|
||||
-Dselinux=disabled \
|
||||
-Dxattr=false
|
||||
|
|
|
|||
|
|
@ -71,8 +71,6 @@ LIBSSH2_LIB_DEPENDS= libssh2.so:security/libssh2
|
|||
|
||||
ZFS_MESON_ENABLED= storage_zfs
|
||||
|
||||
VARDIR= /var
|
||||
|
||||
MESON_ARGS+= \
|
||||
-Dapparmor=disabled \
|
||||
-Dapparmor_profiles=disabled \
|
||||
|
|
@ -122,8 +120,7 @@ MESON_ARGS+= \
|
|||
-Dwireshark_dissector=disabled \
|
||||
-Dinit_script=none \
|
||||
-Dbash_completion=disabled \
|
||||
-Duserfaultfd_sysctl=disabled \
|
||||
-Dlocalstatedir=${VARDIR}
|
||||
-Duserfaultfd_sysctl=disabled
|
||||
|
||||
# random_data fix can be removed when 8.x is eol
|
||||
CONFIGURE_ENV= ac_cv_type_struct_random_data=""
|
||||
|
|
@ -203,7 +200,7 @@ post-install:
|
|||
lib/libvirt/network \
|
||||
lib/libvirt/qemu/channel/target \
|
||||
cache/libvirt/qemu
|
||||
@${MKDIR} "${STAGEDIR}/${VARDIR}/${dir}"
|
||||
@${MKDIR} "${STAGEDIR}/var/${dir}"
|
||||
.endfor
|
||||
|
||||
.for file in ${CONF_FILES}
|
||||
|
|
|
|||
|
|
@ -28,8 +28,7 @@ MAKE_JOBS_UNSAFE= yes
|
|||
MAKE_ENV= PYTHONDONTWRITEBYTECODE=1
|
||||
MESON_ARGS= -Dsystemd=false -Dudev_rules=false \
|
||||
-Ddaemon_user=colord -Dlibcolordcompat=true \
|
||||
-Dpnp_ids=${LOCALBASE}/share/hwdata/pnp.ids \
|
||||
--localstatedir=/var \
|
||||
-Dpnp_ids=${LOCALBASE}/share/hwdata/pnp.ids
|
||||
|
||||
INSTALL_TARGET= install-strip
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ MESON_ARGS= -Dwith-libgcrypt-path=${LOCALBASE} \
|
|||
-Dwith-shadow=false \
|
||||
-Dwith-pgp-uam=false \
|
||||
-Ddefault_library=both \
|
||||
--localstatedir=/var \
|
||||
--infodir=${PREFIX}/share/info
|
||||
|
||||
OPTIONS_DEFINE=PAM KERBEROS5 LDAP SENDFILE KERBEROS DBUS MYSQL ACL LIBWRAP SPOTLIGHT
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ USE_LDCONFIG= yes
|
|||
CPE_VENDOR= packagekit_project
|
||||
SHEBANG_FILES= contrib/cron/packagekit-background.cron
|
||||
|
||||
MESON_ARGS= -Dlocalstatedir=/var -Dsysconfdir=${PREFIX}/etc \
|
||||
MESON_ARGS= -Dsysconfdir=${PREFIX}/etc \
|
||||
-Dpackaging_backend=freebsd -Dsystemd=false -Doffline_update=false \
|
||||
-Dbash_completion=false -Dbash_command_not_found=false \
|
||||
-Dgstreamer_plugin=false
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ USE_LDCONFIG= yes
|
|||
MESON_ARGS= -Dconsolekit=true \
|
||||
-Dgdmconffile=${LOCALBASE}/etc/gdm/custom.conf \
|
||||
-Dlightdmconffile=${LOCALBASE}/etc/lightdm/lightdm.conf \
|
||||
-Dlocalstatedir=/var \
|
||||
-Dsystemdsystemunitdir=no \
|
||||
-Dvapi=false \
|
||||
-Dtests=false
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ SHEBANG_FILES= ${WRKSRC}/scripts/makepkg-template.pl.in \
|
|||
${WRKSRC}/scripts/libmakepkg/lint_config.sh.in
|
||||
BINARY_ALIAS= python3=${PYTHON_CMD}
|
||||
MESON_ARGS= -Droot-dir=${PACMAN_ROOT} \
|
||||
-Dlocalstatedir=${PACMAN_ROOT}/var \
|
||||
--localstatedir=${PACMAN_ROOT}/var \
|
||||
-Dsysconfdir=${PREFIX}/etc \
|
||||
-Dcrypto=openssl
|
||||
USE_LDCONFIG= yes
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ MESON_ARGS= -Dpam_include=system \
|
|||
-Dsession_tracking=ConsoleKit \
|
||||
-Dtests=false \
|
||||
-Dintrospection=true \
|
||||
-Dlocalstatedir=/var \
|
||||
-Dgtk_doc=false
|
||||
|
||||
OPTIONS_DEFINE= MANPAGES
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ USE_GNOME= glib20 introspection:build
|
|||
USE_LDCONFIG= yes
|
||||
MESON_ARGS= -Dgtk-doc=false \
|
||||
-Dos_backend=freebsd \
|
||||
-Dlocalstatedir=/var \
|
||||
-Dudevrulesdir=no \
|
||||
-Dudevhwdbdir=no \
|
||||
-Dsystemdsystemunitdir=no \
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@ SUB_LIST= LOCALBASE=${LOCALBASE}
|
|||
MESON_ARGS= -Ddefault_library=both -Ddoc=disabled -Dcache-build=disabled \
|
||||
-Ddefault-fonts-dirs=${PREFIX}/share/fonts \
|
||||
-Dadditional-fonts-dirs=${LOCALBASE}/lib/X11/fonts \
|
||||
-Dlocalstatedir=/var \
|
||||
-Dcache-dir=/var/db/fontconfig \
|
||||
-Dtemplate-dir=${LOCALBASE}/etc/fonts/conf.avail \
|
||||
-Dxml-dir=${LOCALBASE}/etc/fonts
|
||||
|
|
|
|||
Loading…
Reference in New Issue