Patchwork Move Graphite from using PPL over to ISL

login
register
mail settings
Submitter Richard Guenther
Date July 6, 2012, 12:29 p.m.
Message ID <alpine.LNX.2.00.1207061354340.17233@jbgna.fhfr.qr>
Download mbox | patch
Permalink /patch/169467/
State New
Headers show

Comments

Richard Guenther - July 6, 2012, 12:29 p.m.
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  <rguenther@suse.de>

	* 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.

Patch

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';