1 |
commit: 91fa8fe1e54cfd4b25cae067a7b2ce40ef048024 |
2 |
Author: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 31 06:45:30 2020 +0000 |
4 |
Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 31 06:46:07 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/rust.git/commit/?id=91fa8fe1 |
7 |
|
8 |
drop virtual/cargo, update rust |
9 |
|
10 |
Signed-off-by: Mikhail Pukhlikov <cynede <AT> gentoo.org> |
11 |
|
12 |
dev-lang/rust/Manifest | 10 ++-- |
13 |
dev-lang/rust/files/1.36.0-libressl.patch | 68 ---------------------- |
14 |
dev-lang/rust/files/1.40.0-add-soname.patch | 36 ++++++++++++ |
15 |
...-1.40.0-r666.ebuild => rust-1.41.0-r666.ebuild} | 2 +- |
16 |
dev-rust/qt_generator/qt_generator-9999.ebuild | 3 +- |
17 |
dev-rust/rust-bindgen/rust-bindgen-9999.ebuild | 3 +- |
18 |
dev-util/SolidOak/SolidOak-9999.ebuild | 5 +- |
19 |
dev-util/racer/racer-9999.ebuild | 3 +- |
20 |
eclass/cargo.eclass | 4 +- |
21 |
virtual/cargo/cargo-1.40.0-r666.ebuild | 17 ------ |
22 |
virtual/cargo/cargo-9999.ebuild | 17 ------ |
23 |
virtual/cargo/metadata.xml | 8 --- |
24 |
...-1.40.0-r666.ebuild => rust-1.41.0-r666.ebuild} | 2 +- |
25 |
13 files changed, 50 insertions(+), 128 deletions(-) |
26 |
|
27 |
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest |
28 |
index 94543be..41e5914 100644 |
29 |
--- a/dev-lang/rust/Manifest |
30 |
+++ b/dev-lang/rust/Manifest |
31 |
@@ -1,5 +1,5 @@ |
32 |
-DIST rust-1.39.0-aarch64-unknown-linux-gnu.tar.xz 238165960 SHA256 a3f6943ad00bbf7131c8571b21f641082c8ac8298ee3a8bd5428e96743e31e05 SHA512 ad37a8454acb8985a5c2b42d7f8bc4212651a16fb5af6b4314dd97faa47de79893f2f74b516af89cd7e77ef3db64247c4764585eb0a17ac328c9cba5e5b9c407 WHIRLPOOL 44a19ddd42628d841b8d923a64236f319f57ac414d97e679a2cf61834e3d32c43ccc650d085781def16ca17b51490e412ddcf563347403dcb65849d443688429 |
33 |
-DIST rust-1.39.0-armv7-unknown-linux-gnueabihf.tar.xz 246114456 SHA256 d98a3cfaa427e7bba95a36cbe98cc2ded3ff5ee87242add1e0c393467c069756 SHA512 db2b001a5587e2d5c8cdcb53c974f2332e76f58e362cba55fc971d7244754f1fa0b7e708ad7e73e7250652b442f06929dc1e8981536d7d76850b45ade275d406 WHIRLPOOL 4d1ba915fef3afeb197a236cdaa6af0c7c49b8db1fae9b2381e3fc226714519304d16361cb50ab0b2853ee762990fe17ddf60130cdb6508d6d7042936bacc252 |
34 |
-DIST rust-1.39.0-i686-unknown-linux-gnu.tar.xz 297665804 SHA256 26b57f9c76ef9119e703a5b5acb7026963f18814cc167c2d8d6a562e05ad755c SHA512 930546e79c0b1105eb0604ae33ccdbd8b00b56e56d069f19f0d802093a052fd3f940eaf1390cdecd79833b0c70457ebfee2ce3b9674fff72df1367076584394a WHIRLPOOL c77a59a825b2e73cb40670bacda632fcba93273aaa3fb67b794c82dd3038879ebbcbe7da33a70c72260c7039b5df9319267db536225f33d401983b55b505c564 |
35 |
-DIST rust-1.39.0-x86_64-unknown-linux-gnu.tar.xz 284967620 SHA256 095874d294355e95236e07e3e82635d95b8872f751ad21c5d1d9b53ef443e536 SHA512 02ca6c821877379d8bd0bcc38281a87e6f86bdbae1270da19e41336cc3a812d9c11c1e976655c192c39153f92cda90ddbd7b4b0bcb4f6787d6d354d2be827a8a WHIRLPOOL 9a28af0cebaac330cebe42ac939645b0ed3484558074431ecac6022e6e2c80e94718371180fee2d4536144e171ce57f7cbe718723b3ae42d215d3ebca79e60ff |
36 |
-DIST rustc-1.40.0-src.tar.xz 92306352 SHA256 6e2aa3a91697f4b225c6b394cbae6b97666f061dba491f666a5281698fe2aace SHA512 b5ac3079acefb62d3c985b77f624d7fb68de23a59396fed9ccb292db61641c064f3146ee54d3cf59067b17ebfaadd14a6b2b466def60316bb5b13ba3aef01e1f WHIRLPOOL 2a4f366aec0a129cc3f2b18d623721070613c1ae1b51f797283a73307b5fd425dfde0e32d4308125def62e9a9dfae4503c9a750db3adbdb0d97144e94d8f1a08 |
37 |
+DIST rust-1.40.0-aarch64-unknown-linux-gnu.tar.xz 80285104 SHA256 5817c8c3a919117ae6dac8e9b3039d4e614cc9bed8040bf64fcf2e683b8c6245 SHA512 f601e4251e08a6d66edb0489b6ab840b57622b506547e81036e6dfe08eb71005a22a2777a0b8b2d07a6f88286d58f513482b863116311a6f43c7284769af6e7f WHIRLPOOL ae73cdedb25883462131e5d723de49cf7f58f15099c4b6a1e64322be5060c1238c3df80211e3e19b4990e9327aea50e2c01fdfec8781a745661debc13f4f3436 |
38 |
+DIST rust-1.40.0-armv7-unknown-linux-gnueabihf.tar.xz 84254100 SHA256 a5701ea0b7551e0a77d6e08fee4f4c871d448d4f7e82be0ee39a834918306e7e SHA512 d3345946c5a3d5cb3d7fca4d3200710704d64547ebfa4ab11c45ea1a18ca3c49b429783d499845f31dcb150abe2f6836fe203fd9d7aa53e0475b940da5549492 WHIRLPOOL e746c620fc235be425ff50ed16d5236894e07c35856b8d16a5877c9dabf79673624d5c23894bca30d84cf2dbbdcbd2c3e9b9358118decc6495898b8f9ec28032 |
39 |
+DIST rust-1.40.0-i686-unknown-linux-gnu.tar.xz 122168896 SHA256 82454e1b60b2bc24779d9c949cc0e1da43f3e423dbfc6b45b5afddf65829fc9d SHA512 d727149afbbc3b2709360dd6080ff301e781aaa94459c1348d3e35382bc9c7ad65c4d70f9bfc7b44ac92ddaf89e3aab92b75b9d184eba86916da25bd629592b6 WHIRLPOOL b1b68c2bc8eb00390a7e131b6c540290d2516bc690523f839f8e48afb86f3b175d9e2e1ac4e8db8f79d3ba84db0681ceff0a517ea4946a19416645e69e5b4f54 |
40 |
+DIST rust-1.40.0-x86_64-unknown-linux-gnu.tar.xz 110186516 SHA256 37492d6467bcea611b2c7388aed50b655524f81410e255142ef6cfb6cef1ec53 SHA512 11a2ad1d8b9e91cbe9ee6a1954d46ac75eeaa83f0c2425a8ad70d191727b02e86ead33d6464222effca6f5134c31a165801a854aa57bdb5f12944d605de3c1d1 WHIRLPOOL 2a927c6176948a6b3aceed4e224819f2c96beb4acf2523b3da32dd76701bf5b4516cef458cbe2ad4355724a6f745a2eb4c890d4f0c40ff547ca86a2eae73dcd7 |
41 |
+DIST rustc-1.41.0-src.tar.xz 93763052 SHA256 38d6742e5c4c98a835de5d6e12a209e442fb3078a03b2c01bab6ea7afb25be6f SHA512 0e30fe53b77860085bea0f1f60315eb835b00dd796c5d1b98ed44fe6fc27336dfb064908c86e1669a9cbe81c9ca1495e1c259a8a268bef23b23805a719cef0dd WHIRLPOOL 81acfe88e820cb7422c47968794908097937a1ce665e08b3f08f3cf0a5ed78195c8b6485c9b158ff6ea2bd3562a6b6a50bc959b479188b424ce4ddb1fe8820cc |
42 |
|
43 |
diff --git a/dev-lang/rust/files/1.36.0-libressl.patch b/dev-lang/rust/files/1.36.0-libressl.patch |
44 |
deleted file mode 100644 |
45 |
index cc1ce26..0000000 |
46 |
--- a/dev-lang/rust/files/1.36.0-libressl.patch |
47 |
+++ /dev/null |
48 |
@@ -1,68 +0,0 @@ |
49 |
-diff --git a/vendor/openssl-sys/.cargo-checksum.json b/vendor/openssl-sys/.cargo-checksum.json |
50 |
-index 5c961bcbc..a0ea2d357 100644 |
51 |
---- a/vendor/openssl-sys/.cargo-checksum.json |
52 |
-+++ b/vendor/openssl-sys/.cargo-checksum.json |
53 |
-@@ -1 +1 @@ |
54 |
--{"files":{"CHANGELOG.md":"a3e7e4750fe6130a93e9423d5b1b68c659dd29246602f71583c7a101c4d647be","Cargo.toml":"5fdba4ce7cf40abec303651694e79a5ae551f040a7bbaad134ed9ab54d26a613","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"96a414be6e7e061a21a9e39a61449039f6791225264032641dd044a1a9b88111","build/cfgs.rs":"61b741c4fe9612f5a70b19bec53d3ab7ec2d7038b163c35b54f0664caa104a31","build/expando.c":"c4fa8a4424b2321f1857edfc5ce1ac1f03eda54440367d3142310c0eb5553004","build/find_normal.rs":"0a2dc417eace7fc72c27b9046ebaf53c75e418b27baa877434925a81fe6c23ed","build/find_vendored.rs":"d88c47f4cf851aa67c0e3dec679910c5c7ba239bc5a1aa89e507a875b4c4ca0f","build/main.rs":"681a1f8a8f389c82bbd3d2498a3692c201c63db658e7c3d162f09d5d81892fd4","src/aes.rs":"660efd70f809cb2f5dbbf527be8f9592911776bab7dafa1fc4cc72dd9a576b67","src/asn1.rs":"f72d6871d38865d9e7378882135cdc6f1acd66c48a4fc846502b7f488dbbf111","src/bio.rs":"5c6f394a78f258af3babb68330fa3571610476c4c3ba3404359db928 |
55 |
f2f706ee","src/bn.rs":"c71b9c79f704a94a889d27bf75e7e5b1f9f10b0df0aeb485aef509cf05d7467f","src/cms.rs":"95a0803286d1efbe709a3668443b5001f5cce6f9db216165b1e08950972e0bfd","src/conf.rs":"511e008c18039f54d856d70b80009426fc7f4ce34fe4304e2c58ebf465031de0","src/crypto.rs":"f6e8a116940755b2b53e3d0d49d1b451fc6e4269831fd1cfcee9d6ed404cf487","src/dh.rs":"7cc334e86d16b3eae165dfa3a6c8e488bc0fe590c17beda38893d2e9d784d5a6","src/dsa.rs":"ae79baf231681900ea76304285b3ffacf5298c90b8c04d371269cf4adbb5b9fa","src/dtls1.rs":"45e1dbf94a42d587fd948d553dc30187aa6aa2b5b82d554cf725ff36df768aa0","src/ec.rs":"5341787b108f4e9acb12428fbf993aa507e9d77b97284912f7eab414ec6aeff9","src/err.rs":"f6641be5df397086a9db80667e191fb1d92972c29151e617df86672c1a16d3ad","src/evp.rs":"300007bcf00eaff03cb1d113547a79c9495b498ede9e1b2f709a9e6e1ba42ac1","src/hmac.rs":"fa3976d94a1383f300bdec228270afb8b47c97bb019d727c7d59ba783be3c42e","src/lib.rs":"e8931dd7e59a56a247823201f52828ec15d0b8dbd15ba297cacd3dcb3ca747cf","src/macros.rs":"638fb9 |
56 |
098f6024e82b331eeee50c64cefdb58456dba28ee42560be655a0c2bf6","src/obj_mac.rs":"9c20609db7115c9edb99185375426169cb5b7caee839d892b556e92285e65309","src/object.rs":"7539eb2164c3fe2162a339ef5b45f1c835010a1522307803815779a01825eed7","src/ocsp.rs":"1db59566d2f072f7ae981f0c07e1604fcdf60e66845afe0689d588f8e4272115","src/ossl_typ.rs":"fc7366e75c78707650c8667593ed183eca6a8ce8dd6b911e342f644d1bcf98bd","src/pem.rs":"83bb7745615a99fe2a8d5f8f51addba2024c7e6be847ab6c9244bfd04388c4f9","src/pkcs12.rs":"93aab2820008ad90dc346a7dcc02f9201d94bff0bb7d1d71031c097850287c50","src/pkcs7.rs":"5370c8d4bfbf1502fa33aff635cb730e7c87814580f1df9bdb1412a492377813","src/rand.rs":"469601b4fbb56d4dbf5cf5d7bb8483e3bde411edea18601e7d1ed6ef27180fd3","src/rsa.rs":"0e8c1f0bc37620a9208175542143bfd411ae88188974d2d5b37a2b8b77d0e2c8","src/safestack.rs":"6c39e28565d34efad707d77561d4caa99e3f028fcac3a2ef6fd403a78de1190c","src/sha.rs":"05044d221d8d205010a4e3760c0b5c0e2e923e165db0d65f9a8c9bcedaad9961","src/srtp.rs":"306047f3f31828fe7 |
57 |
d15de154b375f071ae07012a94c0b5c909f5fe57962a11b","src/ssl.rs":"18c0c0c5ef02329be90fd279968da61d3e1a6b3a3aec102d6fefd99021d1822a","src/ssl3.rs":"9336c816e00847d552dea22587d4ac72ff3cbd469fa5ff750423a19ea11e68eb","src/stack.rs":"1a509907283e5a2bf88cf193ce607f49ce7d2d95547c2ce2abc0fd4567aad334","src/tls1.rs":"60ca3dea1bbfda645bde563b4a878dac129c3f760e3ad572381000fc7a8ef522","src/x509.rs":"20e221731587221aab00aef21b4e4bebb7635603d265d424f3dd3c60d4c511e2","src/x509_vfy.rs":"5609f6300ab37a4d4755c81f7af1e6bb93a2f1a6f333c6e42f1e73ebf83ddc05","src/x509v3.rs":"30c58ce7d80670cc597d041e0f59862c1100e38743fc9dde2aec6dc811a4a558"},"package":"33c86834957dd5b915623e94f2f4ab2c70dd8f6b70679824155d5ae21dbd495d"} |
58 |
-\ No newline at end of file |
59 |
-+{"files":{"CHANGELOG.md":"a3e7e4750fe6130a93e9423d5b1b68c659dd29246602f71583c7a101c4d647be","Cargo.toml":"5fdba4ce7cf40abec303651694e79a5ae551f040a7bbaad134ed9ab54d26a613","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"96a414be6e7e061a21a9e39a61449039f6791225264032641dd044a1a9b88111","build/cfgs.rs":"61b741c4fe9612f5a70b19bec53d3ab7ec2d7038b163c35b54f0664caa104a31","build/expando.c":"c4fa8a4424b2321f1857edfc5ce1ac1f03eda54440367d3142310c0eb5553004","build/find_normal.rs":"0a2dc417eace7fc72c27b9046ebaf53c75e418b27baa877434925a81fe6c23ed","build/find_vendored.rs":"d88c47f4cf851aa67c0e3dec679910c5c7ba239bc5a1aa89e507a875b4c4ca0f","build/main.rs":"f2cd4ca8fde8298211581f9e1ca61668706d7681a38b95a63591450e1d8366a3","src/aes.rs":"660efd70f809cb2f5dbbf527be8f9592911776bab7dafa1fc4cc72dd9a576b67","src/asn1.rs":"f72d6871d38865d9e7378882135cdc6f1acd66c48a4fc846502b7f488dbbf111","src/bio.rs":"5c6f394a78f258af3babb68330fa3571610476c4c3ba3404359db928 |
60 |
f2f706ee","src/bn.rs":"c71b9c79f704a94a889d27bf75e7e5b1f9f10b0df0aeb485aef509cf05d7467f","src/cms.rs":"95a0803286d1efbe709a3668443b5001f5cce6f9db216165b1e08950972e0bfd","src/conf.rs":"511e008c18039f54d856d70b80009426fc7f4ce34fe4304e2c58ebf465031de0","src/crypto.rs":"f6e8a116940755b2b53e3d0d49d1b451fc6e4269831fd1cfcee9d6ed404cf487","src/dh.rs":"7cc334e86d16b3eae165dfa3a6c8e488bc0fe590c17beda38893d2e9d784d5a6","src/dsa.rs":"ae79baf231681900ea76304285b3ffacf5298c90b8c04d371269cf4adbb5b9fa","src/dtls1.rs":"45e1dbf94a42d587fd948d553dc30187aa6aa2b5b82d554cf725ff36df768aa0","src/ec.rs":"5341787b108f4e9acb12428fbf993aa507e9d77b97284912f7eab414ec6aeff9","src/err.rs":"f6641be5df397086a9db80667e191fb1d92972c29151e617df86672c1a16d3ad","src/evp.rs":"300007bcf00eaff03cb1d113547a79c9495b498ede9e1b2f709a9e6e1ba42ac1","src/hmac.rs":"fa3976d94a1383f300bdec228270afb8b47c97bb019d727c7d59ba783be3c42e","src/lib.rs":"e8931dd7e59a56a247823201f52828ec15d0b8dbd15ba297cacd3dcb3ca747cf","src/macros.rs":"638fb9 |
61 |
098f6024e82b331eeee50c64cefdb58456dba28ee42560be655a0c2bf6","src/obj_mac.rs":"9c20609db7115c9edb99185375426169cb5b7caee839d892b556e92285e65309","src/object.rs":"7539eb2164c3fe2162a339ef5b45f1c835010a1522307803815779a01825eed7","src/ocsp.rs":"1db59566d2f072f7ae981f0c07e1604fcdf60e66845afe0689d588f8e4272115","src/ossl_typ.rs":"fc7366e75c78707650c8667593ed183eca6a8ce8dd6b911e342f644d1bcf98bd","src/pem.rs":"83bb7745615a99fe2a8d5f8f51addba2024c7e6be847ab6c9244bfd04388c4f9","src/pkcs12.rs":"93aab2820008ad90dc346a7dcc02f9201d94bff0bb7d1d71031c097850287c50","src/pkcs7.rs":"5370c8d4bfbf1502fa33aff635cb730e7c87814580f1df9bdb1412a492377813","src/rand.rs":"469601b4fbb56d4dbf5cf5d7bb8483e3bde411edea18601e7d1ed6ef27180fd3","src/rsa.rs":"0e8c1f0bc37620a9208175542143bfd411ae88188974d2d5b37a2b8b77d0e2c8","src/safestack.rs":"6c39e28565d34efad707d77561d4caa99e3f028fcac3a2ef6fd403a78de1190c","src/sha.rs":"05044d221d8d205010a4e3760c0b5c0e2e923e165db0d65f9a8c9bcedaad9961","src/srtp.rs":"306047f3f31828fe7 |
62 |
d15de154b375f071ae07012a94c0b5c909f5fe57962a11b","src/ssl.rs":"18c0c0c5ef02329be90fd279968da61d3e1a6b3a3aec102d6fefd99021d1822a","src/ssl3.rs":"9336c816e00847d552dea22587d4ac72ff3cbd469fa5ff750423a19ea11e68eb","src/stack.rs":"1a509907283e5a2bf88cf193ce607f49ce7d2d95547c2ce2abc0fd4567aad334","src/tls1.rs":"60ca3dea1bbfda645bde563b4a878dac129c3f760e3ad572381000fc7a8ef522","src/x509.rs":"20e221731587221aab00aef21b4e4bebb7635603d265d424f3dd3c60d4c511e2","src/x509_vfy.rs":"5609f6300ab37a4d4755c81f7af1e6bb93a2f1a6f333c6e42f1e73ebf83ddc05","src/x509v3.rs":"30c58ce7d80670cc597d041e0f59862c1100e38743fc9dde2aec6dc811a4a558"},"package":"33c86834957dd5b915623e94f2f4ab2c70dd8f6b70679824155d5ae21dbd495d"} |
63 |
-diff --git a/vendor/openssl-sys/build/main.rs b/vendor/openssl-sys/build/main.rs |
64 |
-index 02b93b90a..f0cf4b4ff 100644 |
65 |
---- a/vendor/openssl-sys/build/main.rs |
66 |
-+++ b/vendor/openssl-sys/build/main.rs |
67 |
-@@ -183,27 +183,31 @@ See rust-openssl README for more information: |
68 |
- if let Some(libressl_version) = libressl_version { |
69 |
- println!("cargo:libressl_version_number={:x}", libressl_version); |
70 |
- |
71 |
-+ let major = (libressl_version >> 28) as u8; |
72 |
- let minor = (libressl_version >> 20) as u8; |
73 |
- let fix = (libressl_version >> 12) as u8; |
74 |
-- let (minor, fix) = match (minor, fix) { |
75 |
-- (5, 0) => ('5', '0'), |
76 |
-- (5, 1) => ('5', '1'), |
77 |
-- (5, 2) => ('5', '2'), |
78 |
-- (5, _) => ('5', 'x'), |
79 |
-- (6, 0) => ('6', '0'), |
80 |
-- (6, 1) => ('6', '1'), |
81 |
-- (6, 2) => ('6', '2'), |
82 |
-- (6, _) => ('6', 'x'), |
83 |
-- (7, _) => ('7', 'x'), |
84 |
-- (8, 0) => ('8', '0'), |
85 |
-- (8, 1) => ('8', '1'), |
86 |
-- (8, _) => ('8', 'x'), |
87 |
-- (9, 0) => ('9', '0'), |
88 |
-+ let (major, minor, fix) = match (major, minor, fix) { |
89 |
-+ (2, 5, 0) => ('2', '5', '0'), |
90 |
-+ (2, 5, 1) => ('2', '5', '1'), |
91 |
-+ (2, 5, 2) => ('2', '5', '2'), |
92 |
-+ (2, 5, _) => ('2', '5', 'x'), |
93 |
-+ (2, 6, 0) => ('2', '6', '0'), |
94 |
-+ (2, 6, 1) => ('2', '6', '1'), |
95 |
-+ (2, 6, 2) => ('2', '6', '2'), |
96 |
-+ (2, 6, _) => ('2', '6', 'x'), |
97 |
-+ (2, 7, _) => ('2', '7', 'x'), |
98 |
-+ (2, 8, 0) => ('2', '8', '0'), |
99 |
-+ (2, 8, 1) => ('2', '8', '1'), |
100 |
-+ (2, 8, _) => ('2', '8', 'x'), |
101 |
-+ (2, 9, 0) => ('2', '9', '0'), |
102 |
-+ (2, 9, _) => ('2', '9', 'x'), |
103 |
-+ (3, 0, 0) => ('3', '0', '0'), |
104 |
-+ (3, 0, _) => ('3', '0', 'x'), |
105 |
- _ => version_error(), |
106 |
- }; |
107 |
- |
108 |
- println!("cargo:libressl=true"); |
109 |
-- println!("cargo:libressl_version=2{}{}", minor, fix); |
110 |
-+ println!("cargo:libressl_version={}{}{}", major, minor, fix); |
111 |
- println!("cargo:version=101"); |
112 |
- Version::Libressl |
113 |
- } else { |
114 |
-@@ -239,7 +243,7 @@ fn version_error() -> ! { |
115 |
- " |
116 |
- |
117 |
- This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5 |
118 |
--through 2.9.0, but a different version of OpenSSL was found. The build is now aborting |
119 |
-+through 3.0.x, but a different version of OpenSSL was found. The build is now aborting |
120 |
- due to this version mismatch. |
121 |
- |
122 |
- " |
123 |
|
124 |
diff --git a/dev-lang/rust/files/1.40.0-add-soname.patch b/dev-lang/rust/files/1.40.0-add-soname.patch |
125 |
new file mode 100644 |
126 |
index 0000000..7a5c018 |
127 |
--- /dev/null |
128 |
+++ b/dev-lang/rust/files/1.40.0-add-soname.patch |
129 |
@@ -0,0 +1,36 @@ |
130 |
+Description: Set DT_SONAME when building dylibs |
131 |
+ In Rust, library filenames include a version-specific hash to help |
132 |
+ the run-time linker find the correct version. Unlike in C/C++, the |
133 |
+ compiler looks for all libraries matching a glob that ignores the |
134 |
+ hash and reads embedded metadata to work out versions, etc. |
135 |
+ . |
136 |
+ The upshot is that there is no need for the usual "libfoo.so -> |
137 |
+ libfoo-1.2.3.so" symlink common with C/C++ when building with Rust, |
138 |
+ and no need to communicate an alternate filename to use at run-time |
139 |
+ vs compile time. If linking to a Rust dylib from C/C++ however, a |
140 |
+ "libfoo.so -> libfoo-$hash.so" symlink may well be useful and in |
141 |
+ this case DT_SONAME=libfoo-$hash.so would be required. More |
142 |
+ mundanely, various tools (eg: dpkg-shlibdeps) complain if they don't |
143 |
+ find DT_SONAME on shared libraries in public directories. |
144 |
+ . |
145 |
+ This patch passes -Wl,-soname=$outfile when building dylibs (and |
146 |
+ using a GNU linker). |
147 |
+Author: Angus Lees <gus@××××××.org> |
148 |
+Forwarded: no |
149 |
+ |
150 |
+--- a/src/librustc_codegen_ssa/back/link.rs |
151 |
++++ b/src/librustc_codegen_ssa/back/link.rs |
152 |
+@@ -1034,6 +1034,13 @@ |
153 |
+ cmd.args(&rpath::get_rpath_flags(&mut rpath_config)); |
154 |
+ } |
155 |
+ |
156 |
++ if (crate_type == config::CrateType::Dylib || crate_type == config::CrateType::Cdylib) |
157 |
++ && t.options.linker_is_gnu { |
158 |
++ let filename = String::from(out_filename.file_name().unwrap().to_str().unwrap()); |
159 |
++ let soname = [String::from("-Wl,-soname=") + &filename]; |
160 |
++ cmd.args(&soname); |
161 |
++ } |
162 |
++ |
163 |
+ // Finally add all the linker arguments provided on the command line along |
164 |
+ // with any #[link_args] attributes found inside the crate |
165 |
+ if let Some(ref args) = sess.opts.cg.link_args { |
166 |
|
167 |
diff --git a/dev-lang/rust/rust-1.40.0-r666.ebuild b/dev-lang/rust/rust-1.41.0-r666.ebuild |
168 |
similarity index 99% |
169 |
rename from dev-lang/rust/rust-1.40.0-r666.ebuild |
170 |
rename to dev-lang/rust/rust-1.41.0-r666.ebuild |
171 |
index 6732c4d..982582d 100644 |
172 |
--- a/dev-lang/rust/rust-1.40.0-r666.ebuild |
173 |
+++ b/dev-lang/rust/rust-1.41.0-r666.ebuild |
174 |
@@ -68,7 +68,7 @@ PDEPEND="" |
175 |
REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )" |
176 |
|
177 |
PATCHES=( |
178 |
- "${FILESDIR}"/1.36.0-libressl.patch |
179 |
+ "${FILESDIR}"/1.40.0-add-soname.patch |
180 |
) |
181 |
|
182 |
S="${WORKDIR}/${MY_P}-src" |
183 |
|
184 |
diff --git a/dev-rust/qt_generator/qt_generator-9999.ebuild b/dev-rust/qt_generator/qt_generator-9999.ebuild |
185 |
index 468d03a..a20733c 100644 |
186 |
--- a/dev-rust/qt_generator/qt_generator-9999.ebuild |
187 |
+++ b/dev-rust/qt_generator/qt_generator-9999.ebuild |
188 |
@@ -1,4 +1,4 @@ |
189 |
-# Copyright 1999-2018 Gentoo Foundation |
190 |
+# Copyright 1999-2020 Gentoo Foundation |
191 |
# Distributed under the terms of the GNU General Public License v2 |
192 |
|
193 |
EAPI=6 |
194 |
@@ -21,7 +21,6 @@ IUSE="" |
195 |
CDEPEND="dev-db/sqlite" |
196 |
DEPEND="${CDEPEND} |
197 |
virtual/rust |
198 |
-|| ( virtual/cargo dev-util/cargo-bin ) |
199 |
" |
200 |
RDEPEND="${CDEPEND} |
201 |
dev-qt/qtchooser |
202 |
|
203 |
diff --git a/dev-rust/rust-bindgen/rust-bindgen-9999.ebuild b/dev-rust/rust-bindgen/rust-bindgen-9999.ebuild |
204 |
index bd499be..491f423 100644 |
205 |
--- a/dev-rust/rust-bindgen/rust-bindgen-9999.ebuild |
206 |
+++ b/dev-rust/rust-bindgen/rust-bindgen-9999.ebuild |
207 |
@@ -1,4 +1,4 @@ |
208 |
-# Copyright 1999-2018 Gentoo Foundation |
209 |
+# Copyright 1999-2020 Gentoo Foundation |
210 |
# Distributed under the terms of the GNU General Public License v2 |
211 |
|
212 |
EAPI=5 |
213 |
@@ -17,7 +17,6 @@ IUSE="" |
214 |
EGIT_REPO_URI="https://github.com/servo/rust-bindgen.git" |
215 |
|
216 |
DEPEND=">=virtual/rust-999 |
217 |
- virtual/cargo |
218 |
>=sys-devel/clang-3.4.2-r100:* |
219 |
" |
220 |
RDEPEND="${DEPEND}" |
221 |
|
222 |
diff --git a/dev-util/SolidOak/SolidOak-9999.ebuild b/dev-util/SolidOak/SolidOak-9999.ebuild |
223 |
index 70c356b..54b122c 100644 |
224 |
--- a/dev-util/SolidOak/SolidOak-9999.ebuild |
225 |
+++ b/dev-util/SolidOak/SolidOak-9999.ebuild |
226 |
@@ -1,4 +1,4 @@ |
227 |
-# Copyright 1999-2018 Gentoo Foundation |
228 |
+# Copyright 1999-2020 Gentoo Foundation |
229 |
# Distributed under the terms of the GNU General Public License v2 |
230 |
|
231 |
EAPI=6 |
232 |
@@ -23,8 +23,7 @@ RDEPEND="virtual/rust |
233 |
app-editors/neovim |
234 |
>=x11-libs/gtk+-3.10 |
235 |
" |
236 |
-DEPEND="${DEPEND} |
237 |
- virtual/cargo" |
238 |
+DEPEND="${DEPEND}" |
239 |
|
240 |
src_compile() { |
241 |
cargo build -j$(makeopts_jobs) --release || die |
242 |
|
243 |
diff --git a/dev-util/racer/racer-9999.ebuild b/dev-util/racer/racer-9999.ebuild |
244 |
index b3d2e62..2035e02 100644 |
245 |
--- a/dev-util/racer/racer-9999.ebuild |
246 |
+++ b/dev-util/racer/racer-9999.ebuild |
247 |
@@ -17,8 +17,7 @@ IUSE="" |
248 |
EGIT_REPO_URI="https://github.com/phildawes/racer" |
249 |
|
250 |
COMMON_DEPEND="virtual/rust:*" |
251 |
-DEPEND="${COMMON_DEPEND} |
252 |
- virtual/cargo" |
253 |
+DEPEND="${COMMON_DEPEND}" |
254 |
RDEPEND="${COMMON_DEPEND}" |
255 |
|
256 |
src_compile() { |
257 |
|
258 |
diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass |
259 |
index b1f2071..4e874f0 100644 |
260 |
--- a/eclass/cargo.eclass |
261 |
+++ b/eclass/cargo.eclass |
262 |
@@ -1,4 +1,4 @@ |
263 |
-# Copyright 1999-2018 Gentoo Foundation |
264 |
+# Copyright 1999-2020 Gentoo Foundation |
265 |
# Distributed under the terms of the GNU General Public License v2 |
266 |
|
267 |
# @ECLASS: cargo.eclass |
268 |
@@ -13,7 +13,7 @@ if [[ -z ${_CARGO_ECLASS} ]]; then |
269 |
_CARGO_ECLASS=1 |
270 |
|
271 |
CARGO_DEPEND="" |
272 |
-[[ ${CATEGORY}/${PN} != dev-util/cargo ]] && CARGO_DEPEND="virtual/cargo" |
273 |
+[[ ${CATEGORY}/${PN} != dev-lang/rust ]] && CARGO_DEPEND="virtual/rust" |
274 |
|
275 |
: ${CARGO_FETCH_CRATES:=not} |
276 |
|
277 |
|
278 |
diff --git a/virtual/cargo/cargo-1.40.0-r666.ebuild b/virtual/cargo/cargo-1.40.0-r666.ebuild |
279 |
deleted file mode 100644 |
280 |
index fb4010e..0000000 |
281 |
--- a/virtual/cargo/cargo-1.40.0-r666.ebuild |
282 |
+++ /dev/null |
283 |
@@ -1,17 +0,0 @@ |
284 |
-# Copyright 1999-2019 Gentoo Authors |
285 |
-# Distributed under the terms of the GNU General Public License v2 |
286 |
- |
287 |
-EAPI=7 |
288 |
- |
289 |
-DESCRIPTION="Package manager for Rust" |
290 |
-HOMEPAGE="" |
291 |
-SRC_URI="" |
292 |
- |
293 |
-LICENSE="" |
294 |
-SLOT="0" |
295 |
-KEYWORDS="~amd64 ~arm64 ~x86" |
296 |
- |
297 |
-RDEPEND="|| ( |
298 |
- =dev-lang/rust-${PVR}* |
299 |
- =dev-lang/rust-bin-${PV}* |
300 |
- )" |
301 |
|
302 |
diff --git a/virtual/cargo/cargo-9999.ebuild b/virtual/cargo/cargo-9999.ebuild |
303 |
deleted file mode 100644 |
304 |
index 5048e80..0000000 |
305 |
--- a/virtual/cargo/cargo-9999.ebuild |
306 |
+++ /dev/null |
307 |
@@ -1,17 +0,0 @@ |
308 |
-# Copyright 1999-2018 Gentoo Foundation |
309 |
-# Distributed under the terms of the GNU General Public License v2 |
310 |
- |
311 |
-EAPI=7 |
312 |
- |
313 |
-DESCRIPTION="Package manager for Rust" |
314 |
-HOMEPAGE="" |
315 |
-SRC_URI="" |
316 |
- |
317 |
-LICENSE="" |
318 |
-SLOT="0" |
319 |
-KEYWORDS="" |
320 |
- |
321 |
-RDEPEND="|| ( |
322 |
- ~dev-lang/rust-${PV} |
323 |
- ~dev-lang/rust-bin-${PV} |
324 |
- )" |
325 |
|
326 |
diff --git a/virtual/cargo/metadata.xml b/virtual/cargo/metadata.xml |
327 |
deleted file mode 100644 |
328 |
index 85cf4eb..0000000 |
329 |
--- a/virtual/cargo/metadata.xml |
330 |
+++ /dev/null |
331 |
@@ -1,8 +0,0 @@ |
332 |
-<?xml version="1.0" encoding="UTF-8"?> |
333 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
334 |
-<pkgmetadata> |
335 |
- <maintainer type="project"> |
336 |
- <email>rust@g.o</email> |
337 |
- <name>Rust Project</name> |
338 |
- </maintainer> |
339 |
-</pkgmetadata> |
340 |
|
341 |
diff --git a/virtual/rust/rust-1.40.0-r666.ebuild b/virtual/rust/rust-1.41.0-r666.ebuild |
342 |
similarity index 87% |
343 |
rename from virtual/rust/rust-1.40.0-r666.ebuild |
344 |
rename to virtual/rust/rust-1.41.0-r666.ebuild |
345 |
index c0a4c99..a16b9a6 100644 |
346 |
--- a/virtual/rust/rust-1.40.0-r666.ebuild |
347 |
+++ b/virtual/rust/rust-1.41.0-r666.ebuild |
348 |
@@ -1,4 +1,4 @@ |
349 |
-# Copyright 1999-2019 Gentoo Foundation |
350 |
+# Copyright 1999-2020 Gentoo Foundation |
351 |
# Distributed under the terms of the GNU General Public License v2 |
352 |
|
353 |
EAPI=7 |