From patchwork Fri Apr 29 10:29:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 93412 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 2E6A9B6F4F for ; Fri, 29 Apr 2011 20:30:38 +1000 (EST) Received: (qmail 5671 invoked by alias); 29 Apr 2011 10:30:02 -0000 Received: (qmail 5526 invoked by uid 22791); 29 Apr 2011 10:30:01 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from snape.CeBiTec.Uni-Bielefeld.DE (HELO smtp-relay.CeBiTec.Uni-Bielefeld.DE) (129.70.160.84) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 29 Apr 2011 10:29:45 +0000 Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id 746033A9; Fri, 29 Apr 2011 12:29:44 +0200 (CEST) Received: from smtp-relay.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1]) by localhost (malfoy.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) (amavisd-new, port 10024) with LMTP id HK3nG0XxY6nY; Fri, 29 Apr 2011 12:29:42 +0200 (CEST) Received: from manam.CeBiTec.Uni-Bielefeld.DE (manam.CeBiTec.Uni-Bielefeld.DE [129.70.161.120]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPS id C50D63A8; Fri, 29 Apr 2011 12:29:42 +0200 (CEST) Received: (from ro@localhost) by manam.CeBiTec.Uni-Bielefeld.DE (8.14.4+Sun/8.14.4/Submit) id p3TATgkO008833; Fri, 29 Apr 2011 12:29:42 +0200 (MEST) From: Rainer Orth To: Ian Lance Taylor Cc: gcc-patches@gcc.gnu.org, gofrontend-dev@googlegroups.com Subject: Re: libgo patch committed: Inherit environment in http/cgi References: Date: Fri, 29 Apr 2011 12:29:41 +0200 In-Reply-To: (Ian Lance Taylor's message of "Fri, 22 Apr 2011 11:23:50 -0700") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (usg-unix-v) MIME-Version: 1.0 X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Ian, > This libgo patch brings over a patch to the master Go library to inherit > environment variables in http/cgi. This should fix PR go/48503. not really :-) It needs the following supplement to handle Solaris and IRIX. I'm not only including LD_LIBRARY_PATH (although this would suffice for the testcase to pass), but also the ABI variants thereof. Bootstrapped without regressions on i386-pc-solaris2.11 and sparc-sun-solaris2.11. Not yet tested on mips-sgi-irix6.5, but seems pretty obvious. Rainer 2011-04-26 Rainer Orth PR go/48503 * go/http/cgi/host.go (osDefaultInheritEnv): Pass LD_LIBRARY_PATH and ABI variants on irix and solaris. diff --git a/libgo/go/http/cgi/host.go b/libgo/go/http/cgi/host.go --- a/libgo/go/http/cgi/host.go +++ b/libgo/go/http/cgi/host.go @@ -36,7 +36,9 @@ var osDefaultInheritEnv = map[string][]s "darwin": []string{"DYLD_LIBRARY_PATH"}, "freebsd": []string{"LD_LIBRARY_PATH"}, "hpux": []string{"LD_LIBRARY_PATH", "SHLIB_PATH"}, + "irix": []string{"LD_LIBRARY_PATH", "LD_LIBRARYN32_PATH", "LD_LIBRARY64_PATH"}, "linux": []string{"LD_LIBRARY_PATH"}, + "solaris": []string{"LD_LIBRARY_PATH", "LD_LIBRARY_PATH_32", "LD_LIBRARY_PATH_64"}, "windows": []string{"SystemRoot", "COMSPEC", "PATHEXT", "WINDIR"}, }