[patch] Fix 'make depend' with non-/gcc$/ compilers

openssl-makedepend.patch (text/plain), 5.64 KB, created by Michał Górny on 2014-08-13 19:44:01 UTC

Index: Manifest
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/openssl/Manifest,v
retrieving revision 1.718
diff -u -B -r1.718 Manifest
--- Manifest	13 Aug 2014 15:22:47 -0000	1.718
+++ Manifest	13 Aug 2014 19:39:44 -0000
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX gentoo.config-0.9.8 4246 SHA256 a38f4a9af890303d764b04eab64dd618b60599762d3ab3286b667c1ee38d2b75 SHA512 04ca7a9cb42762060216cf2696003d1087b1504e7f79278b0509b6a03da0bba0a13cdbe9fd713754379e09dc6bf0e7354fc1bcbaf8a7d75f4a400fe6c8868ab7 WHIRLPOOL 3d5524dda714eec5236b7d15e36c0633d75c750ba5555df2c5da59781cd6d0005f5810dad001758635def1894f27f83fde45e80f51c5467603c54a2b1389e22a
 AUX gentoo.config-1.0.0 4748 SHA256 67ae024ebb87a8236a358a081f2d9b038eef2d0f432705d05063274e7af28b4e SHA512 c68b7eb3d07a3b619f6c3e5f508e594efe2991aef91d8904019f967c20a7e9e9604d8fce1271b5bc247856411e81a800eed7710da46645b9d5d9e5cb184ab99b WHIRLPOOL a849c1ea7d7d0dfeac675636e801dd050c66866f6327e6619f233ede0fc0e59f5f2f554f7812a0c33bd40d76a7ba85ca3aab0a00f964e971de97f5af11a527bc
 AUX gentoo.config-1.0.1 4980 SHA256 e7dd01bc76f0262c91b0a3a56bbf0675feedd6d5c6e61f8dcb5e3c538b113424 SHA512 1900cf603954dc4213d84d2f1f10fb74310dd8134f9c1bcf5f633a45e2ab27398f51656ac2f4165f86be78b19283374689766e3a5d7b43e16afeff884f31a1a0 WHIRLPOOL 2fd9eb3e46a262509f46f5ee6cef963e0bf32ff2c2dc3acb2fdf890326b4db801c0c90814df6f206fc6bc8aaf1184eb68289beb33e36dcebd890bb9e2855545a
@@ -43,14 +40,7 @@
 EBUILD openssl-1.0.1h-r1.ebuild 8126 SHA256 b9430778c89405661f336d28f1d0198852132267dc3c62b642f25e233d1f5366 SHA512 9f93abe94220051b540aaabd629d2da3672236e16b9bdaaaa031ec4da3b4546304d78d1cb7dfba622ed497e3c620105a3e52d18c26e00c0a62c252cda8700999 WHIRLPOOL fc00ca6882d0df73328ded57fe8d452c561cb2c4729905cbf7e1f5045d8236d2b5a6dcc100f73531b4a6ee4fd953dfa81734725ec6d5a1824ff0d4a80c1ea89f
 EBUILD openssl-1.0.1h-r2.ebuild 8308 SHA256 d1cbfed1a383dc3e0823e080559221038fb4b654dc73dfa83e3cc6b9a220138a SHA512 05892fea68242321b1754f6170e2252f37721a43b0b2c7a5071cdc12771541828e4d5a697aa5088e585ca6b4ae4138a04d7b19a3257af26a789f492018616a16 WHIRLPOOL 9e3cb70ca76e73fb570f05e79dfbb2938b3bd8bcbae17fbe039c38caed61a0a378fca1fa50770ae611e30e89c59c5854f53b243d48ef06167557dc3b726777c8
 EBUILD openssl-1.0.1h-r3.ebuild 8532 SHA256 69bc9f52d2b808af643f07bbcaf3b07e5bda512191d5e274644d4a16b05181d9 SHA512 00f6af15abe99b9ecb90ed5971e312f7a1dc7751d001a80afaec2bbc1ea6379d803adced727fdbd4298d6aa1a72ae0e752d48946816927a4ccbadc71a41ed447 WHIRLPOOL 7094c824ae44ff7e49f5d76e6e98af728af5e58a88c64cdf333bbd91d2de07599ebab1c6c02e4b5f57581fa11715353c5769ca84a9d3d0308f8ad0df3ef634a4
-EBUILD openssl-1.0.1i.ebuild 8307 SHA256 cc794dfeb2f200d0dc2e391a7a3671ea5010addb840bf9e247fa66e78c5e958b SHA512 a7db934a9e97ec65544cca7e9d7ed11b799d4c3688568d86aff100830df6a519fe933726145a4581b9e8fe73e8c783d0b650046cace871a930acc45529a6b9da WHIRLPOOL 413c5769224d407898a408ce7d0206707d95e61b17f0565969e4ea31e37445ba803ae72b556c6b9bd271873749d66955dc14298c8c7d7d11594cae9a08321c2f
+EBUILD openssl-1.0.1i.ebuild 8756 SHA256 75bdd7b975ce63b72fe8abaab043abf416c371d4bd9896b6cdc17a02a4abedbb SHA512 8476587f3b5b479b74d46b2a3849b1926c00085e17e42c3d06792af2fe51f017817dcbafbdaeda9b798a7f2432193de1934a4e43829ae292f99bc0873c9f147d WHIRLPOOL 49e57bded6965c8f545e3fe8bcd711db93c1fc98a1c60046b9fc76da0f725344aef4fafead2a095ead54d75b6d23b1b7cb0e1db44f7189e5b49f8839df41dfdc
 EBUILD openssl-1.0.2_beta2.ebuild 8286 SHA256 130ed1856f4d56b28b4d651863e2cbefda59afa13487f4dcf0700b82c050a3ee SHA512 7a23c18cf59370d456e0d0528995aa3372fdf20204172ba5aeea60857812575413d66cb9ab0b572dc07f92db759013ec11da8e402cc8668cd7d5e2789ad2e7ad WHIRLPOOL 14880c0164b7c2efa3ac15a1c0e7b8d2da3ef90454f2a9016fc3e38cd4e6179206e0bc1a5bc4bdbc0b0560fb6673dffabbbd5b061088f8acbbdf70e0b2c79b0c
 MISC ChangeLog 89334 SHA256 87c58220e8a31f1ae3616f71fffa8106a9227651935b5d2ba4701e03514108ea SHA512 fa07b68227e44093ae9fdca382ccfc32d3613f20e278ae2b6418e8c26ffc0df66f05482308168cb8c10619015310362c7aa5248eab70acc5d8bd7162088b6f64 WHIRLPOOL 9ff2f27ed6131e0115f6a8de98e912877f5c7d6b3ba522f89b4d8bb0b687bba47cf93c7e75c322be663c0bd2bed0df360fc3e5264ab570a95f5d72babf7c3b07
 MISC metadata.xml 562 SHA256 5c61e2a07ffdb4ba157e0add7f84ff74458c890092d5e6980fd936dfdb457c34 SHA512 f83769af7ffd223923b72a62db27cbc80ca31925b95b720845b6bedd2a9b52837f70f9da93ee43e272ceb3c8424a8c9f35a31ebd5274bc04c91cd63ace1af844 WHIRLPOOL d98f2af2cf3e13c09ad526a2fe06fe8ef02e1db20fd4e3843f1793a97c9ae6a2897308c84038a9a37d6d68fadc7af6d913b980f4f079dac36ea3860a33aca8c2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlPrgsMACgkQkKaRLQcq0GJr8wCfaVyqKtKhJsVcSflI4H8Rfmkn
-4VcAmgNwhHUUdM6zuqjWIYNnGHUB8yDp
-=5oyv
------END PGP SIGNATURE-----
Index: openssl-1.0.1i.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1i.ebuild,v
retrieving revision 1.7
diff -u -B -r1.7 openssl-1.0.1i.ebuild
--- openssl-1.0.1i.ebuild	13 Aug 2014 15:21:57 -0000	1.7
+++ openssl-1.0.1i.ebuild	13 Aug 2014 19:39:44 -0000
@@ -81,6 +81,16 @@
 	# show the actual commands in the log
 	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
 
+	# since we're forcing $(CC) as makedep anyway, just fix
+	# the conditional as always-on
+	# helps clang (#417795), and versioned gcc (#499818)
+	sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
 	# allow openssl to be cross-compiled
 	cp "${FILESDIR}"/gentoo.config-1.0.1 gentoo.config || die
 	chmod a+rx gentoo.config