dbus: fix cross build again.

This commit is contained in:
Juan RP 2013-02-25 20:48:02 +01:00
parent 47842a44d8
commit ddc20f8daa

View File

@ -34,10 +34,16 @@ pre_configure() {
[ ! -d dbus-bootstrap ] && mkdir dbus-bootstrap [ ! -d dbus-bootstrap ] && mkdir dbus-bootstrap
cd dbus-bootstrap cd dbus-bootstrap
../dbus-${version}/configure ${CONFIGURE_SHARED_ARGS} \ if [ -n "$XBPS_CROSS_TRIPLET" ]; then
_confargs="--host=$XBPS_CROSS_TRIPLET
--with-libtool-sysroot=/usr/$XBPS_CROSS_TRIPLET"
fi
../dbus-${version}/configure ${_confargs} \
--prefix=${wrksrc}/tmpbuild/usr \ --prefix=${wrksrc}/tmpbuild/usr \
--disable-systemd --without-x || return 1 --disable-systemd --without-x
make && make install || return 1 make ${makejobs}
make install
# Build a temporary systemd; we are only interested in libsystemd-login. # Build a temporary systemd; we are only interested in libsystemd-login.
if [ -n "$XBPS_CROSS_TRIPLET" ]; then if [ -n "$XBPS_CROSS_TRIPLET" ]; then
@ -49,8 +55,8 @@ pre_configure() {
cd systemd-bootstrap cd systemd-bootstrap
env PKG_CONFIG_LIBDIR=${wrksrc}/tmpbuild/usr/lib/pkgconfig \ env PKG_CONFIG_LIBDIR=${wrksrc}/tmpbuild/usr/lib/pkgconfig \
../systemd-${_systemd_version}/configure \ ../systemd-${_systemd_version}/configure ${_confargs} \
${CONFIGURE_SHARED_ARGS} --prefix=/usr --disable-nls \ --prefix=/usr --disable-nls \
--enable-introspection=no --disable-kmod --disable-blkid \ --enable-introspection=no --disable-kmod --disable-blkid \
--disable-ima --disable-chkconfig --disable-selinux \ --disable-ima --disable-chkconfig --disable-selinux \
--disable-xz --disable-tcpwrap --disable-pam \ --disable-xz --disable-tcpwrap --disable-pam \
@ -62,9 +68,10 @@ pre_configure() {
--disable-timedated --disable-localed --disable-coredump \ --disable-timedated --disable-localed --disable-coredump \
--disable-myhostname --disable-gudev --disable-keymap \ --disable-myhostname --disable-gudev --disable-keymap \
--disable-manpages --without-python --with-sysvinit-path= \ --disable-manpages --without-python --with-sysvinit-path= \
--with-sysvrcnd-path= --disable-tests || return 1 --with-sysvrcnd-path= --disable-tests
make && make DESTDIR=${wrksrc}/systemd-install install || return 1 make ${makejobs}
make DESTDIR=${wrksrc}/systemd-install install
# Copy libsystemd-*, headers and pkg-config files. # Copy libsystemd-*, headers and pkg-config files.
cp -a ${wrksrc}/systemd-install/usr/lib/libsystemd* \ cp -a ${wrksrc}/systemd-install/usr/lib/libsystemd* \
@ -81,9 +88,11 @@ do_configure() {
if [ -n "$XBPS_CROSS_TRIPLET" ]; then if [ -n "$XBPS_CROSS_TRIPLET" ]; then
autoreconf -fi autoreconf -fi
_confargs="PKG_CONFIG_LIBDIR=${_systemddir}/lib/pkgconfig" _confargs="--host=$XBPS_CROSS_TRIPLET
--with-libtool-sysroot=/usr/$XBPS_CROSS_TRIPLET
PKG_CONFIG_LIBDIR=${_systemddir}/lib/pkgconfig"
fi fi
./configure ${CONFIGURE_SHARED_ARGS} \ ./configure --prefix=/usr \
--disable-selinux --enable-userdb-cache --with-xml=expat \ --disable-selinux --enable-userdb-cache --with-xml=expat \
--disable-dnotify --enable-inotify --with-dbus-user=dbus \ --disable-dnotify --enable-inotify --with-dbus-user=dbus \
--disable-doxygen-docs --disable-xml-docs --disable-static \ --disable-doxygen-docs --disable-xml-docs --disable-static \