From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6857 invoked by alias); 11 May 2012 10:30:31 -0000 Received: (qmail 6845 invoked by uid 22791); 11 May 2012 10:30:30 -0000 X-SWARE-Spam-Status: No, hits=-6.9 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,TW_GC,TW_IB,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 11 May 2012 10:30:14 +0000 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q4BAUDhQ031864 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 11 May 2012 06:30:13 -0400 Received: from zebedee.pink (ovpn-113-135.phx2.redhat.com [10.3.113.135]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q4BAPkv2019357; Fri, 11 May 2012 06:25:47 -0400 Message-ID: <4FACE92A.4070509@redhat.com> Date: Fri, 11 May 2012 10:30:00 -0000 From: Andrew Haley User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:11.0) Gecko/20120329 Thunderbird/11.0.1 MIME-Version: 1.0 To: GCJ-patches CC: sbd@NetBSD.org Subject: Fwd: Fix the java-home OS include directory. References: In-Reply-To: X-Forwarded-Message-Id: Content-Type: multipart/mixed; boundary="------------010403060904090404010004" X-IsSubscribed: yes Mailing-List: contact java-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: java-patches-owner@gcc.gnu.org X-SW-Source: 2012-q2/txt/msg00018.txt.bz2 This is a multi-part message in MIME format. --------------010403060904090404010004 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-length: 45 I don't understand this. Comments? Andrew. --------------010403060904090404010004 Content-Type: message/rfc822; name="Fix the java-home OS include directory_.eml" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="Fix the java-home OS include directory_.eml" Content-length: 6122 Return-Path: gcc-patches-return-318291-aph=redhat.com@gcc.gnu.org Received: from zmta03.collab.prod.int.phx2.redhat.com (LHLO zmta03.collab.prod.int.phx2.redhat.com) (10.5.5.33) by zmail15.collab.prod.int.phx2.redhat.com with LMTP; Sun, 6 May 2012 21:22:12 -0400 (EDT) Received: from localhost (localhost.localdomain [127.0.0.1]) by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id B22E1F0843 for ; Sun, 6 May 2012 21:22:12 -0400 (EDT) Authentication-Results: zmta03.collab.prod.int.phx2.redhat.com (amavisd-new); dkim=softfail (fail, message has been altered) header.i=@gcc.gnu.org Authentication-Results: zmta03.collab.prod.int.phx2.redhat.com (amavisd-new); domainkeys=softfail (fail, message has been altered) header.sender=gcc-patches-owner@gcc.gnu.org Received: from zmta03.collab.prod.int.phx2.redhat.com ([127.0.0.1]) by localhost (zmta03.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dDq+qJZfmvtZ for ; Sun, 6 May 2012 21:22:12 -0400 (EDT) Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 9C290F00A0 for ; Sun, 6 May 2012 21:22:12 -0400 (EDT) Received: from mx1.redhat.com (ext-mx11.extmail.prod.ext.phx2.redhat.com [10.5.110.16]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q471MC6E020775 for ; Sun, 6 May 2012 21:22:12 -0400 Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by mx1.redhat.com (8.14.4/8.14.4) with SMTP id q471MBdg006267 for ; Sun, 6 May 2012 21:22:12 -0400 Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1336958532; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Date: From:To:Subject:Message-ID:User-Agent:MIME-Version:Content-Type: Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:Sender:Delivered-To; bh=2VXTWRaaCWZlZvtoMbml QwaBgtY=; b=BYBiYyTjAjjGY6k6JP/Mg74bFMa0lzOwUQja5e60xI4Nwkeeg+aP 8J2VYiR5q8N9iM0nrbA1h1jNdqx2+15nDTZSnKP92k1D13T7X0lofxctciQtQHdT 0fzYwtI2Ha+oQCSFZ/MFD4hsh8ic8Hhdp77100aRWZdSDWEA2wTFyHc= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Date:From:To:Subject:Message-ID:User-Agent:MIME-Version:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=w1mlu29QKNVr1CdofgiheoGB67me4O6tQyH6jfGoKasmJCQhlYqVuu3xwc86bg bnAPVGFTb1DhWDYpFGKxKMdZ+kyem1kn6iPjzjblpr/yFd2BkLeleN9IQWxospvE tc6wSBHj5MbU8awSU7uuG1YT7oY33Eo9FwkEXIM8gnuyw=; Received: (qmail 12963 invoked by alias); 7 May 2012 01:22:05 -0000 Received: (qmail 12947 invoked by uid 22791); 7 May 2012 01:22:04 -0000 X-SWARE-Spam-Status: No, hits=-4.1 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,RCVD_IN_DNSWL_LOW,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL,TW_GC,TW_IB X-Spam-Check-By: sourceware.org Received: from atlas.wxnz.net (HELO atlas.wxnz.net) (58.28.6.122) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 07 May 2012 01:21:51 +0000 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 CBF8A2D8E0D for ; Mon, 7 May 2012 13:21:47 +1200 (NZST) Date: Mon, 7 May 2012 13:21:49 +1200 (NZST) From: Steven Drake To: gcc-patches@gcc.gnu.org Subject: Fix the java-home OS include directory. Message-ID: User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII 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 X-RedHat-Spam-Score: -2.192 (DKIM_SIGNED,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS,T_DKIM_INVALID) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Scanned-By: MIMEDefang 2.68 on 10.5.110.16 Content-length: 1595 If the libjava configure option --enable-java-home is used the os directory under include will always be 'linux' as it is hardcoded so. I.E. it is not configurable using '--with-os-directory' or auto-detected as suggested by the configure help text. -- Steven 2012-05-07 Steven Drake libjava: * Makefile.am (install-data-local): Use the $(OS) variable for the java-home os directory under include. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 1b71962..b40fa76 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -899,7 +899,7 @@ if CREATE_JAVA_HOME cd $(DESTDIR)$(JRE_LIB_DIR)/security; \ ln -sf $$RELATIVE/classpath.security java.security; \ cd $$working_dir; \ - $(mkinstalldirs) $(DESTDIR)$(SDK_INCLUDE_DIR)/linux; \ + $(mkinstalldirs) $(DESTDIR)$(SDK_INCLUDE_DIR)/$(OS); \ $(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/client; \ $(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server; \ $(mkinstalldirs) $(DESTDIR)$(SDK_LIB_DIR); \ @@ -935,9 +935,9 @@ if CREATE_JAVA_HOME DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/`echo gcj | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \ -print-file-name=include/$$headername.h)); \ RELATIVE=$$(relative $$DIRECTORY \ - $(DESTDIR)$(SDK_INCLUDE_DIR)/linux); \ + $(DESTDIR)$(SDK_INCLUDE_DIR)/$(OS)); \ ln -sf $$RELATIVE/$$headername.h \ - $(DESTDIR)$(SDK_INCLUDE_DIR)/linux/$$headername.h; \ + $(DESTDIR)$(SDK_INCLUDE_DIR)/$(OS)/$$headername.h; \ done; \ RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \ $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)); --------------010403060904090404010004--