From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 11 16:09:30 2012 Received: (at submit) by debbugs.gnu.org; 11 Mar 2012 20:09:30 +0000 Received: from localhost ([127.0.0.1]:45300 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1S6p57-0002IZ-9v for submit@debbugs.gnu.org; Sun, 11 Mar 2012 16:09:30 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38952) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1S6e6z-0003z1-5W for submit@debbugs.gnu.org; Sun, 11 Mar 2012 04:26:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S6deC-0004Kk-1J for submit@debbugs.gnu.org; Sun, 11 Mar 2012 03:56:57 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, SUBJ_OBFU_PUNCT_FEW autolearn=unavailable version=3.3.2 Received: from lists.gnu.org ([208.118.235.17]:47393) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6deB-0004Kg-UR for submit@debbugs.gnu.org; Sun, 11 Mar 2012 03:56:55 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38925) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6deA-0006Cp-9x for bug-automake@gnu.org; Sun, 11 Mar 2012 03:56:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S6de8-0004KE-6S for bug-automake@gnu.org; Sun, 11 Mar 2012 03:56:53 -0400 Received: from atlas.wxnz.net ([58.28.6.122]:43342) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6de7-0004K6-Sn for bug-automake@gnu.org; Sun, 11 Mar 2012 03:56:52 -0400 Received: from altar.drake.org.nz (ip-118-90-124-24.xdsl.xnet.co.nz [118.90.124.24]) by atlas.wxnz.net (Postfix) with ESMTP id A213A2D8E56 for ; Sun, 11 Mar 2012 20:32:35 +1300 (NZDT) Date: Sun, 11 Mar 2012 20:32:35 +1300 (NZDT) From: Steven Drake To: bug-automake@gnu.org Subject: am__py_compile dose not get added to Makefile.in's Message-ID: User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 208.118.235.17 X-Spam-Score: -6.9 (------) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Sun, 11 Mar 2012 16:09:28 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.9 (------) The variable gets used by install-%DIR%PYTHON: (from lib/am/python.am) but it definition is not include in the output Makefile.in. -- Steven From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 12 07:52:39 2012 Received: (at 10995) by debbugs.gnu.org; 12 Mar 2012 11:52:39 +0000 Received: from localhost ([127.0.0.1]:46187 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1S73nq-0004Ed-BZ for submit@debbugs.gnu.org; Mon, 12 Mar 2012 07:52:39 -0400 Received: from mail-bk0-f44.google.com ([209.85.214.44]:36014) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1S73nn-0004EO-5b; Mon, 12 Mar 2012 07:52:36 -0400 Received: by bkuw5 with SMTP id w5so2423504bku.3 for ; Mon, 12 Mar 2012 04:22:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:mime-version:to:cc:subject:references :in-reply-to:content-type; bh=FlQ4JLYPk6ts07uQ0kCmfVwrurfqcr/+3evKPI0iZi4=; b=FD3K4OehcFwZZMyETDq3EvxwuelRlKyWeL83eXMfC5ebtnvcDj1aMp9dyh1GNn1dPV 4lCNaTag1VVEOOtbJERaWR9GRrbsF89lKFx1YxkF4rWpTkhGr69j8/tLYDDAoKNv9pLE cgRtrmJyQLZuhB2qA0OWIqUFGaq9rC4pfa3ibobAJHrtTkfSrilQBJ0iIOUoMRt5AZLm rwDhHfI/6W8OSlPcyA3YU05Au7f7lCGd+0iA56t9ca0nRNM2OHLr+YnHHLXQbthc1BGW 11OoJcQ42xdcUDoxkOsxM+NhyzuqKjZaniG+246SCvrg+st+2c2oVck1xbKgtpI+GZhL gZ0A== Received: by 10.204.129.196 with SMTP id p4mr4816954bks.21.1331551363712; Mon, 12 Mar 2012 04:22:43 -0700 (PDT) Received: from [87.4.96.172] (host172-96-dynamic.4-87-r.retail.telecomitalia.it. [87.4.96.172]) by mx.google.com with ESMTPS id jr13sm24506294bkb.14.2012.03.12.04.22.41 (version=SSLv3 cipher=OTHER); Mon, 12 Mar 2012 04:22:42 -0700 (PDT) Message-ID: <4F5DDC7F.3070507@gmail.com> Date: Mon, 12 Mar 2012 12:22:39 +0100 From: Stefano Lattarini MIME-Version: 1.0 To: Steven Drake Subject: Re: bug#10995: am__py_compile dose not get added to Makefile.in's References: In-Reply-To: Content-Type: multipart/mixed; boundary="------------090609090206040005050207" X-Spam-Score: -2.6 (--) X-Debbugs-Envelope-To: 10995 Cc: 10995@debbugs.gnu.org, "automake-patches@gnu.org" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -2.6 (--) This is a multi-part message in MIME format. --------------090609090206040005050207 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit tags 10995 moreinfo thanks Hi Steven, thanks for the report. On 03/11/2012 08:32 AM, Steven Drake wrote: > The variable gets used by install-%DIR%PYTHON: (from lib/am/python.am) but > it definition is not include in the output Makefile.in. > I cannot reproduce this bug, sorry. In fact, I've enhanced the 'python.test' test case to ensure the bug you're describing is actually not present in the 'maint' branch (see attached patch). Maybe there is something unusual in your setup that is causing the problem? Could send us more information, so that we can try to reproduce the issue? Regards, Stefano --------------090609090206040005050207 Content-Type: text/x-diff; name="0001-coverage-make-sure-am__py_compile-is-defined-when-ne.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-coverage-make-sure-am__py_compile-is-defined-when-ne.pa"; filename*1="tch" >From 650dba0873f6c894461ce29cb26a1b3104287d24 Mon Sep 17 00:00:00 2001 Message-Id: <650dba0873f6c894461ce29cb26a1b3104287d24.1331551325.git.stefano.lattarini@gmail.com> From: Stefano Lattarini Date: Mon, 12 Mar 2012 12:15:47 +0100 Subject: [PATCH] coverage: make sure am__py_compile is defined when needed See automake bug#10995. * tests/python.test: Also make sure 'am__py_compile' is defined correctly in the generated Makefile.in. Signed-off-by: Stefano Lattarini --- tests/python.test | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/tests/python.test b/tests/python.test index 8102ca0..e7a6984 100755 --- a/tests/python.test +++ b/tests/python.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2012 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Test to make sure py_compile is defined. +# Test to make sure py_compile and am__py_compile are correctly defined. . ./defs || Exit 1 @@ -26,8 +26,26 @@ cat > Makefile.am << 'END' python_PYTHON = foo.py END +cat > Makefile2.am << 'END' +python_PYTHON = a.py +nodist_python_PYTHON = b.py +nobase_python_PYTHON = x/c.py +mydir = ${prefix} +my_PYTHON = d.py +END + $ACLOCAL $AUTOMAKE -a -grep '^py_compile =' Makefile.in test -f py-compile + +$AUTOMAKE Makefile2 + +grep "py" Makefile.in Makefile2.in # For debugging. + +for f in Makefile.in Makefile2.in; do + test `grep -c '^py_compile =' $f` -eq 1 + test `grep -c '^am__py_compile =' $f` -eq 1 +done + +: -- 1.7.9 --------------090609090206040005050207-- From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 15 03:51:19 2012 Received: (at 10995) by debbugs.gnu.org; 15 Mar 2012 07:51:19 +0000 Received: from localhost ([127.0.0.1]:51514 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1S85Sx-0003Qt-1J for submit@debbugs.gnu.org; Thu, 15 Mar 2012 03:51:19 -0400 Received: from atlas.wxnz.net ([58.28.6.122]:54797) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1S85Sj-0003QU-FT for 10995@debbugs.gnu.org; Thu, 15 Mar 2012 03:51:17 -0400 Received: from altar.drake.org.nz (ip-118-90-124-24.xdsl.xnet.co.nz [118.90.124.24]) by atlas.wxnz.net (Postfix) with ESMTP id D11A72D8E9A; Thu, 15 Mar 2012 20:20:56 +1300 (NZDT) Date: Thu, 15 Mar 2012 20:20:56 +1300 (NZDT) From: Steven Drake To: Stefano Lattarini Subject: Re: bug#10995: am__py_compile dose not get added to Makefile.in's In-Reply-To: <4F5DDC7F.3070507@gmail.com> Message-ID: References: <4F5DDC7F.3070507@gmail.com> User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="-1463810048-1177672889-1331796057=:4016" X-Spam-Score: -2.6 (--) X-Debbugs-Envelope-To: 10995 Cc: 10995@debbugs.gnu.org, "automake-patches@gnu.org" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -2.6 (--) This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. ---1463810048-1177672889-1331796057=:4016 Content-Type: TEXT/PLAIN; charset=US-ASCII On Mon, 12 Mar 2012, Stefano Lattarini wrote: > Hi Steven, thanks for the report. > > On 03/11/2012 08:32 AM, Steven Drake wrote: > > The variable gets used by install-%DIR%PYTHON: (from lib/am/python.am) but > > it definition is not include in the output Makefile.in. > > > I cannot reproduce this bug, sorry. In fact, I've enhanced the 'python.test' > test case to ensure the bug you're describing is actually not present in the > 'maint' branch (see attached patch). Maybe there is something unusual in your > setup that is causing the problem? Could send us more information, so that we > can try to reproduce the issue? Running the 'python.test' with the attached patch passes! but I had a look at the package that had the original problem and the line just isn't there. For reference the package build log are available at: http://ftp.netbsd.org/pub/pkgsrc/misc/sbd/reports/Linux-x86_64/20120304.1324/usrp-3.3.0nb4/ The build process rebuilds the autoconf and automake files before running the configure script. Its possible to tell that it doesn't get defined by the line in 'install.log': "/bin/sh: line 15: --destdir: command not found" The problem goes away if the attached patch is applied. -- Steven ---1463810048-1177672889-1331796057=:4016 Content-Type: TEXT/PLAIN; charset=US-ASCII; name=patch-lib_am_python.am Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: Content-Disposition: attachment; filename=patch-lib_am_python.am LS0tIGxpYi9hbS9weXRob24uYW0ub3JpZwkyMDEyLTAxLTMxIDExOjQxOjE4 LjAwMDAwMDAwMCArMDAwMA0KKysrIGxpYi9hbS9weXRob24uYW0NCkBAIC0y Myw4ICsyMyw4IEBAIGVuZGlmICU/SU5TVEFMTCUNCiAjIyBJbnN0YWxsaW5n LiAgIyMNCiAjIyAtLS0tLS0tLS0tLS0gIyMNCiANCis/RklSU1Q/YW1fX3B5 X2NvbXBpbGUgPSBQWVRIT049JChQWVRIT04pICQoU0hFTEwpICQocHlfY29t cGlsZSkNCiBpZiAlP0lOU1RBTEwlDQotP0ZJUlNUP2FtX19weV9jb21waWxl ID0gUFlUSE9OPSQoUFlUSE9OKSAkKFNIRUxMKSAkKHB5X2NvbXBpbGUpDQog YW1fX2luc3RhbGxkaXJzICs9ICIkKERFU1RESVIpJCglTkRJUiVkaXIpIg0K IC5QSE9OWSBpbnN0YWxsLSVFWEVDP2V4ZWM6ZGF0YSUtYW06IGluc3RhbGwt JURJUiVQWVRIT04NCiBpbnN0YWxsLSVESVIlUFlUSE9OOiAkKCVESVIlX1BZ VEhPTikNCg== ---1463810048-1177672889-1331796057=:4016-- From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 15 04:53:36 2012 Received: (at 10995) by debbugs.gnu.org; 15 Mar 2012 08:53:36 +0000 Received: from localhost ([127.0.0.1]:51569 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1S86RD-0004nI-CU for submit@debbugs.gnu.org; Thu, 15 Mar 2012 04:53:36 -0400 Received: from mail-ey0-f172.google.com ([209.85.215.172]:63330) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1S86R9-0004n6-Iw; Thu, 15 Mar 2012 04:53:34 -0400 Received: by eaaq11 with SMTP id q11so1456942eaa.3 for ; Thu, 15 Mar 2012 01:23:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:mime-version:to:cc:subject:references :in-reply-to:content-type; bh=ijP9NK7p8HVF0wxwXY76qfX/kgWiT85F3EAt/paCynk=; b=s5yQ+fyKVN6wCIQjOa2Myn1S0J9fVYSfDH59eafyylHkw0/e33MCBYKWgTKF/FCJWn wkH3mMklqPR4XE6T36k67EDM1GiupQFRbsvCDM4xEUI4kti/EFXL4NgURpoOFimWCvfL SOYfjomFhThE1puLfRA3QctxLU6qPZnOaJz+blt4Qw9xfchkr1EabnQ5J6COFWxOvpmD XSNPzcBOOxzNiP9LrzHA9rVrA28+bXhoKsH71j+dU2MXxT9R9lbmSp37IIGRokPsOdO+ mJM8sq7PJlb7KRa31ABHjtcjZF3VvNqKk7s8ZN6FCiPhjmALc2iIU25lxPxRPhjLxojk GUxA== Received: by 10.14.204.3 with SMTP id g3mr783567eeo.75.1331799804083; Thu, 15 Mar 2012 01:23:24 -0700 (PDT) Received: from [82.58.50.55] (host55-50-dynamic.58-82-r.retail.telecomitalia.it. [82.58.50.55]) by mx.google.com with ESMTPS id v15sm4280726eem.1.2012.03.15.01.23.21 (version=SSLv3 cipher=OTHER); Thu, 15 Mar 2012 01:23:22 -0700 (PDT) Message-ID: <4F61A6F8.2080007@gmail.com> Date: Thu, 15 Mar 2012 09:23:20 +0100 From: Stefano Lattarini MIME-Version: 1.0 To: Steven Drake Subject: Re: bug#10995: am__py_compile dose not get added to Makefile.in's References: <4F5DDC7F.3070507@gmail.com> In-Reply-To: Content-Type: multipart/mixed; boundary="------------070404060300060003030203" X-Spam-Score: -2.6 (--) X-Debbugs-Envelope-To: 10995 Cc: 10995@debbugs.gnu.org, "automake-patches@gnu.org" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -2.6 (--) This is a multi-part message in MIME format. --------------070404060300060003030203 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit tags 10995 patch close 10995 thanks On 03/15/2012 08:20 AM, Steven Drake wrote: > > Its possible to tell that it doesn't get defined by the line in 'install.log': > "/bin/sh: line 15: --destdir: command not found" > > The problem goes away if the attached patch is applied. > Thanks, I can now reproduce the issue, and I agree yours is the right fix. I've thus applied (to maint) a patch in my name exposing the bug in the automake testsuite, and a patch in your name fixing it (see attachements). I've then merged maint into branch-1.11 and master. Best regards, and thanks, Stefano --------------070404060300060003030203 Content-Type: text/x-diff; name="0001-python-expose-automake-bug-10995.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-python-expose-automake-bug-10995.patch" >From 463b6405380ac3ff266f980d30cfeeb55eb796ee Mon Sep 17 00:00:00 2001 Message-Id: <463b6405380ac3ff266f980d30cfeeb55eb796ee.1331799265.git.stefano.lattarini@gmail.com> From: Stefano Lattarini Date: Thu, 15 Mar 2012 09:00:12 +0100 Subject: [PATCH 1/2] python: expose automake bug#10995 * tests/python.test: Expose the bug in grepping tests. * tests/python-noinst.test: New functional test to expose the bug. * tests/list-of-tests.mk: Add it. * tests/Makefile.am (XFAIL_TESTS): Add the new test and the extended one. * THANKS: Update. Signed-off-by: Stefano Lattarini --- THANKS | 1 + tests/Makefile.am | 2 + tests/list-of-tests.mk | 1 + tests/python-pr10995.test | 60 +++++++++++++++++++++++++++++++++++++++++++++ tests/python.test | 11 ++++++- 5 files changed, 73 insertions(+), 2 deletions(-) create mode 100755 tests/python-pr10995.test diff --git a/THANKS b/THANKS index 418ad71..8363126 100644 --- a/THANKS +++ b/THANKS @@ -340,6 +340,7 @@ Stefano Lattarini stefano.lattarini@gmail.com Stepan Kasal kasal@math.cas.cz Steve M. Robbins steve@nyongwa.montreal.qc.ca Steve Goetze goetze@dovetail.com +Steven Drake sbd@NetBSD.org Steven G. Johnson stevenj@alum.mit.edu Sven Verdoolaege skimo@kotnet.org Tamara L. Dahlgren dahlgren1@llnl.gov diff --git a/tests/Makefile.am b/tests/Makefile.am index 9cac904..005a1de 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -30,6 +30,8 @@ java-nobase.test \ objext-pr10128.test \ pr8365-remake-timing.test \ lex-subobj-nodep.test \ +python.test \ +python-pr10995.test \ remake-am-pr10111.test \ remake-m4-pr10111.test \ txinfo5.test diff --git a/tests/list-of-tests.mk b/tests/list-of-tests.mk index 0ee0711..b5a604c 100644 --- a/tests/list-of-tests.mk +++ b/tests/list-of-tests.mk @@ -728,6 +728,7 @@ python9.test \ python10.test \ python11.test \ python12.test \ +python-pr10995.test \ recurs.test \ recurs2.test \ remake.test \ diff --git a/tests/python-pr10995.test b/tests/python-pr10995.test new file mode 100755 index 0000000..1b94cf9 --- /dev/null +++ b/tests/python-pr10995.test @@ -0,0 +1,60 @@ +#! /bin/sh +# Copyright (C) 2012 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Test automake bug#10995: am__py_compile doesn't get correctly defined +# when there a 'noinst_PYTHON' declaration precedes a 'foo_PYTHON' +# declaration. + +required=python +. ./defs || Exit 1 + +set -e + +cat >>configure.in <<'EOF' +AM_PATH_PYTHON +AC_OUTPUT +EOF + +cat > Makefile.am <<'END' +yesinstdir = $(prefix)/py +noinst_PYTHON = no.py +yesinst_PYTHON = yes.py +disttest: distdir + test -f $(distdir)/no.py + test -f $(distdir)/yes.py +END + +echo 'def foo(): return 1' > yes.py +# no.py shouldn't be byte-compiled, so lets make it syntactically invalid. +echo 'if' > no.py + +$ACLOCAL +$AUTOCONF +$AUTOMAKE --add-missing +test -f py-compile + +inst=`pwd`/inst + +./configure --prefix="$inst" +$MAKE install +test -f "$inst/py/yes.py" +test -f "$inst/py/yes.pyc" +test ! -f "$inst/py/no.py" +test ! -f "$inst/py/no.pyc" + +$MAKE disttest + +: diff --git a/tests/python.test b/tests/python.test index e7a6984..fe9d593 100755 --- a/tests/python.test +++ b/tests/python.test @@ -34,16 +34,23 @@ mydir = ${prefix} my_PYTHON = d.py END +# For automake bug#10995. +cat > Makefile3.am << 'END' +noinst_PYTHON = un.py +python_PYTHON = in.py +END + $ACLOCAL $AUTOMAKE -a test -f py-compile $AUTOMAKE Makefile2 +$AUTOMAKE Makefile3 -grep "py" Makefile.in Makefile2.in # For debugging. +grep "py" Makefile.in Makefile2.in Makefile3.in # For debugging. -for f in Makefile.in Makefile2.in; do +for f in Makefile.in Makefile2.in Makefile3.in; do test `grep -c '^py_compile =' $f` -eq 1 test `grep -c '^am__py_compile =' $f` -eq 1 done -- 1.7.9 --------------070404060300060003030203 Content-Type: text/x-diff; name="0002-python-avoid-failures-due-to-am__py_compile-being-un.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0002-python-avoid-failures-due-to-am__py_compile-being-un.pa"; filename*1="tch" >From 819005ae2c86c3ef4b77bea7176bb6d8b67ebd64 Mon Sep 17 00:00:00 2001 Message-Id: <819005ae2c86c3ef4b77bea7176bb6d8b67ebd64.1331799265.git.stefano.lattarini@gmail.com> In-Reply-To: <463b6405380ac3ff266f980d30cfeeb55eb796ee.1331799265.git.stefano.lattarini@gmail.com> References: <463b6405380ac3ff266f980d30cfeeb55eb796ee.1331799265.git.stefano.lattarini@gmail.com> From: Steven Drake Date: Thu, 15 Mar 2012 09:12:00 +0100 Subject: [PATCH 2/2] python: avoid failures due to $(am__py_compile) being undefined Fixes automake bug#10995, introduced in commit v1.11-372-gb46debf. * lib/am/python.am: Move the definition of 'am__py_compile' to ensure it is always emitted in the output Makefile.in. Previously, this wouldn't have happened if the input Makefile.am contained a 'noinst_PYTHON' declaration before a 'python_PYTHON' one. * tests/Makefile.am (XFAIL_TESTS): Remove 'python-pr10995.test' and 'python.test'. * NEWS: Update. Copyright-paperwork-exempt: yes Signed-off-by: Stefano Lattarini --- NEWS | 3 +++ lib/am/python.am | 6 +++--- tests/Makefile.am | 2 -- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 3a6d2c4..b998ce4 100644 --- a/NEWS +++ b/NEWS @@ -129,6 +129,9 @@ Bugs fixed in 1.11.0a: - Automake now correctly recognizes the prefix/primary combination `pkglibexec_SCRIPTS' as valid. + - A definition of 'noinst_PYTHON' before 'python_PYTHON' (or similar) + don't cause spurious failures upon "make install" anymore. + * Bugs introduced by 1.11: - The parallel-tests harness doesn't trip anymore on sed implementations diff --git a/lib/am/python.am b/lib/am/python.am index 427c95d..bb2748c 100644 --- a/lib/am/python.am +++ b/lib/am/python.am @@ -1,6 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1999, 2001, 2003, 2004, 2006, 2007, 2008, 2009, 2011 -## Free Software Foundation, Inc. +## Copyright (C) 1999-2012 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -19,12 +18,13 @@ if %?INSTALL% include inst-vars.am endif %?INSTALL% +?FIRST?am__py_compile = PYTHON=$(PYTHON) $(SHELL) $(py_compile) + ## ------------ ## ## Installing. ## ## ------------ ## if %?INSTALL% -?FIRST?am__py_compile = PYTHON=$(PYTHON) $(SHELL) $(py_compile) am__installdirs += "$(DESTDIR)$(%NDIR%dir)" .PHONY install-%EXEC?exec:data%-am: install-%DIR%PYTHON install-%DIR%PYTHON: $(%DIR%_PYTHON) diff --git a/tests/Makefile.am b/tests/Makefile.am index 005a1de..9cac904 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -30,8 +30,6 @@ java-nobase.test \ objext-pr10128.test \ pr8365-remake-timing.test \ lex-subobj-nodep.test \ -python.test \ -python-pr10995.test \ remake-am-pr10111.test \ remake-m4-pr10111.test \ txinfo5.test -- 1.7.9 --------------070404060300060003030203-- From unknown Sat Jun 21 03:22:50 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 12 Apr 2012 11:24:03 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator