From 0bc21641b2bc928b35a1ba400b2eb8e6d5ef6cd7 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 15 Dec 2011 19:33:19 +0000 Subject: [PATCH] Fix cross-compilation with shift defines. Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64 --- net-misc/socat/ChangeLog | 7 ++- net-misc/socat/Manifest | 20 ++++----- .../files/socat-1.7.1.3-cross-compile.patch | 45 +++++++++++++++++++ .../files/socat-1.7.2.0-cross-compile.patch | 45 +++++++++++++++++++ net-misc/socat/socat-1.7.1.3.ebuild | 11 +++-- net-misc/socat/socat-1.7.2.0.ebuild | 9 +++- 6 files changed, 120 insertions(+), 17 deletions(-) create mode 100644 net-misc/socat/files/socat-1.7.1.3-cross-compile.patch create mode 100644 net-misc/socat/files/socat-1.7.2.0-cross-compile.patch diff --git a/net-misc/socat/ChangeLog b/net-misc/socat/ChangeLog index 44c8ef6bf67f..c673849abba8 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.86 2011/12/06 04:16:10 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/ChangeLog,v 1.87 2011/12/15 19:33:19 vapier Exp $ + + 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, + +files/socat-1.7.2.0-cross-compile.patch: + Fix cross-compilation with shift defines. *socat-1.7.2.0 (06 Dec 2011) diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest index ea3274786f95..f1c90b778630 100644 --- a/net-misc/socat/Manifest +++ b/net-misc/socat/Manifest @@ -1,22 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +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 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 1216 RMD160 4669356a9cad43a9f71bf3d0f515bb3cacc9226f SHA1 747ade5a483e6717f73354c2fdda9add4f9a97eb SHA256 a4243c3a2bb8b119c4835e7d35cac564ac4543b358b30e9bd3f1db02622c8773 -EBUILD socat-1.7.2.0.ebuild 1170 RMD160 4f21ef139a86498ad1b7653b6db22a7fd0672591 SHA1 989606f3be88d3767a7274a8f6250ee0d601d2b8 SHA256 33ac7c714ca6261cba4b8e3033bd721f26c9f6d0a69e51dd6277a5bb3411047f +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 11252 RMD160 f42d40c3db05ccfe4e137cf95b4c474ff1b3e8d9 SHA1 630b40242658d22f9f2ac9e222e9110e6df41d86 SHA256 5ad849a003e27947efedc48c53eab1db67559f5185f4dab2cc9c5b2e8f3517b0 +MISC ChangeLog 11476 RMD160 670891863ddec23be5784395237502a1e6d1990e SHA1 8ae4a123ac9311692412570229877566082da6f6 SHA256 026d1bb7043a9bea88ed612d9955d5243452d11653cbef23ec5f3320fc62b1fe MISC metadata.xml 160 RMD160 2738573ec519cbef4b293bc132f7dd9d02291137 SHA1 29b8b234e0f3a475b50bd4df1ef8b4e5749823ce SHA256 39e232fc7ec88ca0b077cb3950cb39d15cd990842b88d5bfe14f02f34d72f37b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBCgAGBQJO3ZcWAAoJEEqz6FtPBkyjM/YH/j5rOZH2QC27XKuiosV0Spfa -z6tu8yWqnnzjk2FNpzkcqSvCT37MtikzbnHBn5s/IsutNgcuayi/bdd/Ak5XQPlx -XCdaB/9qwQUi1133ITmHVnAHsWny3MeBlDTe8c1wrrVpENHfC+6hxCs353T0saTp -OdJn3YySnxjx/eLhPWbF+nrYKv7fqwyGDfI0ZmytJ+BJpyHeD01Z8lbjqhL3+/RZ -+EgzJgW7ZxFDXbCsiVKpIeFHLwttYadaFOSogRzfmyzo1yCBcD1IPgU0/kXQF0zK -CLTWjDa5G529s/hvZn8xaiI8KkeyO3E04ncIfqrhC1+LlYCHp3oAx43WHrQCT6E= -=2Nzn +iF4EAREIAAYFAk7qS4YACgkQaC/OocHi7JZJUAD+JlI+3oTlGIZM5EV0yLxmtLVp +mRyc+VEEkYPe2G+fQaMBAKBHQ6cTC3BOOM5nuY5CI3b7gwxJ229mx9JEwjT7gfzP +=zoTZ -----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 new file mode 100644 index 000000000000..f4f391626612 --- /dev/null +++ b/net-misc/socat/files/socat-1.7.1.3-cross-compile.patch @@ -0,0 +1,45 @@ +already sent upstream + +From ceff276b495884e0b6904814f2bcc93dc98da132 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Thu, 15 Dec 2011 14:16:50 -0500 +Subject: [PATCH] add compile-only tests for shift sizes + +We can take advantage of array limits to calculate the shift size +required for constants. If we compile to a value we don't like, +then the array limit will be -1 and trigger a compile error. + +Signed-off-by: Mike Frysinger +--- + configure.in | 15 ++++++++++++++- + 1 files changed, 14 insertions(+), 1 deletions(-) + +diff --git a/configure.in b/configure.in +index 45cb88a..15c4d7d 100644 +--- a/configure.in ++++ b/configure.in +@@ -1331,7 +1331,20 @@ AC_CACHE_CHECK(shift offset of $1, $2, + ], + [$2=`cat $conftestoffset`], + [$2=-1], +- [AC_MSG_RESULT(please determine $1_SHIFT manually)] ++ [ ++ i=0 ++ $2=-1 ++ while test $i -lt 64 -a $$2 -eq -1; do ++ AC_TRY_COMPILE([ ++ #include ++ #include ++ #include ++ #include ++ ],[char c[(($1 >> $i) & 1) - 1];], ++ [$2=$i]) ++ i=$(( $i + 1 )) ++ done ++ ] + ) + LIBS="$LIBS1"]) + AC_DEFINE_UNQUOTED($1_SHIFT, ${$2}) +-- +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 new file mode 100644 index 000000000000..3e854c31958f --- /dev/null +++ b/net-misc/socat/files/socat-1.7.2.0-cross-compile.patch @@ -0,0 +1,45 @@ +already sent upstream + +From ceff276b495884e0b6904814f2bcc93dc98da132 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Thu, 15 Dec 2011 14:16:50 -0500 +Subject: [PATCH] add compile-only tests for shift sizes + +We can take advantage of array limits to calculate the shift size +required for constants. If we compile to a value we don't like, +then the array limit will be -1 and trigger a compile error. + +Signed-off-by: Mike Frysinger +--- + configure.in | 15 ++++++++++++++- + 1 files changed, 14 insertions(+), 1 deletions(-) + +diff --git a/configure.in b/configure.in +index 45cb88a..15c4d7d 100644 +--- a/configure.in ++++ b/configure.in +@@ -1331,7 +1331,20 @@ AC_CACHE_CHECK(shift offset of $1, $2, + ], + [$2=`cat $conftestoffset`], + [$2=-1], +- [$2=-1] ++ [ ++ i=0 ++ $2=-1 ++ while test $i -lt 64 -a $$2 -eq -1; do ++ AC_TRY_COMPILE([ ++ #include ++ #include ++ #include ++ #include ++ ],[char c[(($1 >> $i) & 1) - 1];], ++ [$2=$i]) ++ i=$(( $i + 1 )) ++ done ++ ] + ) + LIBS="$LIBS1"]) + AC_DEFINE_UNQUOTED($1_SHIFT, ${$2}) +-- +1.7.6.1 + diff --git a/net-misc/socat/socat-1.7.1.3.ebuild b/net-misc/socat/socat-1.7.1.3.ebuild index 238a94c5a8a3..58acceab3f45 100644 --- a/net-misc/socat/socat-1.7.1.3.ebuild +++ b/net-misc/socat/socat-1.7.1.3.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.7.1.3.ebuild,v 1.6 2010/08/07 15:57:58 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.7.1.3.ebuild,v 1.7 2011/12/15 19:33:19 vapier Exp $ EAPI="2" -inherit eutils flag-o-matic +inherit eutils flag-o-matic autotools DESCRIPTION="Multipurpose relay (SOcket CAT)" HOMEPAGE="http://www.dest-unreach.org/socat/" @@ -24,6 +24,11 @@ DEPEND=" " RDEPEND="${DEPEND}" +src_prepare() { + epatch "${FILESDIR}"/${P}-cross-compile.patch + eautoreconf +} + src_configure() { filter-flags -Wno-error* econf \ diff --git a/net-misc/socat/socat-1.7.2.0.ebuild b/net-misc/socat/socat-1.7.2.0.ebuild index a59f50003cf3..bcc2f4c2d9c3 100644 --- a/net-misc/socat/socat-1.7.2.0.ebuild +++ b/net-misc/socat/socat-1.7.2.0.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.7.2.0.ebuild,v 1.1 2011/12/06 04:16:11 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.7.2.0.ebuild,v 1.2 2011/12/15 19:33:19 vapier Exp $ EAPI="4" -inherit eutils flag-o-matic +inherit eutils flag-o-matic autotools DESCRIPTION="Multipurpose relay (SOcket CAT)" HOMEPAGE="http://www.dest-unreach.org/socat/" @@ -24,6 +24,11 @@ DEPEND=" " RDEPEND="${DEPEND}" +src_prepare() { + epatch "${FILESDIR}"/${P}-cross-compile.patch + eautoreconf +} + src_configure() { filter-flags -Wno-error* econf \ -- 2.26.2