Add cross-compiling support #486680.

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 131 insertions, 23 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index 6310d6847df2..9a840a531064 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-cdr/cdrtools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.328 2014/01/18 22:33:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.329 2014/01/19 01:12:49 vapier Exp $
+
+  19 Jan 2014; Mike Frysinger <vapier@gentoo.org> cdrtools-3.01_alpha21.ebuild:
+  Add cross-compiling support #486680.
 
   18 Jan 2014; Mike Frysinger <vapier@gentoo.org> cdrtools-3.01_alpha17.ebuild,
   cdrtools-3.01_alpha19.ebuild, cdrtools-3.01_alpha21.ebuild:
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 4834ac23ffc1..defbf9345aed 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -8,23 +8,23 @@ DIST cdrtools-3.01a21.tar.bz2 2063194 SHA256 729ed9462dd284193571b151616ed4c594d
 EBUILD cdrtools-3.00.ebuild 4233 SHA256 a835a994ddaad174c18ac3d8dbb7f0e45c32222d9b58db7034aefc65a363a634 SHA512 d9f8b8f86bed84a29864efe539915790cd4e1294211c1881eeca6a3a6d82fcc5f0f98c88477d2e47eeef09d870b0def61b444d4120f31d6c1cd3bc05218e104b WHIRLPOOL 912fdd8d847c3a462b270d1ef0593a9660ab8396cb59fd86df9a2894a59b86117813a43aef39c7207344a2acec667a3cd2e9ecdcebe265ea2025f42a1fad0501
 EBUILD cdrtools-3.01_alpha17.ebuild 4912 SHA256 d025999d88fbe390878a1a6e3ce346a80d177b562038cb5dbe9b4cf5a5eb92fb SHA512 6117fdb2f94bb0bb8f5dab109b4912695d325cd05577239ee5707c6773be26f3f34a226143a1f024336eab39bc8e31ced204c9c8093abc79a8a645336326fbde WHIRLPOOL 4b2e7b9794ea7241f914135be8a816a1dde36542d2d27f00806ac86af6cc01fcd226394056a42157f7579a82eb3e2598de2d065b080cd9cccb28c9f8e1d8d97f
 EBUILD cdrtools-3.01_alpha19.ebuild 4949 SHA256 eecb778a4013051a85b91cae128352c6ef1958625fea226901468989ff1859dd SHA512 3dd754cd53ac7c2b6a4d816b3adf9d470237813e7e3e395b381738f6baddeefce56c444665a5fd262e7f382464008bdb69767115875e0e6e46adb8f5b56d0de9 WHIRLPOOL 9cf18a9e18f45de9ecdfe4317dec1b4e5decf1cb0acc08abbea997a134e179c887269b4b708a2e3e4d8c3a04f0206f1751747b8cb391c870c194d2dc39c34d9b
-EBUILD cdrtools-3.01_alpha21.ebuild 4708 SHA256 bc72a7e68b209e2ac337f79500965dd7e116f652557f34041d07f82074de13a6 SHA512 65955722d7fd628681d52526cbd52471f83a4bf40e96c3a1f76e1f56711475bb4209f3cd978558bcc4080d9389ea8bccf8abbcfca141fffcb6103d20fff7dae1 WHIRLPOOL 4e9369e7f649494bd15f983e046f4114d143ae4cc2a7e65a46777e93d193491c04cc552aafeb9d18074f11acaebebdcd227faa0b4393bbede7b60804620dcead
-MISC ChangeLog 50543 SHA256 d130c5145f6d1165fec3e4acef98c6e7efea318be2d52cb16dcbfa63e6339f1f SHA512 4a12b679638ddc3bc33065f349e578aec102a8f12d4b35c06512a83ffdb0628a060326eaeb458c2267dc9d790acba6f33e95cbe88d2a920d6e2c6ce3c5148c7d WHIRLPOOL 6cc2418d335e1ff0021749fcb7742b8fd69f7b471b6e0e0a8589506bbeb4e049759a2d095f5c18639e8ff7dbf6919ba905b46f632979b8658b1648b07925b609
+EBUILD cdrtools-3.01_alpha21.ebuild 7565 SHA256 ba1ecc09ad55c999ada112eb8092cebc4a23a5957ae088df0ad68b54b47aa2c1 SHA512 d570449f4095688f2a87e7373f9e5018c9e0ba150f9f48f332c47ebe43b7f296fdbfe3749058524d6661dfc2309226766c2e7d37f8346dbdf37e14c3eeb2506d WHIRLPOOL e800f6e60ba158d61f0677e1bfa80c8b100e44c7369f3c8f43aaa2b0331f9801088b5c9c746acf76c944c06ccbab0c2c5913f1c3bbe4aad7fb58969e6b10f050
+MISC ChangeLog 50663 SHA256 0bed88f1a2840e09a81b130cb810471cc5fad9d8937f48a33f53f6b579874c09 SHA512 7d85501a8f909ffa2fea46f4916e0cb6fc75a41ebf8b922d84178f15ee4e677f264fd581c9c5a5210aded81b95dfc127d80164f4fe057b76df50037aa97ce6f6 WHIRLPOOL 2b505b72f2a7705e044f57f2f1b8b2c6ac65662274eb08f363ee284d66a6c58ce8dd4bd0f91f578a3eb835ddcd44a3abfa7588cb7cb52df3beb546203da9228c
 MISC metadata.xml 507 SHA256 f1086372c5bae26f9438544c1102cbadc619718b163392cbe35f3b359560ef3b SHA512 77aef4353064a013d1944ee796b1a6cb9a8a60c698d53df46cac7be17c556d9a495c71b9578a536c61c429a0c87e894e962bdca9167bbc60522ef25aeab756a6 WHIRLPOOL 0771499480bc135391ab921f22aba47f9966b68c79083f29f9df8c185919b65422f69953cc876d7dca8a2af5539b85e0c592f4521f5b4034ca5cb6035dc7c28b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS2wFDAAoJEPGu1DbS6WIAKLYP/A2CkCJmGdBv/E043FeTEvuz
-A3kXq77CzsTHK2h8Uz45Rm2RXAxqrw3jRlevezjQEjFmPFQXMhpyeSp7y+M6e8hC
-2WdoivK85/YsClg9PzPPLvtusDKLSXqU97Zjjf3wCHZq1/W55+as6RaPNJUj/5Y1
-w59HjYAmtW1cNPfg7iL5Hhnop5fiWInzBNsaumaYyGrZG/EXtq8dfR4n66Sj+xA3
-6zFP9new0fSAEm/rpyhookzzPdgnfKkGvqUD0A8JSU0LkMJL4eStqVITk+SWQy+g
-yqy3DqULEhw31u8ea2hwWkZJq/ENN5ebvhCLiAuaqdrhoyyqArTi2ruPbiXHU0du
-Q2dD1u6kLcQ29eyqBDjIdhO+mClp4nJIindUE8R6VZ5l8T+vAOeukca3PxVhlKfn
-GhUpagtraQP9icnXAT835WtkaPeJF3fP11+D3qX9lDF4yMFsigcZgecJvmzUj8Xi
-K3R0w9VhoUdyM71HTskw6Jwe69Y2+eS5vX8VjEHLhlMWRRA/3HasBfVeCZMw3JAR
-7X0wzfa7LquluGiS5pnfylWseIx7DiANykRvWnsV254QEkejaIBWtxOz5zUbh/Pc
-/xhfdelRr0TDNeINQ9oRZA8QCiZ+qv6eoLEPakQRaqcNovd2Vwo2JY0HtDVlqmKD
-PCSIvjVVuDkuRjFqREC0
-=1LyL
+iQIcBAEBCAAGBQJS2yaXAAoJEPGu1DbS6WIA1JEP+wSiZ/UYE+A33OoVq5NuyV7I
+3qguayvRHNAd4o52H1C6HBaAbD/T295kOWTHYteScB3Y/MfGPs4//iD/3bRK017l
+L445mkvN4jKQPlFc9fRazLmqHVCUQM5AK9dZS2niDEEFq3o3wo9+MjrG6QgJwsjE
+2/8T3DboPPtRiWPoOmMPj0ZGBuJW8EMKR0o7uk8uCig84etPHI27SV/Mdt8diSK3
+wPivWSv1UoUnxEe4hd/drnPeqAonTbe2pakXob3fbHW+N3GwpVpKB9EthPBkYU4I
+14G6Lm2uwKaCM3fNa9hNNP1oPgs3DnKs4tWVUInX64wWZLrA7Mlv5JJEtJ3PzW4g
+uI8xuqEutprGdM2XhFOidIBEtPrDtJShinUGnIrDPoz1rKxwQ1j02ZcGzFUxPyDC
+WEnRrcD3FO0FVDzQvJg3XISk1DfQP7DdKuOPXrMEdtyI0seIuJ4CEPLyzZ/JoQFC
+XW9vXz5LH4FB393R5MTAH1M2Pxe3VxTfyNdOhqP4O97EWIw2zXcmUyDIyKlL59Hx
+GWiunriqTS1pbdqG5waPU4AL2esI2HwIIECMOgUIykIoxp0DMdBz8KI9DvrVooCJ
+rMp+RRBYrFNzb8xho52DVfpJ59tnfh3PrelWs8KcRZZkuEVe2pnLhW4P5cfqkaHb
+ngJsTHyEAv5p7s8AUAcu
+=QjLW
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/cdrtools/cdrtools-3.01_alpha21.ebuild b/app-cdr/cdrtools/cdrtools-3.01_alpha21.ebuild
index adb97f78d618..f2c537b91e70 100644
--- a/app-cdr/cdrtools/cdrtools-3.01_alpha21.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.01_alpha21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha21.ebuild,v 1.2 2014/01/18 22:33:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha21.ebuild,v 1.3 2014/01/19 01:12:49 vapier Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/$([[ -z ${PV/*_alpha*} ]] && echo 'al
 
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl nls unicode"
 
 RDEPEND="acl? ( virtual/acl )
@@ -31,6 +31,13 @@ FILECAPS=(
 	cap_dac_override,cap_sys_admin,cap_net_bind_service,cap_sys_rawio+ep usr/bin/readcd
 )
 
+cdrtools_os() {
+	local os="linux"
+	[[ ${CHOST} == *-darwin* ]] && os="mac-os10"
+	[[ ${CHOST} == *-freebsd* ]] && os="freebsd"
+	echo "${os}"
+}
+
 src_prepare() {
 	gnuconfig_update
 
@@ -72,9 +79,7 @@ src_prepare() {
 
 	# Schily make setup.
 	cd "${S}"/DEFAULTS
-	local os="linux"
-	[[ ${CHOST} == *-darwin* ]] && os="mac-os10"
-	[[ ${CHOST} == *-freebsd* ]] && os="freebsd"
+	local os=$(cdrtools_os)
 
 	sed -i \
 		-e "s|^\(DEFLINKMODE=\).*|\1\tdynamic|" \
@@ -87,8 +92,108 @@ src_prepare() {
 		Defaults.${os} || die "sed Schily make setup"
 }
 
-# skip obsolete configure script
-src_configure() { : ; }
+ac_cv_sizeof() {
+	cat <<-EOF >"${T}"/test.c
+	#include <inttypes.h>
+	#include <stddef.h>
+	#include <stdint.h>
+	#include <sys/types.h>
+	int main () {
+		static int test_array [1 - 2 * !((sizeof(TYPE)) == LEN)];
+		test_array [0] = 0;
+		return test_array [0];
+	}
+	EOF
+
+	local i=1
+	while [[ ${i} -lt 20 ]] ; do
+		if ${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o /dev/null -DTYPE="$1" -DLEN=$i 2>/dev/null; then
+			echo ${i}
+			return 0
+		fi
+		: $(( i += 1 ))
+	done
+	return 1
+}
+
+src_configure() {
+	# skip obsolete configure script
+	if tc-is-cross-compiler ; then
+		# Cache known values for targets. #486680
+
+		tc-export CC
+		local var val t types=(
+			char "short int" int "long int" "long long"
+			"unsigned char" "unsigned short int" "unsigned int"
+			"unsigned long int" "unsigned long long"
+			float double "long double" size_t ssize_t ptrdiff_t
+			mode_t uid_t gid_t pid_t dev_t time_t wchar_t
+            "char *" "unsigned char *"
+		)
+		for t in "${types[@]}" ; do
+			var="ac_cv_sizeof_${t// /_}"
+			var=${var//[*]/p}
+			val=$(ac_cv_sizeof "${t}") || die "could not compute ${t}"
+			export "${var}=${val}"
+			einfo "Computing sizeof(${t}) as ${val}"
+		done
+		# We don't have these types.
+		export ac_cv_sizeof___int64=0
+		export ac_cv_sizeof_unsigned___int64=0
+		export ac_cv_sizeof_major_t=${ac_cv_sizeof_dev_t}
+		export ac_cv_sizeof_minor_t=${ac_cv_sizeof_dev_t}
+		export ac_cv_sizeof_wchar=${ac_cv_sizeof_wchar_t}
+
+		export ac_cv_type_prototypes="yes"
+		export ac_cv_func_mlock{,all}="yes"
+		export ac_cv_func_{e,f,g}cvt=$(usex elibc_glibc)
+		export ac_cv_func_dtoa_r="no"
+		export ac_cv_func_sys_siglist{,_def}="no"
+		export ac_cv_func_printf_{j,ll}="yes"
+		export ac_cv_realloc_null="yes"
+		export ac_cv_no_user_malloc="no"
+		export ac_cv_var_timezone="yes"
+		export ac_cv_var___progname{,_full}="yes"
+		export ac_cv_fnmatch_igncase="yes"
+		export ac_cv_file__dev_{fd_{0,1,2},null,std{err,in,out},tty,zero}="yes"
+		export ac_cv_file__usr_src_linux_include="no"
+
+		case $(cdrtools_os) in
+		linux)
+			export ac_cv_func_bsd_{g,s}etpgrp="no"
+			export ac_cv_hard_symlinks="yes"
+			export ac_cv_link_nofollow="yes"
+			export ac_cv_access_e_ok="no"
+
+			export ac_cv_dev_minor_noncontig="yes"
+			case ${ac_cv_sizeof_long_int} in
+			4) export ac_cv_dev_minor_bits="32";;
+			8) export ac_cv_dev_minor_bits="44";;
+			esac
+
+			cat <<-EOF >"${T}"/test.c
+			struct {
+				char start[6];
+				unsigned char x1:4;
+				unsigned char x2:4;
+				char end[5];
+			} a = {
+				.start = {'S', 't', 'A', 'r', 'T', '_'},
+				.x1 = 5,
+				.x2 = 4,
+				.end = {'_', 'e', 'N', 'd', 'X'},
+			};
+			EOF
+			${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o
+			if grep -q 'StArT_E_eNdX' "${T}"/test.o ; then
+				export ac_cv_c_bitfields_htol="no"
+			elif grep -q 'StArT_T_eNdX' "${T}"/test.o ; then
+				export ac_cv_c_bitfields_htol="yes"
+			fi
+			;;
+		esac
+	fi
+}
 
 src_compile() {
 	if use unicode; then