Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 355008 Details for
Bug 479620
sys-apps/systemd: multilib
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Initial work (does not work :P)
systemd.diff (text/plain), 7.89 KB, created by
Michał Górny
on 2013-08-03 09:57:54 UTC
(
hide
)
Description:
Initial work (does not work :P)
Filename:
MIME Type:
Creator:
Michał Górny
Created:
2013-08-03 09:57:54 UTC
Size:
7.89 KB
patch
obsolete
>Index: Manifest >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/Manifest,v >retrieving revision 1.159 >diff -u -B -r1.159 Manifest >--- Manifest 31 Jul 2013 22:44:14 -0000 1.159 >+++ Manifest 3 Aug 2013 09:57:24 -0000 >@@ -1,6 +1,3 @@ >------BEGIN PGP SIGNED MESSAGE----- >-Hash: SHA256 >- > AUX 206-0001-logind-update-state-file-after-generating-the-sessio.patch 3341 SHA256 642a08dbcfa0517515570fd7537569ce0c7caa0c2b90274e80d999b6dd8e8d6a SHA512 1a901777c0a586ad5e4fcf6380784e451754c9ac65cf6e83641a6a2af2bed9f0741316d6aedb5d960a6c828186f4dcce79c7cc8234607f7f164253abd7cdfeed WHIRLPOOL 34639bc6dd4250209383c97061c09ded8d01f8962e19a39a9b2d848edf4fc4c6dbd3d6a5ff5563c2057c033d8a95ef46de7f116e3bbaee330bdbc26bb60d5b91 > AUX 206-0002-Add-usr-share-keymaps-to-localectl-supported-locatio.patch 996 SHA256 494bd90cb327cd0bd08f7d8183802d6c91238b1cfab19dee312c704869fa23b6 SHA512 ff4db4bfb2d4050b276c487e9d7cba39b9cd26b62ff455c2c0d21f31f6d313453de73743974266f6ba1ee4aca50639c1abba40f73ed58f32dda8831b3b649337 WHIRLPOOL bada3e79aa856e7a67ffb6603f27b94d3b359536036e12c931181e6e768c0e0c91edfdab0c0d30bdd40fffb1bc27d653700aa3c410e122ae0653003b1bdad5cd > AUX 206-0003-tmpfiles-support-passing-prefix-multiple-times.patch 2991 SHA256 94d66e0bdd45fea0648971e9ef234e03bb743fd32444d972f5e8f293847aed01 SHA512 980134aac21cb7f0883a6326f62abaa32adf65b5b1263d14a2efacdadf2a7f46f4549b79077f0f087914e3b513981763f7065c915f959853ae34a6a1b2c0b323 WHIRLPOOL 73a3b5737c80c2ff6ae8050ca471bd2cf6d62a85de82d482eb12819d6eef90739ffd785b8f65ad17d88def79685a69e561373cf2aa57c88dd582002e37b06107 >@@ -15,25 +12,6 @@ > EBUILD systemd-201.ebuild 8320 SHA256 a7e696450c4ec2875c38678b26b6445e5b53672edf42553178ff2661cf14fb29 SHA512 ddf8484af18c3a995dce1b544c0e8099cc0a78422c113533be036365adb03ca6d915243fd256dfebea320baa6db602fd1f4790fbaceffad08b8d31494c828f73 WHIRLPOOL e8e90d0e6bc6dae01bd589547ba7c5af604046f02b9b5aaca6fa7e99681b9e415fec4bb5d3a265a98392bf26942b9c80d6e22509ebaa0a842f5091ed36f919b3 > EBUILD systemd-204.ebuild 8475 SHA256 2eda8bc862e52d7eb3cd7b40e6ee24cb466ceef4eb244fc9997f09fd524aa894 SHA512 e7aa30e13e80fe57d0957b02fd3107ade56d68fca32ccdfcc16ed8ffb6d2a9af7b3723d8b8d52b5c8c9497ee5833526f3438286c85bb823078a7851310e8a034 WHIRLPOOL 94dc6234fda3f809eac778a7218e64aadbacd9d973e2466e8b89c27d4a3072f58cffdd404b72057a7fdc966bf9a9a1832f706c22892724757ffb33052575eae4 > EBUILD systemd-206-r1.ebuild 9240 SHA256 a89b89f191fc31b70d390dad1b90ee2d7f926844bbd60d2fc74cb835e5fa343e SHA512 2d82cbf20bbff3991d74d97171e0a2ad04f14a2a84e4164f5c4c47e3f21c5f8ce54a2b2f9f52b460c0292e1e4c26934a4fe2b1f86021a013a1d71e49cb144b6c WHIRLPOOL 0e3bdfacb9425a85e6b251827a6a5cbb765d8348216494a56f270d996a9e9f1b27dad68dd2b295555705cfee28495dfaf4c9b3350c21507302222372cca1dda5 >-EBUILD systemd-9999-r1.ebuild 7371 SHA256 1ed8f071ba862b254b9e8d6a2026e35816f31dd9f6c4090ae7a3ba9ab4821b7f SHA512 28b7ba510d17829ef60bf5bef6104a42795e9c2f07b04be54d82240395a74d1d2ebf6fdcac10ecaae17ed1d5f6069dbff4ba84988bc1333e39469bf40aa03505 WHIRLPOOL 410718855033fa2bfdb7f20310791cc0cabb523b419635c3e75f04230be07d5d30cf8dacb3119769faf2c10dcad07f99948091df77b24d4e66d2388109e4ba72 >+EBUILD systemd-9999-r1.ebuild 8476 SHA256 a820f9fd4f0ba899be4c5b438f1a248adbde2412ff88dd0204921dac37a67aad SHA512 df122288585d7db6c0461586fa46f0bcc75ffe3803df547ada8e6ca000abd64634bda43097e472a2a017f9041da434df59d4c42c3c0592295e1d24272a17517e WHIRLPOOL d0ee59fe6fad90c93e22519e1483935bcc3ee56ed8814465a486a70cb2509936e017444155a0820eb459d25e15c11a6968dfdc4335aa86f5acf501161ccb94b2 > MISC ChangeLog 29692 SHA256 a4f62b8c1c702a74b154cbbc0f0c172cf29521f683c08b0dc8e7708fe6b662e7 SHA512 bbea6cd611d6c313ec656473db2d4b5ca41083ebd1f32b315ac7e0d30112c1c6cd320b426b725b4cff06bbd8ff8309a0dbf355f90bb25e97a74f2955b28797a7 WHIRLPOOL 84de761faa396f438b74b9c4da4ab70c079fbe841d26bd175a32947e5707a8be96e687b43aab751f3893a985e8b20435407f1bbaae4f5661f7b423b193de51f8 > MISC metadata.xml 1108 SHA256 7555f673c5676c2efb2696cf49117e1198134e8c2d575052d817c50bbc4f5f45 SHA512 10b8a0dff66f163dc747e294ead1455fa0b84414eab9aa1950da08f92245eb725d77f04346276a4e727bf0d5b6adc5f6c744b770b1a47dc916ddef7d641affd9 WHIRLPOOL ae3413df80c029c8f84e092568d05e02e3c81695c741319be98ceadddbd680c589e68ec6250a653849eca6d0fe3aace7c2004f54cc2f7a9201b60af524edff28 >------BEGIN PGP SIGNATURE----- >-Version: GnuPG v2.0.20 (GNU/Linux) >- >-iQJ8BAEBCABmBQJR+ZNVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w >-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5 >-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDmVIP/1Gd3VUJgPVP902fwo/rNAX+ >-97xmAH0Ssfxq+I2TCmOOHbiKUfZ8GzK/3iG40WftfwzvMNX4rOSBJnLlRXQwCa3e >-9SmLS+oFSG2twVlxC/mWZQGTLt31S2x9qC+d78fkRfuNkU3WCD8W72p6T8tQpMHj >-Gk3nurjmZYHhUkDutOOh3dlwLiA5UOoXJrpnxGkhvgaFD4Md76fdpYSAA3LndtUz >-0gOynEjKm4aQ/TGzaiP88TKvoxLUfb9dve/RZBiyrTotSvvE6eYgIJB/KZjLNPFt >-Jwh7L6I5QOThUHNeihRVPUiK+NQXeNOk5KcwREOi1CTrSEHzMlGd+yLHYDi9TJG+ >-hMETtJ8xNa7TTTxZdrpQNp/GFCTQansOlWFbAQcmXwUzE7GsdftmEt15W5PKCcdv >-T0MaacQ+eSEcR80yRD2fPJNTw/2abVTcfUWPVDW0SVlxmWWr5zY+s6Efz2VSxeI6 >-aoYXBD4RcuzLgiW1Sh5AgsA+WGhIdC7TMcf19BUS+wshI1ssXehghhJ3yPCng4m/ >-kjMvJAD50NnYK7K/OtNQPkxH+5jE+ilZhSVWrZovAiNXIg7+D8jeHu/Z0734Eoob >-6mESMMJ2VttrJlzeOlB+JVO6W3ezlR0QWccwko5wfS5FnuSzoY4MN9TzU0b+GKwC >-A2CIid/GRD+t3Qqz2i+t >-=0GId >------END PGP SIGNATURE----- >Index: systemd-9999-r1.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999-r1.ebuild,v >retrieving revision 1.4 >diff -u -B -r1.4 systemd-9999-r1.ebuild >--- systemd-9999-r1.ebuild 31 Jul 2013 22:23:50 -0000 1.4 >+++ systemd-9999-r1.ebuild 3 Aug 2013 09:57:24 -0000 >@@ -15,7 +15,7 @@ > AUTOTOOLS_PRUNE_LIBTOOL_FILES=all > PYTHON_COMPAT=( python2_7 ) > inherit autotools-utils bash-completion-r1 fcaps linux-info multilib \ >- pam python-single-r1 systemd toolchain-funcs udev user >+ multilib-minimal pam python-single-r1 systemd toolchain-funcs udev user > > DESCRIPTION="System and service manager for Linux" > HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" >@@ -131,7 +131,7 @@ > use python && python-single-r1_pkg_setup > } > >-src_configure() { >+multilib_src_configure() { > local myeconfargs=( > --localstatedir=/var > --with-pamlibdir=$(getpam_mod_dir) >@@ -174,6 +174,39 @@ > QUOTACHECK=/usr/sbin/quotacheck > ) > >+ # now the big disable for checks >+ if ! multilib_is_native_abi; then >+ myeconfargs+=( >+ --disable-gtk-doc >+ --disable-introspection >+ --without-python >+ --disable-python-devel >+ --disable-kmod >+ --disable-blkid >+ --disable-xz >+ --disable-tcpwrap >+ --disable-pam >+ --disable-acl >+ --disable-xattr >+ --disable-smack >+ --disable-gcrypt >+ --disable-audit >+ --disable-libcryptsetup >+ --disable-qrencode >+ --disable-microhttpd >+ --disable-myhostname >+ --disable-manpages >+ >+ # udev stuff >+ --disable-gudev >+ >+ ac_cv_search_cap_init= >+ ac_cv_header_sys_capability_h=yes >+ DBUS_CFLAGS=' ' >+ DBUS_LIBS=' ' >+ ) >+ fi >+ > # Keep using the one where the rules were installed. > MY_UDEVDIR=$(get_udevdir) > >@@ -189,16 +222,40 @@ > autotools-utils_src_configure > } > >-src_compile() { >- autotools-utils_src_compile \ >- udevlibexecdir="${MY_UDEVDIR}" >+multilib_src_compile() { >+ if multilib_is_native_abi; then >+ autotools-utils_src_compile \ >+ udevlibexecdir="${MY_UDEVDIR}" >+ else >+ local targets=( >+ libudev.la >+ src/libudev/libudev.pc >+ ) >+ >+ emake "${targets[@]}" >+ fi > } > >-src_install() { >- autotools-utils_src_install -j1 \ >- udevlibexecdir="${MY_UDEVDIR}" \ >- dist_udevhwdb_DATA= >+multilib_src_install() { >+ if multilib_is_native_abi; then >+ autotools-utils_src_install -j1 \ >+ udevlibexecdir="${MY_UDEVDIR}" \ >+ dist_udevhwdb_DATA= >+ else >+ local targets=( >+ lib_LTLIBRARIES="libudev.la" >+ pkgconfiglib_DATA="src/libudev/libudev.pc" >+ >+ install-libLTLIBRARIES >+ install-sharepkgconfigDATA >+ install-includeHEADERS >+ ) >+ >+ emake DESTDIR="${D}" "${targets[@]}" >+ fi >+} > >+multilib_src_install_all() { > # zsh completion > insinto /usr/share/zsh/site-functions > newins shell-completion/systemd-zsh-completion.zsh "_${PN}"
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 479620
: 355008