From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 12 05:12:39 2012 Received: (at submit) by debbugs.gnu.org; 12 Apr 2012 09:12:39 +0000 Received: from localhost ([127.0.0.1]:53269 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SIG51-0004o7-3w for submit@debbugs.gnu.org; Thu, 12 Apr 2012 05:12:39 -0400 Received: from eggs.gnu.org ([208.118.235.92]:55961) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SIG4z-0004o0-1X for submit@debbugs.gnu.org; Thu, 12 Apr 2012 05:12:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SIG3j-0008Bl-8l for submit@debbugs.gnu.org; Thu, 12 Apr 2012 05:11:24 -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,HTML_MESSAGE, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.2 Received: from lists.gnu.org ([208.118.235.17]:53570) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SIG3j-0008Bg-5L for submit@debbugs.gnu.org; Thu, 12 Apr 2012 05:11:19 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40982) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SIG3c-0002QI-Qy for bug-automake@gnu.org; Thu, 12 Apr 2012 05:11:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SIG3X-0008Ag-Py for bug-automake@gnu.org; Thu, 12 Apr 2012 05:11:12 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:49711) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SIG3X-0008AY-Eb for bug-automake@gnu.org; Thu, 12 Apr 2012 05:11:07 -0400 X-Originating-IP: 217.70.178.138 Received: from mfilter9-d.gandi.net (mfilter9-d.gandi.net [217.70.178.138]) by relay4-d.mail.gandi.net (Postfix) with ESMTP id 68CD717209C for ; Thu, 12 Apr 2012 11:11:05 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter9-d.gandi.net Received: from relay4-d.mail.gandi.net ([217.70.183.196]) by mfilter9-d.gandi.net (mfilter9-d.gandi.net [10.0.15.180]) (amavisd-new, port 10024) with ESMTP id DNzUWq8YmJHP for ; Thu, 12 Apr 2012 11:11:04 +0200 (CEST) X-Originating-IP: 209.85.217.169 Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com [209.85.217.169]) (Authenticated sender: sendmail@perennou.com) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 8C59817209F for ; Thu, 12 Apr 2012 11:11:03 +0200 (CEST) Received: by lbao2 with SMTP id o2so1576384lba.0 for ; Thu, 12 Apr 2012 02:11:01 -0700 (PDT) Received: by 10.152.125.41 with SMTP id mn9mr1435420lab.30.1334221861173; Thu, 12 Apr 2012 02:11:01 -0700 (PDT) MIME-Version: 1.0 Received: by 10.152.5.138 with HTTP; Thu, 12 Apr 2012 02:10:39 -0700 (PDT) From: Marc-Antoine Perennou Date: Thu, 12 Apr 2012 11:10:39 +0200 Message-ID: Subject: [Patch] Distcheck is broken for C/Vala mixed projects To: bug-automake@gnu.org Content-Type: multipart/mixed; boundary=f46d042f92881637f604bd77bc51 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-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 (------) --f46d042f92881637f604bd77bc51 Content-Type: multipart/alternative; boundary=f46d042f92881637f304bd77bc4f --f46d042f92881637f304bd77bc4f Content-Type: text/plain; charset=UTF-8 If a project has a single Makefile.am referrencing C and Vala projects, distcheck currenly fails telling there are no source files for generating stamps for C-only binaries. Attached patch avoid dealing with vala stuff for binaries not related to vala insice C/Vala mixed project + adds a test for it --f46d042f92881637f304bd77bc4f Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable If a project has a single Makefile.am referrencing C and Vala projects, dis= tcheck currenly fails telling there are no source files for generating stam= ps for C-only binaries.
Attached patch avoid dealing with vala stuff for= binaries not related to vala insice C/Vala mixed project + adds a test for= it
--f46d042f92881637f304bd77bc4f-- --f46d042f92881637f604bd77bc51 Content-Type: application/octet-stream; name="0001-vala-fix-distcheck-with-c-vala-mixed-projects.patch" Content-Disposition: attachment; filename="0001-vala-fix-distcheck-with-c-vala-mixed-projects.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_h0xl6ocu0 RnJvbSA5YWQ3MDAyZGIwMWIwMzU0ODFmNTkwOWY3MDJlOWQxYTA5NWI0YTc1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJjLUFudG9pbmUgUGVyZW5ub3UgPE1hcmMtQW50b2luZUBQ ZXJlbm5vdS5jb20+CkRhdGU6IFRodSwgMTIgQXByIDIwMTIgMTE6MDY6MDEgKzAyMDAKU3ViamVj dDogW1BBVENIXSB2YWxhOiBmaXggZGlzdGNoZWNrIHdpdGggYy92YWxhIG1peGVkIHByb2plY3Rz CgpTaWduZWQtb2ZmLWJ5OiBNYXJjLUFudG9pbmUgUGVyZW5ub3UgPE1hcmMtQW50b2luZUBQZXJl bm5vdS5jb20+Ci0tLQogYXV0b21ha2UuaW4gICAgICAgICB8ICAgIDUgKysrKysKIHRlc3RzL3Zh bGEtbWl4LnRlc3QgfCAgIDEwICsrKysrKysrKy0KIDIgZmlsZXMgY2hhbmdlZCwgMTQgaW5zZXJ0 aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2F1dG9tYWtlLmluIGIvYXV0b21h a2UuaW4KaW5kZXggMjkxYjM2NC4uNDg1MjdlNSAxMDA2NDQKLS0tIGEvYXV0b21ha2UuaW4KKysr IGIvYXV0b21ha2UuaW4KQEAgLTU4MjAsNiArNTgyMCwxMSBAQCBzdWIgbGFuZ192YWxhX2Zpbmlz aF90YXJnZXQgKCQkKQogCiAgIG15IEB2YWxhX3NvdXJjZXMgPSBncmVwIHsgL1wuKHZhbGF8dmFw aSkkLyB9ICgkdmFyLT52YWx1ZV9hc19saXN0X3JlY3Vyc2l2ZSk7CiAKKyAgaWYgKCEgQHZhbGFf c291cmNlcykKKyAgeworICAgIHJldHVybjsKKyAgfQorCiAgIGZvcmVhY2ggbXkgJHZhbGFfZmls ZSAoQHZhbGFfc291cmNlcykKICAgICB7CiAgICAgICBteSAkY19maWxlID0gJHZhbGFfZmlsZTsK ZGlmZiAtLWdpdCBhL3Rlc3RzL3ZhbGEtbWl4LnRlc3QgYi90ZXN0cy92YWxhLW1peC50ZXN0Cmlu ZGV4IDU4YWI1MDAuLmM5MTg4NTUgMTAwNzU1Ci0tLSBhL3Rlc3RzL3ZhbGEtbWl4LnRlc3QKKysr IGIvdGVzdHMvdmFsYS1taXgudGVzdApAQCAtMjcsMTIgKzI3LDEzIEBAIEFDX09VVFBVVAogRU5E CiAKIGNhdCA+IE1ha2VmaWxlLmFtIDw8J0VORCcKLWJpbl9QUk9HUkFNUyA9IHphcmRveiBtdQor YmluX1BST0dSQU1TID0gemFyZG96IG11IGJhegogQU1fVkFMQUZMQUdTID0gLS1wcm9maWxlPXBv c2l4CiB6YXJkb3pfU09VUkNFUyA9IGZvby52YWxhIGJhci5jCiBtdV9TT1VSQ0VTID0gMS52YWxh IDIuYwogbXVfVkFMQUZMQUdTID0gJChBTV9WQUxBRkxBR1MpIC0tbWFpbj1ydW4KIG11X0NGTEFH UyA9IC1ESEFWRV9NVQorYmF6X1NPVVJDRVMgPSBiYXouYwogRU5ECiAKIGlmIGNyb3NzX2NvbXBp bGluZzsgdGhlbiA6OyBlbHNlCkBAIC03Miw2ICs3MywxMyBAQCBjaG9ja2UgbWUKICNlbmRpZgog RU5ECiAKK2NhdCA+IGJhei5jIDw8J0VORCcKK2ludCBtYWluICgpCit7CisgIHJldHVybiAwOwor fQorRU5ECisKICRBQ0xPQ0FMCiAkQVVUT01BS0UgLWEKICRBVVRPQ09ORgotLSAKMS43LjkuMS4y NDQuZ2IwZDY2Yi5kaXJ0eQoK --f46d042f92881637f604bd77bc51-- From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 12 08:27:10 2012 Received: (at 11229-done) by debbugs.gnu.org; 12 Apr 2012 12:27:10 +0000 Received: from localhost ([127.0.0.1]:53442 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SIJ7G-0001m8-CK for submit@debbugs.gnu.org; Thu, 12 Apr 2012 08:27:10 -0400 Received: from mail-bk0-f44.google.com ([209.85.214.44]:36954) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SIJ7D-0001lx-2N for 11229-done@debbugs.gnu.org; Thu, 12 Apr 2012 08:27:08 -0400 Received: by bkuw5 with SMTP id w5so1438586bku.3 for <11229-done@debbugs.gnu.org>; Thu, 12 Apr 2012 05:25:53 -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=GpxioErbHbl+LgblIql4nec4ebZiBjWAn+zdqxok97E=; b=EqmYaa4oPR6mb2y9P6wW0hLNa5+Gn+lFfn4twK4OqmjOvIf61w0tqgLBgmmIeTvVza ev7lacLa4+pRoD+WnO5kQywsnMnXLUVsH/sctD3/sPE7IdrB81tA/22xeeff8Rluxp2b 8qdX535RjNPFSlAcHvK5Ogd0uhpUbmGSIw1XZylReRTHUSPujweCx8lWM+9clcBh4D0h hmzzS+9elwSyPA5B8stXJB2X8yXQDeBpfxda3NSrotIttI8VHdpwTmQnYK68fK27gDqu Qf1Lw2lIXKUax9Tq+RJJdTNn8AbrnaeDrxL7xhwbNpUhv1hI4CKtyWFMi+soJLz9b24O iwlA== Received: by 10.204.132.72 with SMTP id a8mr670967bkt.42.1334233553622; Thu, 12 Apr 2012 05:25:53 -0700 (PDT) Received: from [87.8.100.144] (host144-100-dynamic.8-87-r.retail.telecomitalia.it. [87.8.100.144]) by mx.google.com with ESMTPS id hk7sm10704065bkc.2.2012.04.12.05.25.51 (version=SSLv3 cipher=OTHER); Thu, 12 Apr 2012 05:25:52 -0700 (PDT) Message-ID: <4F86C9CD.7010405@gmail.com> Date: Thu, 12 Apr 2012 14:25:49 +0200 From: Stefano Lattarini MIME-Version: 1.0 To: Marc-Antoine Perennou Subject: Re: bug#11229: [Patch] Distcheck is broken for C/Vala mixed projects References: In-Reply-To: Content-Type: multipart/mixed; boundary="------------090900040204070800050009" X-Spam-Score: -2.6 (--) X-Debbugs-Envelope-To: 11229-done Cc: 11229-done@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. --------------090900040204070800050009 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit [Adding automake-patches] Reference: On 04/12/2012 11:10 AM, Marc-Antoine Perennou wrote: > If a project has a single Makefile.am referrencing C and Vala projects, > distcheck currenly fails telling there are no source files for generating > stamps for C-only binaries. > Attached patch avoid dealing with vala stuff for binaries not related to > vala insice C/Vala mixed project + adds a test for it > Thanks! I've applied the patch in your name with minor stylistic changes (see attachment). I'm thus fixing this bug report. Best regards, Stefano --------------090900040204070800050009 Content-Type: text/x-diff; name="0001-vala-fix-distcheck-with-c-vala-mixed-projects.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-vala-fix-distcheck-with-c-vala-mixed-projects.patch" >From c12161817a71b7ab5410896294ac44254e002d3b Mon Sep 17 00:00:00 2001 Message-Id: From: Marc-Antoine Perennou Date: Thu, 12 Apr 2012 13:32:58 +0200 Subject: [PATCH] vala: fix distcheck with c/vala mixed projects Fixes automake bug#11229. * automake.in (lang_vala_finish_target): Return early if the current '_SOURCES' variable does not contain any '.vala' nor '.vapi' source. Otherwise, the vala compiler will be called without arguments, causing an error. * tests/vala-mix.test: Enhance to catch the fixed bug. Copyright-paperwork-exempt: yes Signed-off-by: Marc-Antoine Perennou Signed-off-by: Stefano Lattarini --- automake.in | 3 +++ tests/vala-mix.test | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/automake.in b/automake.in index 08b3300..836680a 100644 --- a/automake.in +++ b/automake.in @@ -6041,6 +6041,9 @@ sub lang_vala_finish_target ($$) my @vala_sources = grep { /\.vala$/ } ($var->value_as_list_recursive); + # For automake bug#11229. + return unless @vala_sources; + foreach my $vala_file (@vala_sources) { (my $c_file = $vala_file) =~ s/(.*)\.vala$/$1.c/; diff --git a/tests/vala-mix.test b/tests/vala-mix.test index 012b36a..fe48f26 100755 --- a/tests/vala-mix.test +++ b/tests/vala-mix.test @@ -29,12 +29,13 @@ AC_OUTPUT END cat > Makefile.am <<'END' -bin_PROGRAMS = zardoz mu +bin_PROGRAMS = zardoz mu baz AM_VALAFLAGS = --profile=posix zardoz_SOURCES = foo.vala bar.c mu_SOURCES = 1.vala 2.c mu_VALAFLAGS = $(AM_VALAFLAGS) --main=run mu_CFLAGS = -DHAVE_MU +baz_SOURCES = baz.c END if cross_compiling; then :; else @@ -74,6 +75,14 @@ chocke me #endif END +# For automake bug#11229. +cat > baz.c <<'END' +int main (void) +{ + return 0; +} +END + $ACLOCAL $AUTOMAKE -a $AUTOCONF -- 1.7.9.5 --------------090900040204070800050009 Content-Type: text/x-diff; name="0001-vala-fix-distcheck-with-c-vala-mixed-projects.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-vala-fix-distcheck-with-c-vala-mixed-projects.patch" >From c12161817a71b7ab5410896294ac44254e002d3b Mon Sep 17 00:00:00 2001 Message-Id: From: Marc-Antoine Perennou Date: Thu, 12 Apr 2012 13:32:58 +0200 Subject: [PATCH] vala: fix distcheck with c/vala mixed projects Fixes automake bug#11229. * automake.in (lang_vala_finish_target): Return early if the current '_SOURCES' variable does not contain any '.vala' nor '.vapi' source. Otherwise, the vala compiler will be called without arguments, causing an error. * tests/vala-mix.test: Enhance to catch the fixed bug. Copyright-paperwork-exempt: yes Signed-off-by: Marc-Antoine Perennou Signed-off-by: Stefano Lattarini --- automake.in | 3 +++ tests/vala-mix.test | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/automake.in b/automake.in index 08b3300..836680a 100644 --- a/automake.in +++ b/automake.in @@ -6041,6 +6041,9 @@ sub lang_vala_finish_target ($$) my @vala_sources = grep { /\.vala$/ } ($var->value_as_list_recursive); + # For automake bug#11229. + return unless @vala_sources; + foreach my $vala_file (@vala_sources) { (my $c_file = $vala_file) =~ s/(.*)\.vala$/$1.c/; diff --git a/tests/vala-mix.test b/tests/vala-mix.test index 012b36a..fe48f26 100755 --- a/tests/vala-mix.test +++ b/tests/vala-mix.test @@ -29,12 +29,13 @@ AC_OUTPUT END cat > Makefile.am <<'END' -bin_PROGRAMS = zardoz mu +bin_PROGRAMS = zardoz mu baz AM_VALAFLAGS = --profile=posix zardoz_SOURCES = foo.vala bar.c mu_SOURCES = 1.vala 2.c mu_VALAFLAGS = $(AM_VALAFLAGS) --main=run mu_CFLAGS = -DHAVE_MU +baz_SOURCES = baz.c END if cross_compiling; then :; else @@ -74,6 +75,14 @@ chocke me #endif END +# For automake bug#11229. +cat > baz.c <<'END' +int main (void) +{ + return 0; +} +END + $ACLOCAL $AUTOMAKE -a $AUTOCONF -- 1.7.9.5 --------------090900040204070800050009-- From unknown Fri Jun 20 07:15:31 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 11 May 2012 11:24:04 +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