From patchwork Fri Jul 6 12:29:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 169467 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 383B42C0368 for ; Fri, 6 Jul 2012 22:29:54 +1000 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1342182596; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Date: From:To:Cc:Subject:In-Reply-To:Message-ID:References:User-Agent: MIME-Version:Content-Type:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=8YnGA2kZZgILs2lyqUVW+ONkSR8=; b=NNMqIK3DGpX0N9p 2iiztbWJ8JPwmI5ULpH25Zf35W16aNo79qH4KNsedJzw+rYPtiX7XptUbCaqdmGK oheUu8mu6EQu1w5zGOk6qey8XM2sVw/TO7zv5CtbRqERyzg9d1Bg3ZjoIT8FhU7g Ja/yfoXhiXSxdP2U6fGOsqzsWlIg= 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:Cc:Subject:In-Reply-To:Message-ID:References:User-Agent:MIME-Version:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=bB3cKfTkqXM9frRueBwKNGyYVEDXgJ8aoyjYDXYCVYVieF2kCfxwExbhVuShfm TXtA2FWhM+SGQ3vIthOXj/WPxF/H+EMYvpuvHnx4Ix80L0NkVpAHmpu9Di6YfLTj Po5EGfAzMQYzcBef8JT7d9ttU4ztq0y4jpn8g4jU1pQis=; Received: (qmail 23863 invoked by alias); 6 Jul 2012 12:29:51 -0000 Received: (qmail 23849 invoked by uid 22791); 6 Jul 2012 12:29:50 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL, BAYES_00, KAM_MX3, KHOP_RCVD_UNTRUST, KHOP_THREADED, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, URIBL_BLACK X-Spam-Check-By: sourceware.org Received: from cantor2.suse.de (HELO mx2.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 06 Jul 2012 12:29:37 +0000 Received: from relay2.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 04C41A24CA; Fri, 6 Jul 2012 14:29:35 +0200 (CEST) Date: Fri, 6 Jul 2012 14:29:34 +0200 (CEST) From: Richard Guenther To: Magnus Fromreide Cc: Tristan Gingold , Diego Novillo , gcc-patches@gcc.gnu.org, tobias@grosser.es, sebpop@gmail.com, Michael Matz Subject: Re: [PATCH] Move Graphite from using PPL over to ISL In-Reply-To: Message-ID: References: <7BDDE9BF-D731-44F4-9CD9-800514142FA2@adacore.com> <70EA4DC5-0808-429F-89E9-C38D147CA287@adacore.com> <20120704183121.GA19457@bacon.lysator.liu.se> <6916468F-1A73-43B5-A8B8-29EC39700E84@adacore.com> <20120705194427.GA25664@bacon.lysator.liu.se> User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 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 On Fri, 6 Jul 2012, Richard Guenther wrote: > Yes, I think that would be the most clean solution - unfortunately > the current setup of the toplevel hierarchy does not support this > (easily, at least). A way out would be to always claim stuff is > installed - thus, use the =system variants and add more flags to > pass through, similar to the cloog variant. There we can easily > add both source and build dir includes - but it gets very messy > easily. Ok, the following fixes ISL but keeps cloog broken (a similar approach for cloog does not work because its gmp builddir handling seems broken). Tested with and without gmp in-tree, applied. Richard. 2012-07-06 Richard Guenther * configure.ac (extra_isl_gmp_configure_flags): Initialize and subst. * Makefile.def (isl): Use extra_isl_gmp_configure_flags and supply V=1 as extra_make_flags. * configure: Regenerated. * Makefile.in: Likewise. Index: configure.ac =================================================================== --- configure.ac (revision 189311) +++ configure.ac (working copy) @@ -1341,6 +1341,7 @@ if test "x$with_gmp$with_gmp_include$wit gmpinc='-I$$r/$(HOST_SUBDIR)/gmp -I$$s/gmp '"$gmpinc" extra_mpfr_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir" extra_mpc_gmp_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir" + extra_isl_gmp_configure_flags='--with-gmp-builddir=$$r/$(HOST_SUBDIR)/gmp' # Do not test the gmp version. Assume that it is sufficient, since # it is in the source tree, and the library has not been built yet # but it would be included on the link line in the version check below @@ -1453,6 +1454,7 @@ AC_SUBST(gmpinc) AC_SUBST(extra_mpfr_configure_flags) AC_SUBST(extra_mpc_gmp_configure_flags) AC_SUBST(extra_mpc_mpfr_configure_flags) +AC_SUBST(extra_isl_gmp_configure_flags) # Allow host libstdc++ to be specified for static linking with PPL. AC_ARG_WITH(host-libstdcxx, Index: Makefile.def =================================================================== --- Makefile.def (revision 189311) +++ Makefile.def (working copy) @@ -62,7 +62,8 @@ host_modules= { module= mpc; lib_path=.l extra_configure_flags='--disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@'; no_install= true; }; host_modules= { module= isl; lib_path=.libs; bootstrap=true; - extra_configure_flags='--disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp'; + extra_configure_flags='--disable-shared @extra_isl_gmp_configure_flags@'; + extra_make_flags='V=1'; no_install= true; }; host_modules= { module= cloog; lib_path=.libs; bootstrap=true; extra_configure_flags='--disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-isl=system';