From c24d9cf90e412933654366403271289ee6c187fd Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 20 Oct 2011 15:04:10 +0000 Subject: [PATCH] Make this package cross-compile. Package-Manager: portage-2.2.0_alpha65/cvs/Linux x86_64 --- sys-apps/mawk/ChangeLog | 8 ++++++-- sys-apps/mawk/Manifest | 15 +++++++++++++-- .../mawk/files/mawk-1.3.4-cross-compile.patch | 13 +++++++++++++ sys-apps/mawk/mawk-1.3.4_p20100625.ebuild | 12 ++++++------ 4 files changed, 38 insertions(+), 10 deletions(-) create mode 100644 sys-apps/mawk/files/mawk-1.3.4-cross-compile.patch diff --git a/sys-apps/mawk/ChangeLog b/sys-apps/mawk/ChangeLog index 4ac0ae57b1cb..82dbee5bfa4a 100644 --- a/sys-apps/mawk/ChangeLog +++ b/sys-apps/mawk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/mawk -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/mawk/ChangeLog,v 1.17 2010/07/14 21:38:43 sping Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/mawk/ChangeLog,v 1.18 2011/10/20 15:04:10 vapier Exp $ + + 20 Oct 2011; Mike Frysinger mawk-1.3.4_p20100625.ebuild, + +files/mawk-1.3.4-cross-compile.patch: + Make this package cross-compile. *mawk-1.3.4_p20100625 (14 Jul 2010) diff --git a/sys-apps/mawk/Manifest b/sys-apps/mawk/Manifest index b48e8c0912ef..4fec2a61170c 100644 --- a/sys-apps/mawk/Manifest +++ b/sys-apps/mawk/Manifest @@ -1,3 +1,7 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX mawk-1.3.4-cross-compile.patch 450 RMD160 8734273667339527e584e9a77ae9eccfbaba4a53 SHA1 36497c54e1aa3bfacf1baa65aa6bd88a27b0c76f SHA256 bb43d5836b2ea416793d17d147111662838f1b5154634d5b9bd09092e56a7fde DIST mawk-1.3.3-20090820.tgz 272729 RMD160 d5fe0e35304d6625fab9add9e960fb1e13f4340a SHA1 31d1250f27700cadec3504de84c96e8aedd7cb6e SHA256 7ddc7216a0efeacf69438795c2d7294492c5cbbc5a7c8c6f31bdbe39171ba43a DIST mawk-1.3.3.tar.gz 209942 RMD160 f1c939aa032ec7f5e8157a9440d3520f2ecc8501 SHA1 314bcdb6543733f47ef4d9d9356b23f53d6a7f89 SHA256 32649c46063d4ef0777a12ae6e9a26bcc920833d54e1abca7edb8d37481e7485 DIST mawk-1.3.4-20100507.tgz 299586 RMD160 2aaf95de458410d4d206fdd56f6c811d51a06a52 SHA1 ffde9a9b731661fc05863b15ddec9e54b80ee408 SHA256 34df75881b7f8a5b1602239faea21ae68a5a239a0dc085bd5369c0e97423482c @@ -6,6 +10,13 @@ EBUILD mawk-1.3.3.ebuild 825 RMD160 d139a4d19736cbbcc1832d841ef62ee0e5f57f93 SHA EBUILD mawk-1.3.3_p20090820.ebuild 836 RMD160 2a13256b88ec69e77d94ec889c74aaa53774d6dd SHA1 584bb618650538e71c6b204b50006936ba136a64 SHA256 d1706ce0e7e9f34b183e98f3b27ae0643bb638f0215cc5b74d1b3a34fcc832f1 EBUILD mawk-1.3.4_p20100507-r1.ebuild 879 RMD160 565622ec292770fc46551e136b55ae3946e1cc24 SHA1 da1a756f45f40bdd8218331634b07289053811ef SHA256 384306f0e93407c69e58cc88c65864f805d95bdf447031a92baaaac6a0a448b9 EBUILD mawk-1.3.4_p20100507.ebuild 764 RMD160 25179aac76a20aa8fe4beb3eaa6aab48c527b5e8 SHA1 1acf261b3a04bfad88564ea19ead5df05a7efb98 SHA256 fb156ac77d29248240561e348f707762420ee2f2613140fc3104fcf650526d18 -EBUILD mawk-1.3.4_p20100625.ebuild 876 RMD160 09282777161c899653ae0755417006ca5ff19937 SHA1 8b1b3d6e00c22c208f1c362af8426ae16cfa2286 SHA256 6cc51a6860185baf800fed1b5984d91c14b309f562ba0291a80125160ef990e8 -MISC ChangeLog 2255 RMD160 4b444a3e5d06d214eb76cc77b489112e4a5a40b4 SHA1 2acc34623abfc0515bf87cdf5c4fe045d4c52e59 SHA256 6b96e729ba2de737b30454d9dfb432c3796bb628ca91ed10e6060cddce7e9d95 +EBUILD mawk-1.3.4_p20100625.ebuild 902 RMD160 c96f13d74efa642b296ea393565fd9705ab2aeff SHA1 1f4029c04ef1a0e46b2f57985b42fd4cae2eb0fc SHA256 b4111939b3ce99a5bc116b49c8517bcc442e40ca13a1c5cfc8b7025590d51898 +MISC ChangeLog 2412 RMD160 e2392bc661d345543bf0779061b970a87c8e5c86 SHA1 9e3369e687ae70b803989b245c5d418da4d20700 SHA256 0017d2a84d04474abba59815b26867e2eb64d450ff2c87d99d1e59bfd241b9a9 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iF4EAREIAAYFAk6gOHAACgkQaC/OocHi7JaxogD9F+W8uz+b1T1I/VQArTJYR85h +GSeaabskr2kkz8rVQEIA/1NFoWShwx/jqJG67Xx/J/g29LajFWOgXXfkEaIqs2p+ +=sUrl +-----END PGP SIGNATURE----- diff --git a/sys-apps/mawk/files/mawk-1.3.4-cross-compile.patch b/sys-apps/mawk/files/mawk-1.3.4-cross-compile.patch new file mode 100644 index 000000000000..104bb46d2457 --- /dev/null +++ b/sys-apps/mawk/files/mawk-1.3.4-cross-compile.patch @@ -0,0 +1,13 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -104,8 +104,9 @@ + -@rm -f $@ + notangle -R'"array.h"' array.w | $(NOIDENT) | cpif array.h + ++BUILD_CC ?= gcc + scancode.c : $(srcdir)/makescan.c scancode.h nstd.h config.h +- @ECHO_LD@$(CC) $(CFLAGS) $(CPPFLAGS) -o makescan.exe $(srcdir)/makescan.c ++ @ECHO_LD@$(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -o makescan.exe $(srcdir)/makescan.c + rm -f scancode.c + ./makescan.exe > scancode.c + rm makescan.exe diff --git a/sys-apps/mawk/mawk-1.3.4_p20100625.ebuild b/sys-apps/mawk/mawk-1.3.4_p20100625.ebuild index 94ec821d9a27..d13b650efc47 100644 --- a/sys-apps/mawk/mawk-1.3.4_p20100625.ebuild +++ b/sys-apps/mawk/mawk-1.3.4_p20100625.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/sys-apps/mawk/mawk-1.3.4_p20100625.ebuild,v 1.1 2010/07/14 21:38:43 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/mawk/mawk-1.3.4_p20100625.ebuild,v 1.2 2011/10/20 15:04:10 vapier Exp $ EAPI="2" -inherit toolchain-funcs +inherit toolchain-funcs eutils MY_P=${P/_p/-} DESCRIPTION="an (often faster than gawk) awk-interpreter" @@ -18,9 +18,9 @@ IUSE="" S=${WORKDIR}/${MY_P} -src_configure() { - tc-export CC # stupid configure script - econf || die +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.3.4-cross-compile.patch + tc-export BUILD_CC } src_install() { -- 2.26.2