Patchwork Move Graphite from using PPL over to ISL

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

Comments

Richard Guenther - July 6, 2012, 12:54 p.m.
On Fri, 6 Jul 2012, Richard Guenther wrote:

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

And this is a patch to workaround the cloog parts.  We cannot
use $(HOST_GMPLIBS) because it includes -lmpc and -lmpfr (which
we do not depend on), and $(HOST_ISLLIBS) does not exist.

Those are cleanup opportunities.

Tested with in-tree gmp and out-of-tree gmp and committed.

Richard.

2012-07-06  Richard Guenther  <rguenther@suse.de>

	* Makefile.def (cloog): Pass $(HOST_GMPINC) and $(HOST_ISLINC)
	as CPPFLAGS, pass path to built gmp as LDFLAGS, always use
	--with-gmp=system.
	* Makefile.in: Regenerated.
	* configure: Likewise.

Patch

Index: Makefile.def
===================================================================
--- Makefile.def	(revision 189327)
+++ Makefile.def	(working copy)
@@ -66,8 +66,8 @@  host_modules= { module= isl; lib_path=.l
 		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';
-		extra_exports='CPPFLAGS="-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS; ';
+		extra_configure_flags='--disable-shared --with-gmp=system --with-bits=gmp --with-isl=system';
+		extra_exports='CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS; ';
 		extra_make_flags='CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1';
 		no_install= true; };
 host_modules= { module= libelf; lib_path=.libs; bootstrap=true;