From 24facd00c99def5edf24ccf3dacd022bccd6c29b Mon Sep 17 00:00:00 2001 From: Lucio Andrés Illanes Albornoz Date: Feb 11 2020 18:03:27 +0000 Subject: vars/build.vars:dbus{,_host}:${PKG_INSTALL_FILES}: install ${PREFIX}/include/dbus/ symlink. vars/build.vars:glib_host:${PKG_CFLAGS_CONFIGURE_EXTRA}: configure w/ -I${PREFIX}/include/glib-2.0 -I${PREFIX}/lib/dbus-1.0/include -I${PREFIX}/lib/glib-2.0/include. --- diff --git a/vars/build.vars b/vars/build.vars index 2e4e10b..8580581 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -224,11 +224,12 @@ HOST_DEPS_PREFIX="${PREFIX}"; : ${PKG_DBUS_HOST_URL:=https://dbus.freedesktop.org/releases/dbus/dbus-${PKG_DBUS_HOST_VERSION}.tar.gz}; : ${PKG_DBUS_HOST_SHA256SUM:=7fd9d0536f7ec2f2afc94b84d5b5487f88c464e8d47c661d8e0b54aa83974bfa}; : ${PKG_DBUS_HOST_CONFIGURE_ARGS_EXTRA:="--disable-tests --with-dbus-daemondir=/bin"}; +: ${PKG_DBUS_HOST_INSTALL_FILES:="@dbus-1.0=include/dbus"}; : ${PKG_DBUS_GLIB_HOST_DEPENDS:="dbus_host glib_host"}; : ${PKG_DBUS_GLIB_HOST_SHA256SUM:=7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825}; : ${PKG_DBUS_GLIB_HOST_VERSION:=0.110}; : ${PKG_DBUS_GLIB_HOST_URL:=https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PKG_DBUS_GLIB_HOST_VERSION}.tar.gz}; -: ${PKG_DBUS_GLIB_HOST_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX}/include/dbus-1.0 -I${PREFIX}/include/glib-2.0 -I${PREFIX}/lib/dbus-1.0/include -I${PREFIX}/lib/glib-2.0/include"}; +: ${PKG_DBUS_GLIB_HOST_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX}/include/glib-2.0 -I${PREFIX}/lib/dbus-1.0/include -I${PREFIX}/lib/glib-2.0/include"}; : ${PKG_DBUS_GLIB_HOST_CONFIGURE_ARGS_EXTRA:="--enable-bash-completion=no"}; : ${PKG_EXPAT_HOST_SHA256SUM:=17b43c2716d521369f82fc2dc70f359860e90fa440bea65b3b85f0b246ea81f2}; : ${PKG_EXPAT_HOST_VERSION:=2.2.6}; @@ -1019,6 +1020,7 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python2"; : ${PKG_DBUS_URL:=https://dbus.freedesktop.org/releases/dbus/dbus-${PKG_DBUS_VERSION}.tar.gz}; : ${PKG_DBUS_SHA256SUM:=7fd9d0536f7ec2f2afc94b84d5b5487f88c464e8d47c661d8e0b54aa83974bfa}; : ${PKG_DBUS_CONFIGURE_ARGS_EXTRA:=--disable-tests}; +: ${PKG_DBUS_INSTALL_FILES:="@dbus-1.0=include/dbus"}; : ${PKG_RPM_SHA256SUM:=ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230}; : ${PKG_RPM_VERSION:=4.15.1}; : ${PKG_RPM_URL:=http://ftp.rpm.org/releases/rpm-${PKG_RPM_VERSION%.*}.x/rpm-${PKG_RPM_VERSION}.tar.bz2};