diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-08-09 13:01:22 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-08-09 13:01:22 +0000 |
| commit | b9412a0a8ddb5d7d882df2baf2b653a8e20f1581 (patch) | |
| tree | 94a1136ac032fc36836a830273d58bfa89e09109 | |
| parent | Migrate to twisted-r1. (diff) | |
| download | gentoo-2-b9412a0a8ddb5d7d882df2baf2b653a8e20f1581.tar.gz gentoo-2-b9412a0a8ddb5d7d882df2baf2b653a8e20f1581.tar.bz2 gentoo-2-b9412a0a8ddb5d7d882df2baf2b653a8e20f1581.zip | |
Work-around 32-bit dbus check (it is not used by the libraries).
(Portage version: 2.2.0_alpha196/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)
| -rw-r--r-- | sys-apps/systemd/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-206-r3.ebuild | 4 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-9999-r1.ebuild | 8 |
3 files changed, 13 insertions, 5 deletions
diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog index fcd4a2ea99e6..fa6103abdaa4 100644 --- a/sys-apps/systemd/ChangeLog +++ b/sys-apps/systemd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/systemd # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.162 2013/08/09 09:01:15 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.163 2013/08/09 13:01:22 mgorny Exp $ + + 09 Aug 2013; Michał Górny <mgorny@gentoo.org> systemd-206-r3.ebuild, + systemd-9999-r1.ebuild: + Work-around 32-bit dbus check (it is not used by the libraries). *systemd-206-r3 (09 Aug 2013) diff --git a/sys-apps/systemd/systemd-206-r3.ebuild b/sys-apps/systemd/systemd-206-r3.ebuild index 3d04ee78e7c4..6f8f70a2c4d0 100644 --- a/sys-apps/systemd/systemd-206-r3.ebuild +++ b/sys-apps/systemd/systemd-206-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-206-r3.ebuild,v 1.1 2013/08/09 09:01:15 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-206-r3.ebuild,v 1.2 2013/08/09 13:01:22 mgorny Exp $ EAPI=5 @@ -197,6 +197,8 @@ multilib_src_configure() { myeconfargs+=( ac_cv_search_cap_init= ac_cv_header_sys_capability_h=yes + DBUS_CFLAGS=' ' + DBUS_LIBS=' ' --disable-acl --disable-audit diff --git a/sys-apps/systemd/systemd-9999-r1.ebuild b/sys-apps/systemd/systemd-9999-r1.ebuild index 563271066ff8..f163439b9455 100644 --- a/sys-apps/systemd/systemd-9999-r1.ebuild +++ b/sys-apps/systemd/systemd-9999-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild,v 1.8 2013/08/08 18:23:11 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild,v 1.9 2013/08/09 13:01:22 mgorny Exp $ EAPI=5 @@ -190,6 +190,8 @@ multilib_src_configure() { myeconfargs+=( ac_cv_search_cap_init= ac_cv_header_sys_capability_h=yes + DBUS_CFLAGS=' ' + DBUS_LIBS=' ' --disable-acl --disable-audit @@ -226,7 +228,7 @@ multilib_src_compile() { if multilib_is_native_abi; then emake "${mymakeopts[@]}" else - echo 'gentoo: $(lib_LTLIBRARIES) $(pkgconfigdata_DATA)' | \ + echo 'gentoo: $(lib_LTLIBRARIES) $(pkgconfiglib_DATA)' | \ emake "${mymakeopts[@]}" -f Makefile -f - gentoo fi } @@ -261,7 +263,7 @@ multilib_src_install() { else mymakeopts+=( install-libLTLIBRARIES - install-pkgconfigdataDATA + install-pkgconfiglibDATA install-includeHEADERS install-pkgincludeHEADERS ) |