From cd72749272cc2961033ffa2291a336aee94f7351 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 16 Sep 2011 17:25:35 +0000 Subject: [PATCH] Fix building when job controls are disabled (like when cross-compiling) #383237 by Maciej Grela. Package-Manager: portage-2.2.0_alpha58/cvs/Linux x86_64 --- app-shells/bash/ChangeLog | 7 +++++- app-shells/bash/Manifest | 11 +++++---- app-shells/bash/bash-4.2_p10.ebuild | 4 +++- .../files/bash-4.2-execute-job-control.patch | 24 +++++++++++++++++++ 4 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 app-shells/bash/files/bash-4.2-execute-job-control.patch diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog index 7d1700e472c2..341e66d3b211 100644 --- a/app-shells/bash/ChangeLog +++ b/app-shells/bash/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-shells/bash # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.290 2011/08/11 02:23:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.291 2011/09/16 17:25:35 vapier Exp $ + + 16 Sep 2011; Mike Frysinger bash-4.2_p10.ebuild, + +files/bash-4.2-execute-job-control.patch: + Fix building when job controls are disabled (like when cross-compiling) + #383237 by Maciej Grela. 11 Aug 2011; Mike Frysinger bash-4.2_p8-r1.ebuild, bash-4.2_p10.ebuild: diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest index def12b959632..b432cd71388f 100644 --- a/app-shells/bash/Manifest +++ b/app-shells/bash/Manifest @@ -25,6 +25,7 @@ AUX bash-4.0-negative-return.patch 748 RMD160 ba602c6fb3caa055a09a72122c45e160ea AUX bash-4.0-parallel-build.patch 2237 RMD160 82aa28d48f12978cbaea7ebed987d13f5368c2c8 SHA1 c82d0c9ca049fe3c53418f4a3b399a840bbcdc90 SHA256 65db03b0c0b8e2fd917f049e9e84f7b2b234b3e9e37f395d4d8984194b392a56 AUX bash-4.1-fbsd-eaccess.patch 843 RMD160 50e06a8ec83fa756a9749ab5011696e737731afe SHA1 9468675bdb345c01f6a285d76526e851de63a895 SHA256 42a4ee58b0d2fd529e25fcc3ca10d17bbac2c91fd8bcb191d70c788f0b55fb95 AUX bash-4.1-parallel-build.patch 829 RMD160 371bd2d62a0b70c4305697975780165e02f2b38d SHA1 9978a6ed4668509660491799bbbc5b7d6ad2cbd9 SHA256 0da60b91e4fb2326137a4dde6d8937592b6efea45de51194ca1770127637e652 +AUX bash-4.2-execute-job-control.patch 865 RMD160 8666b45a33ce11212a61c68a0e01a21ad1603c0e SHA1 4a154d9ac4c6ea1ff8e653fb13df462519a6a63f SHA256 0b6fc0d467662dd85daa02ba8d50ea612cf4c5274d685d52eb1533b5f164b056 AUX bash-4.2-print-heredoc.patch 854 RMD160 5d3fc358a9f9500baf3a83378ca8c935ee0b34df SHA1 70ffe49e867222cc5877edcacaee9842080d6375 SHA256 a686e71f9ab788015fa80eb448252eeedc2d8f8e97b0fc0c66c0d3f3088e87b4 AUX bash-4.x-deferred-heredocs.patch 1255 RMD160 69e3554d225e5a85be3f874b0bb0139c0e24c9b9 SHA1 b8d492af021ae59c9799dfbb169842c23ed9f826 SHA256 845ffcd7035eef5dc029747f211a737e0260b53b16086a37fb3c8ab3609a7d36 AUX bash_logout 205 RMD160 fa6064b67bd02cf66dc490759442a0127770d420 SHA1 a6983665cc842bde96fbc8811be89cf8fda71a45 SHA256 15aaded954389c05d7de5d36c4887db61975ad52c87ad78baf1062ec8997289d @@ -172,14 +173,14 @@ EBUILD bash-4.1_p10.ebuild 5660 RMD160 9c0a3d574b1dbf873e26ea223c73c70abc042473 EBUILD bash-4.1_p11.ebuild 5660 RMD160 307a3558a0b42808eacdd776841833cc40606d3d SHA1 ee713343156ba0e3789dd45a29903667febd4c22 SHA256 954e2b6d897a4e54fb2bde0c62da5af886c076aea6890fbfe6b8a9053f532ccc EBUILD bash-4.1_p7.ebuild 5647 RMD160 d304c9b6eeb384f9baa4a84e262f4725a2fad7b0 SHA1 7bbd8c7145bd494ff86fde53b9ba63a9aa1dd3de SHA256 f5d0f3136170e346cd97f30cc735f1e007183c5ae73bedb12b596c5b26323feb EBUILD bash-4.1_p9.ebuild 5647 RMD160 a4735eb85dacda84c5e616c40b18d3bd6090c2b8 SHA1 fb124d72adcab6e86240cfc991c18eb0681333a1 SHA256 9dfe8f46a4e24aa1a994e886fae5a80228449b0471e0856368e521ad2fd36588 -EBUILD bash-4.2_p10.ebuild 5484 RMD160 6ce4f702c241b1b65f5e52773345d049bcd4f796 SHA1 e465491c598650ddf6637a4ce5d6cf9eddaf3724 SHA256 333a56b639f1bc7eaf83fb7baa1896422e2d02f0b5fbe3ee85b0e77e1f343d4e +EBUILD bash-4.2_p10.ebuild 5551 RMD160 c0d8ff1d9ccd53cd5eceaca621b3941f52ace62c SHA1 013312857f85d4d3dd4de454b7452e398c0bdb98 SHA256 a12d896d1d3dc427862e052d81af0ef248875e6350831e3464fcc82a1f315698 EBUILD bash-4.2_p8-r1.ebuild 5546 RMD160 d60f2c28b28dcb55b063f16b8ee5400b88e0f6d6 SHA1 096e27b3ead5a1ec0756f88471db3084bee98f01 SHA256 466fd15f97af04edd495bf0452c8bebb0725288c2503362ff3d0088e849ca105 -MISC ChangeLog 45029 RMD160 d88bd2c7adc7ac670110b1e61efbb5bf45cda141 SHA1 5cf260534c83bddce99f575f7a095538e4872137 SHA256 afe4002db0232f998baa4a15ce0a4da77355f586eea295213fc5e436c54d7c20 +MISC ChangeLog 45247 RMD160 2086fb901cb6a6a8e827a93eb022c8c2aff85ea8 SHA1 3ca2d5110213eda2027af3019210d8d769407091 SHA256 1e1eabc639085fda5838934ee0fe6ae88efbeaf56eb8f861975c416b1d0add23 MISC metadata.xml 568 RMD160 c778ff1669af3c368238bcf481b344b741f0d6e1 SHA1 8d74d1c518351ad8085c9c26a5f2554d8c768b20 SHA256 48d380acb97dda0a7f4bd918b208d11367a8367d289b0a2d78ef08ef9a4e2562 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk5DPTEACgkQaC/OocHi7JbXlwD/WBgWgD4qw1hysRCkXx4WBVt2 -PM039WbRK/sdIO5sd6cBAIWcbalQxsD7pMjXQNwfSXCL4D4dTLWkXn0tC5BW1RBn -=BOZw +iF4EAREIAAYFAk5zhpUACgkQaC/OocHi7JbUQwEAkqr4BtgQICR0bYWMtZwNsyyG +ThynhtTukevFN8fQ8ZwA/j8y0yyw0VMXIjd11GzQybXev9PvW8bk/8NB85vmpCUz +=Vqdx -----END PGP SIGNATURE----- diff --git a/app-shells/bash/bash-4.2_p10.ebuild b/app-shells/bash/bash-4.2_p10.ebuild index 4b6dec83b299..a1921e4b9134 100644 --- a/app-shells/bash/bash-4.2_p10.ebuild +++ b/app-shells/bash/bash-4.2_p10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p10.ebuild,v 1.3 2011/08/11 02:23:47 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p10.ebuild,v 1.4 2011/09/16 17:25:35 vapier Exp $ EAPI="1" @@ -71,6 +71,8 @@ src_unpack() { cd lib/readline [[ ${READLINE_PLEVEL} -gt 0 ]] && epatch $(patches -s ${READLINE_PLEVEL} readline ${READLINE_VER}) cd ../.. + + epatch "${FILESDIR}"/${PN}-4.2-execute-job-control.patch #383237 } src_compile() { diff --git a/app-shells/bash/files/bash-4.2-execute-job-control.patch b/app-shells/bash/files/bash-4.2-execute-job-control.patch new file mode 100644 index 000000000000..82b73e5157ca --- /dev/null +++ b/app-shells/bash/files/bash-4.2-execute-job-control.patch @@ -0,0 +1,24 @@ +fix build when job control is disabled + +http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00110.html +http://lists.gnu.org/archive/html/bug-bash/2011-07/msg00057.html +http://lists.gnu.org/archive/html/bug-bash/2011-09/msg00039.html +https://bugs.gentoo.org/383237 + +should be fixed in next release of bash ... + +--- a/execute_cmd.c ++++ b/execute_cmd.c +@@ -2202,7 +2202,11 @@ + /* If the `lastpipe' option is set with shopt, and job control is not + enabled, execute the last element of non-async pipelines in the + current shell environment. */ +- if (lastpipe_opt && job_control == 0 && asynchronous == 0 && pipe_out == NO_PIPE && prev > 0) ++ if (lastpipe_opt && ++#if defined(JOB_CONTROL) ++ job_control == 0 && ++#endif ++ asynchronous == 0 && pipe_out == NO_PIPE && prev > 0) + { + lstdin = move_to_high_fd (0, 0, 255); + if (lstdin > 0) -- 2.26.2