From 5cff20a2efe9e112938fe8898f5097f4f686c123 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 15 Dec 2011 20:26:03 +0000 Subject: [PATCH] Fix cross-compile issues with ospeed offset too. Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64 --- net-misc/socat/ChangeLog | 7 +++- net-misc/socat/Manifest | 12 +++---- .../files/socat-1.7.1.3-cross-compile.patch | 35 +++++++++++++++++++ .../files/socat-1.7.2.0-cross-compile.patch | 35 +++++++++++++++++++ net-misc/whois/Manifest | 18 ++++------ 5 files changed, 89 insertions(+), 18 deletions(-) diff --git a/net-misc/socat/ChangeLog b/net-misc/socat/ChangeLog index c673849abba8..7e5544816fd4 100644 --- a/net-misc/socat/ChangeLog +++ b/net-misc/socat/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/socat # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/ChangeLog,v 1.87 2011/12/15 19:33:19 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/ChangeLog,v 1.88 2011/12/15 20:26:03 vapier Exp $ + + 15 Dec 2011; Mike Frysinger + files/socat-1.7.1.3-cross-compile.patch, + files/socat-1.7.2.0-cross-compile.patch: + Fix cross-compile issues with ospeed offset too. 15 Dec 2011; Mike Frysinger socat-1.7.1.3.ebuild, +files/socat-1.7.1.3-cross-compile.patch, socat-1.7.2.0.ebuild, diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest index f1c90b778630..437ace1a4ba1 100644 --- a/net-misc/socat/Manifest +++ b/net-misc/socat/Manifest @@ -1,20 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX socat-1.7.1.3-cross-compile.patch 1170 RMD160 41daba19fbc509ba0ca2c462ae71510ddcc9dcf9 SHA1 a84250e7c313ddfe5418ac881724fdfc3b9b0bd5 SHA256 68ce5178800798cc8b90587a82f136ce5abde6d11a3f239846c9689d85db7e39 -AUX socat-1.7.2.0-cross-compile.patch 1126 RMD160 92692c30166f25c84476e25d2c2e9709dc986816 SHA1 9dc12e378edb08367194aa0398b1a6eedfee3f31 SHA256 b7f586ecc06639f6b6a982d3eb7d44fcca013eb4c2ed4c3b6347357aa79f5777 +AUX socat-1.7.1.3-cross-compile.patch 2365 RMD160 e431b1e5c3c8af19523f60763494519a062e4457 SHA1 c06f30b43b1917dc286bad67eec0fb6a7ff6e24f SHA256 6581c3b2c7af704e0e445853962cd57270b9ab509432c4345eb767695355f22d +AUX socat-1.7.2.0-cross-compile.patch 2321 RMD160 4e900f49c5905b55d6756cfc7faa03dac7164920 SHA1 09204a144b46b8534683d37dc9d831fe21bdc33e SHA256 bd20d76cafd71308e3f89d05fc4292964241c5a53cf0eecc5a4e0cb7414da8c5 DIST socat-1.7.1.3.tar.bz2 426350 RMD160 091a2fe0206c9f24e6427e7476e78ac53307ffeb SHA1 60ecce880ac424e03b37ae297242b303a2afce39 SHA256 2a14f42e2166e1a9d5413cc7f743f2f3b16e58427c848cd711688568219b7c42 DIST socat-1.7.2.0.tar.bz2 432031 RMD160 d885323b57d08e7a85bc36bda82f3ba303a8ed14 SHA1 7ce5e71c7ac8b101ac15593eda10da3cfa0afbac SHA256 59b3bde927c14fbc3f9e42c782971710da8a89bbf46f7531f09a681754041802 DIST socat-2.0.0-b4.tar.bz2 459843 RMD160 d9c8cace1ecad8c29a31c71ea205dbb297c8a3ed SHA1 3903e0b1d8bef59e05fbbfa45f25d06a80a49eee SHA256 1272133a0b2aef0045f1b71a2f49194e6fbc37ed5c0d0c683d98b52740dbcd9c EBUILD socat-1.7.1.3.ebuild 1304 RMD160 3a06d412387fe3141291385c839cee54f280c3df SHA1 2b8d7ef21a86eed5965104189e1b7118391a0ac4 SHA256 72ffffdc9e55e5606cadacc8d73219375a57e7d592de6df0c4b689cc7261f659 EBUILD socat-1.7.2.0.ebuild 1256 RMD160 5fdb9568f9f13ee0029ca6e213b1928853b7e3a3 SHA1 0103b7f1139609fff8d3c5ba9db9643293acb1ce SHA256 ab3854da7ba1a12a696aa086c266963916b588ee0bd56d0b3d9f5046536b9404 EBUILD socat-2.0.0_beta4.ebuild 1219 RMD160 e2a5ed0c93c11b68acb3226709b88687c68f46c2 SHA1 ad4a24998a8271578fbe89e740fb502bd7715d08 SHA256 19daf6e6a80613c70ce0b1b54fb9912542ae51a6c98baaed2a50057ed8b355b8 -MISC ChangeLog 11476 RMD160 670891863ddec23be5784395237502a1e6d1990e SHA1 8ae4a123ac9311692412570229877566082da6f6 SHA256 026d1bb7043a9bea88ed612d9955d5243452d11653cbef23ec5f3320fc62b1fe +MISC ChangeLog 11664 RMD160 e6104bd9a15e2b6fabf1e53e62b7d056c19d4ad9 SHA1 30414a5322d77510b358f9a1b873a742494b569a SHA256 2d557d543412525ae974579d03b2a42400c478cdbecad4453fc9533a79365fc1 MISC metadata.xml 160 RMD160 2738573ec519cbef4b293bc132f7dd9d02291137 SHA1 29b8b234e0f3a475b50bd4df1ef8b4e5749823ce SHA256 39e232fc7ec88ca0b077cb3950cb39d15cd990842b88d5bfe14f02f34d72f37b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk7qS4YACgkQaC/OocHi7JZJUAD+JlI+3oTlGIZM5EV0yLxmtLVp -mRyc+VEEkYPe2G+fQaMBAKBHQ6cTC3BOOM5nuY5CI3b7gwxJ229mx9JEwjT7gfzP -=zoTZ +iF4EAREIAAYFAk7qV+IACgkQaC/OocHi7JZJOgD/bWbXMtEoDdsFEzcuD7uYYwf6 +jL2W/2Ep2Cg935oSUrQA/3P7wWVQPsrzkZsBEnVPgV8dpAC+taFITHQVqwPtw2Cn +=dlE1 -----END PGP SIGNATURE----- diff --git a/net-misc/socat/files/socat-1.7.1.3-cross-compile.patch b/net-misc/socat/files/socat-1.7.1.3-cross-compile.patch index f4f391626612..a86e745b6dbb 100644 --- a/net-misc/socat/files/socat-1.7.1.3-cross-compile.patch +++ b/net-misc/socat/files/socat-1.7.1.3-cross-compile.patch @@ -43,3 +43,38 @@ index 45cb88a..15c4d7d 100644 -- 1.7.6.1 +From a3e300ce4cde7e326ecffe1035017874d85d796e Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Thu, 15 Dec 2011 15:00:37 -0500 +Subject: [PATCH] let compiler handle ISPEED_OFFSET when cross-compiling + +While I can't devise a compile-only test that'll calculate the offset +(which doesn't involve inspecting the compiled object file), at least +gcc is good enough with a offsetof()-like value. So use that in the +cross-compile fallback case. + +Signed-off-by: Mike Frysinger +--- + configure.in | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +index 15c4d7d..87e1029 100644 +--- a/configure.in ++++ b/configure.in +@@ -918,11 +918,11 @@ AC_CACHE_VAL(ac_cv_ispeed_offset, + ], + [ac_cv_ispeed_offset=`cat $conftestspeedoff`], + [ac_cv_ispeed_offset=-1], +- [ac_cv_ispeed_offset=-1] #! ++ [ac_cv_ispeed_offset="((unsigned long)&((struct termios *)0)->c_ispeed / sizeof(speed_t))"] #! + )]) + LIBS="$LIBS1" + AC_MSG_RESULT($ac_cv_ispeed_offset) +- if test $ac_cv_ispeed_offset -ge 0; then ++ if test "$ac_cv_ispeed_offset" != "-1"; then + AC_DEFINE_UNQUOTED(ISPEED_OFFSET, $ac_cv_ispeed_offset) + fi + fi +-- +1.7.6.1 diff --git a/net-misc/socat/files/socat-1.7.2.0-cross-compile.patch b/net-misc/socat/files/socat-1.7.2.0-cross-compile.patch index 3e854c31958f..4cab5bca1e2c 100644 --- a/net-misc/socat/files/socat-1.7.2.0-cross-compile.patch +++ b/net-misc/socat/files/socat-1.7.2.0-cross-compile.patch @@ -43,3 +43,38 @@ index 45cb88a..15c4d7d 100644 -- 1.7.6.1 +From a3e300ce4cde7e326ecffe1035017874d85d796e Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Thu, 15 Dec 2011 15:00:37 -0500 +Subject: [PATCH] let compiler handle ISPEED_OFFSET when cross-compiling + +While I can't devise a compile-only test that'll calculate the offset +(which doesn't involve inspecting the compiled object file), at least +gcc is good enough with a offsetof()-like value. So use that in the +cross-compile fallback case. + +Signed-off-by: Mike Frysinger +--- + configure.in | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +index 15c4d7d..87e1029 100644 +--- a/configure.in ++++ b/configure.in +@@ -918,11 +918,11 @@ AC_CACHE_VAL(ac_cv_ispeed_offset, + ], + [ac_cv_ispeed_offset=`cat $conftestspeedoff`], + [ac_cv_ispeed_offset=-1], +- [ac_cv_ispeed_offset=-1] #! ++ [ac_cv_ispeed_offset="((unsigned long)&((struct termios *)0)->c_ispeed / sizeof(speed_t))"] #! + )]) + LIBS="$LIBS1" + AC_MSG_RESULT($ac_cv_ispeed_offset) +- if test $ac_cv_ispeed_offset -ge 0; then ++ if test "$ac_cv_ispeed_offset" != "-1"; then + AC_DEFINE_UNQUOTED(ISPEED_OFFSET, $ac_cv_ispeed_offset) + fi + fi +-- +1.7.6.1 diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest index 3cedd0ca6630..874e6e5b724d 100644 --- a/net-misc/whois/Manifest +++ b/net-misc/whois/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA1 AUX whois-4.7.2-config-file.patch 198 RMD160 874ed86cab594d8fa69ee9599e2a1c3b52c611c7 SHA1 83b2db998f9ee90398138029816952f19a91634a SHA256 b7ad9cb716a8dbd1bb64dc80c1d4460c4a5661ba9420b771f9323c4337dbbea2 DIST whois_5.0.10.tar.gz 81226 RMD160 fe555db6a5cb0e2ad8160f869d321ab731340623 SHA1 dd13a264db221fc5d75f6fede49a873f2819aa3b SHA256 7a0080d76da2384ff40611b14a41be3e10f59c6fcd5783225c33a4401e895c03 @@ -13,17 +13,13 @@ EBUILD whois-5.0.11.ebuild 1342 RMD160 987024feda0adc0b5caa89a55cae86de030e2a33 EBUILD whois-5.0.12.ebuild 1351 RMD160 cf32a7091aa876553f925edb27440ae519a2e182 SHA1 6a103b17a8e5677e6c3ef79b51880e322bf7c56f SHA256 e7c07c8c380d562c29828dd7dccc37d66aeca8d9e03bde7ba0f5c6bfa807fb5f EBUILD whois-5.0.13.ebuild 1354 RMD160 bde51d6c0613b584cf8ad5c5ed0f75d1b6fd7596 SHA1 197fa22144905ab4cd8251064b3dd98d0c37954c SHA256 1aba553c607f7c03c7868de61f7c717e4baf0107c90cf69303de06bc1c18df66 EBUILD whois-5.0.5.ebuild 1170 RMD160 9170cb1417c7d00280f29f0b669598bcc3a4688a SHA1 cdb1af7bfff2cfcefbda0899b7cd275577c764c1 SHA256 09e1ed19a1a47e3bae61e78d8dac729868c92a3944294518f1384696d86348ed -EBUILD whois-5.0.8.ebuild 1339 RMD160 0f3f732f0c9c179a069bcad8a188f34c09e31ffc SHA1 58d04033d308142a52d0256d45cd1b04654e71ff SHA256 6b7552a56907950b9f76f945123c791ae3232466a393aa77ca3336e988e47239 -MISC ChangeLog 20428 RMD160 70bbc30e87f18a5059b43bda279a90f294ebae81 SHA1 e057410ad7297e41e8ce5176691b92f06ddb43ff SHA256 ff9af9e63dd17513fc845f04bcacae7399cfddf14f099511862d41764a2fc1ee +EBUILD whois-5.0.8.ebuild 1489 RMD160 1e6c4775a78a66c673ec5ecc23780012e864402a SHA1 0e00ec64386214ebfda1c173ba80fd7889515f6f SHA256 502ce0b73e811b116714b75fc48e1a2ba0e90800f9a6c777ef94da8402d35a9f +MISC ChangeLog 20599 RMD160 3c3aaae76733b01c03df211dbd7b30f054432df8 SHA1 2beb715a4a587f689657fc794b16bfd5d719cb4c SHA256 d783515e2707ecb7844efb4a67aa7cfd658fb177ea14b9046acf047007762eb1 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.18 (Darwin) -iQEcBAEBCgAGBQJO3JC4AAoJEEqz6FtPBkyj4eMIAK+36fghv1pJPsjY6+mS4pKZ -cLpNsji3nLBwnsNBzABLfm7p5h3YlXpIdUvoudfX6mIbvyGs4/9bs/pzQH82+WYG -NiJJ3BbKlSqSp0JGSctfahPR1wSAJBDUoXeJh4iVhK+2uaF/AmWGHPHycCwA5SgJ -nVU7+E1eirSnA35a3Ae2eg8tisMe9P0OHjQ6bm+rP6kPmEPwNmgnInfMU3bEAJmv -rgBmXsI4TVw3ykYex6oF+xC8LXas+IHIF76FdpZVZuBoe7Mx0Ka2jrnO3sXiEkDr -IebUTHIuPG2u7ZLWaKX8E927JBIwn+uejRh4mITW6jH9akiD5pJn8oTqgAOy0YA= -=6mze +iEYEARECAAYFAk7qWBgACgkQX3X2B8XHTokbvQCfeIsUqfsObRf9sr/RbBp9+D9J +49IAoJs62t69dGwcwtjYlWMvfLjikCc6 +=SNBI -----END PGP SIGNATURE----- -- 2.26.2