diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-02-11 18:35:21 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-02-11 18:35:21 +0000 |
| commit | 4df7709a2edf9c2ad4c657ff25a3766cc6e9aa54 (patch) | |
| tree | 565c6f229dc8449a84acb024d580f2b6ea8d24cb | |
| parent | 77a2dd391c78fe86ade0a6f42092483c25bed1cc (diff) | |
| download | midipix_build-4df7709a2edf9c2ad4c657ff25a3766cc6e9aa54.tar.bz2 midipix_build-4df7709a2edf9c2ad4c657ff25a3766cc6e9aa54.tar.xz | |
vars/build.vars:dbus{,_host}:${PKG_INSTALL_FILES}: don't install ${PREFIX}/include/dbus/ symlink.
vars/build.vars:dbus_glib_host:${PKG_CFLAGS_CONFIGURE_EXTRA}: configure w/ -I${PREFIX}/include/dbus-1.0 -I${PREFIX}/lib/dbus-1.0/include -I${PREFIX}/include/glib-2.0 -I${PREFIX}/lib/glib-2.0/include.
vars/build.vars:rpm_host:${PKG_CFLAGS_CONFIGURE}: configure w/ -I${PREFIX}/include -I${PREFIX}/include/dbus-1.0 -I${PREFIX}/lib/dbus-1.0/include.
| -rw-r--r-- | vars/build.vars | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/vars/build.vars b/vars/build.vars index d02993db..bc4c3bc1 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -224,12 +224,11 @@ 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/dbus=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/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/dbus-1.0 -I${PREFIX}/lib/dbus-1.0/include -I${PREFIX}/include/glib-2.0 -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}; @@ -409,7 +408,6 @@ HOST_DEPS_RPM_PREFIX="${PREFIX}"; : ${PKG_LIBARCHIVE_HOST_VERSION:=3.3.3}; : ${PKG_LIBARCHIVE_HOST_URL:=http://www.libarchive.org/downloads/libarchive-${PKG_LIBARCHIVE_HOST_VERSION}.tar.gz}; : ${PKG_LIBARCHIVE_HOST_LDFLAGS_CONFIGURE:="-L${PREFIX}/lib"}; -# XXX : ${PKG_LIBARCHIVE_HOST_DEPENDS:="bzip2_host"}; : ${PKG_LMDB_HOST_URLS_GIT:="lmdb=https://github.com/Redfoxmoon3/lmdb.git@mdb.master"}; : ${PKG_LMDB_HOST_IN_TREE:=1}; : ${PKG_POPT_HOST_SHA256SUM:=e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8}; @@ -419,9 +417,8 @@ HOST_DEPS_RPM_PREFIX="${PREFIX}"; : ${PKG_RPM_HOST_SHA256SUM:=ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230}; : ${PKG_RPM_HOST_VERSION:=4.15.1}; : ${PKG_RPM_HOST_URL:=http://ftp.rpm.org/releases/rpm-${PKG_RPM_HOST_VERSION%.*}.x/rpm-${PKG_RPM_HOST_VERSION}.tar.bz2}; -: ${PKG_RPM_HOST_CFLAGS_CONFIGURE:="-I${PREFIX}/include"}; +: ${PKG_RPM_HOST_CFLAGS_CONFIGURE:="-I${PREFIX}/include -I${PREFIX}/include/dbus-1.0 -I${PREFIX}/lib/dbus-1.0/include"}; : ${PKG_RPM_HOST_CONFIGURE_ARGS_EXTRA:="-without-lua --enable-ndb --enable-lmdb --enable-bdb=no --with-crypto=openssl --with-vendor=midipix"}; -# XXX : ${PKG_RPM_HOST_DEPENDS:="bzip2_host libarchive_host lmdb_host popt_host"}; : ${PKG_RPM_HOST_LDFLAGS_CONFIGURE:="-L${PREFIX}/lib"}; # @@ -1020,7 +1017,6 @@ 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/dbus=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}; |