From owner-freebsd-ports Sun Aug 25 19:30: 9 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 88F2437B400 for ; Sun, 25 Aug 2002 19:30:03 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8FD3443E72 for ; Sun, 25 Aug 2002 19:30:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7Q2U2JU026383 for ; Sun, 25 Aug 2002 19:30:02 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7Q2U2Fn026382; Sun, 25 Aug 2002 19:30:02 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A39BD37B400 for ; Sun, 25 Aug 2002 19:25:43 -0700 (PDT) Received: from mail1.ewetel.de (mail1.ewetel.de [212.6.122.16]) by mx1.FreeBSD.org (Postfix) with ESMTP id D6DA143E6A for ; Sun, 25 Aug 2002 19:25:42 -0700 (PDT) (envelope-from frerich@frerich.ath.cx) Received: from daedalus.lan (dialin-ol-213-170-184-234.ewetel.net [213.170.184.234]) by mail1.ewetel.de (8.12.1/8.12.1) with ESMTP id g7Q2PXxJ028774 for ; Mon, 26 Aug 2002 04:25:35 +0200 (MEST) Received: by daedalus.lan (Postfix, from userid 1001) id 4A3D71064; Mon, 26 Aug 2002 04:26:25 +0200 (CEST) Message-Id: <20020826022625.4A3D71064@daedalus.lan> Date: Mon, 26 Aug 2002 04:26:25 +0200 (CEST) From: Frerich Raabe Reply-To: Frerich Raabe To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/42019: Update port: devel/distcc fix for various configure scripts Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 42019 >Category: ports >Synopsis: Update port: devel/distcc fix for various configure scripts >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Aug 25 19:30:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Frerich Raabe >Release: FreeBSD 4.6-STABLE i386 >Organization: >Environment: System: FreeBSD daedalus.lan 4.6-STABLE FreeBSD 4.6-STABLE #18: Tue Aug 20 22:09:12 CEST 2002 root@daedalus.lan:/usr/obj/usr/src/sys/SWIFT i386 >Description: libstdc++-v3's configure script (and others) execute commands such as .../xgcc -B.../ conftest.C -c -S. Assuming that xgcc invokes the distcc client, this makes the distcc client write the assembly output to conftest.o even though it should go into conftest.s. The cause of this is that distcc currently does not honour the fact that -S supersedes -c. Interestingly, if you add "-o conftest.s" to the command line, it's the distcc server that fails, claiming it couldn't find conftest.C. The attached patch (courtesy of Alexandre Oliva fixes this behaviour. >How-To-Repeat: Try to compile any program with both the "-c" and the "-S" parameters specified. >Fix: --- src/arg.c.S-beats-c 2002-08-15 10:52:41.000000000 -0300 +++ src/arg.c 2002-08-24 20:09:31.000000000 -0300 @@ -200,12 +200,13 @@ /* FIXME: This doesn't handle a.out, but that doesn't matter. */ char *ofile; - if (seen_opt_c) { - if (dcc_output_from_source(*input_file, ".o", &ofile)) - return -1; - } else if (seen_opt_s) { + /* -S takes precedence over -c. */ + if (seen_opt_s) { if (dcc_output_from_source(*input_file, ".s", &ofile)) return -1; + } else if (seen_opt_c) { + if (dcc_output_from_source(*input_file, ".o", &ofile)) + return -1; } else { rs_log_crit("this can't be happening(%d)!", __LINE__); return -1; >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message