diff options
| author |   Sven 'sleipnir' Rebhan <odinshorse@googlemail.com> | 2009-03-24 07:40:11 +0000 |
|---|---|---|
| committer | Sven 'sleipnir' Rebhan <odinshorse@googlemail.com> | 2009-03-24 07:40:11 +0000 |
| commit | b6d6fcecb6944714d0aab7914901dd587dadd38d (patch) | |
| tree | df3d9d49d7ad02761b0dd2d60960f6e1266b344b /sys-apps | |
| parent | Mask libxml-2.7.3 because it fails to compile with +python. See ticket #157. (diff) | |
| download | embedded-cross-b6d6fcecb6944714d0aab7914901dd587dadd38d.tar.gz embedded-cross-b6d6fcecb6944714d0aab7914901dd587dadd38d.tar.bz2 embedded-cross-b6d6fcecb6944714d0aab7914901dd587dadd38d.zip | |
We only ne to autoreconf dbus to make it cross-compile. A patch is not required!
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/dbus/Manifest | 4 | ||||
| -rw-r--r-- | sys-apps/dbus/dbus-1.2.3-r1.ebuild | 8 | ||||
| -rw-r--r-- | sys-apps/dbus/files/dbus-1.2.3-cross-sys_lib_search_path_spec.patch | 17 |
3 files changed, 4 insertions, 25 deletions
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest index a869ca7..d514c9f 100644 --- a/sys-apps/dbus/Manifest +++ b/sys-apps/dbus/Manifest @@ -1,8 +1,6 @@ AUX 30-dbus 243 RMD160 b5e7a813cd5d91f2ea60bb22260e432cbfb72fd9 SHA1 35ee3a5d3db9c7e372603ce916e17a41edd01d36 SHA256 a8e8fec9769cc5d46df8216f7d1e1f9df422c4e46f293fd70d4b017fb01d959d AUX dbus-1.2.3-bsd.patch 1638 RMD160 9a134c5e1ccc1215d0579a02568a5707ad39e484 SHA1 061787f8131f33ccf07f11e04e6a327372de1c69 SHA256 0428d70451344153c6bf44f12d04fb7732070abf44d0d162ad995de5a9a24f1e -AUX dbus-1.2.3-cross-sys_lib_search_path_spec.patch 757 RMD160 2e6416a4571487b7f269cd4bcd1d4b413a461d07 SHA1 dd39de9ff1b47177362138c3e14da04c21008015 SHA256 fccbf7cb9eb59cb3091b41df787d6b5e6adf18db4c3cfb5ec1247e9927cc5da2 AUX dbus-1.2.3-panic-from-dbus_signature_validate.patch 1064 RMD160 a7a587fb604f94f8d064c21d0adfae080edc1a80 SHA1 309faf628e3a207985c79afd2789b8cce696eed6 SHA256 455e2834b71878b3ea1ff9f0b678c8890b2c25f0c309c96c4a8e5551e23bca68 AUX dbus.init-1.0 1152 RMD160 f0f409b59167beef2e2b8c14f701fbeaa54c3bc9 SHA1 b00e23868046c67eaec87220e92ffcea5d9dd911 SHA256 a2e13a025faa488ff35521188c0d44909bc82c55e8676a24a5a5179545303d98 DIST dbus-1.2.3.tar.gz 1564475 RMD160 d1a207b2a4c744f27c9c01388e80cebdb61f43f0 SHA1 ceb8d496bc1a9c2dcdbe559515c01ec9c0cdcf81 SHA256 16ffaa4a8758f115cf02c78962b0849ed4d802872420fd460c433a9cd580ed1a -EBUILD dbus-1.2.3-r1.ebuild 4015 RMD160 869bb8fc5d1ef1aa4c3ecfb7cd3a568e64be284b SHA1 d34769d264894f63a185f231249cd8c8422f5fa0 SHA256 c2a507469c241741d811c9decc88e297ea533055ddf451a9f98e1319da68f11b -MISC dbus-1.2.3-r1.ebuild~ 4013 RMD160 e76bf7cbf087f8ba94d3eae9b078759825161c57 SHA1 c2ac6529fab87af5d59c9611c1b6a7b335f6fbd9 SHA256 15ec1c5ad327eae93296ecced484dc5427ea3df7059cba10469f9f7b6c71f60e +EBUILD dbus-1.2.3-r1.ebuild 3913 RMD160 037c5b6fa0382a69c6f08d17637c48eefbb1fc8d SHA1 9e86c1e8bc4383cdb8b0b5b39e10144575397c2a SHA256 138725b1db699679c06eae0c5fcb1e11e7fdb476f537260dc74a3aae2a052558 diff --git a/sys-apps/dbus/dbus-1.2.3-r1.ebuild b/sys-apps/dbus/dbus-1.2.3-r1.ebuild index d2f24dc..4ec45d3 100644 --- a/sys-apps/dbus/dbus-1.2.3-r1.ebuild +++ b/sys-apps/dbus/dbus-1.2.3-r1.ebuild @@ -34,11 +34,9 @@ src_unpack() { # From upstream, drop at next bump epatch "${FILESDIR}"/${P}-bsd.patch - # Fix cross-compilation by using the correct sys_lib_search_path_spec - epatch "${FILESDIR}"/${P}-cross-sys_lib_search_path_spec.patch - - # We need to redo the autoconf/automake magic because of the above patch - eautoreconf || die "Autoreconf failed" + # We need to do the autoconf/automake magic because otherwise + # cross-compilation will fail due to a wrong sys_lib_search_path_spec. + eautoreconf } src_compile() { diff --git a/sys-apps/dbus/files/dbus-1.2.3-cross-sys_lib_search_path_spec.patch b/sys-apps/dbus/files/dbus-1.2.3-cross-sys_lib_search_path_spec.patch deleted file mode 100644 index f5119de..0000000 --- a/sys-apps/dbus/files/dbus-1.2.3-cross-sys_lib_search_path_spec.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- aclocal.m4 2008-08-06 19:43:36.000000000 +0000 -+++ aclocal.m4.new 2009-03-20 07:54:16.000000000 +0000 -@@ -1632,8 +1632,12 @@ - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes -- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -+ if test -z "sys_lib_search_path_spec"; then -+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -+ fi -+ if test -z "sys_lib_dlsearch_path_spec"; then -+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -+ fi - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then |