1 --- pluto-0.11.0/configure.ac.orig 2014-05-30 10:28:06.000000000 +0200
2 +++ pluto-0.11.0/configure.ac 2014-10-05 14:26:45.652660158 +0200
3 @@ -112,74 +112,6 @@ if test "$poly_cv_gmpfatal" = "yes"; the
7 -dnl Configuring PipLib (long long int is 64 bits)
9 -echo "=========================="
10 -echo "Configuring PipLib"
11 -echo "=========================="
12 -configureopts="--with-gmp \
13 ---with-gmp-prefix=$GMP_PREFIX \
17 - ./configure ${configureopts} ${archopts}
21 -dnl Configuring Openscop
23 -echo "=========================="
24 -echo "Configuring Openscop"
25 -echo "=========================="
26 -configureopts="--with-gmp=system \
27 ---with-gmp-prefix=$GMP_PREFIX \
30 - ./configure ${configureopts} ${archopts}
34 -dnl Configuring Clan-osl
36 -echo "=========================="
37 -echo "Configuring Clan"
38 -echo "=========================="
39 -configureopts="--prefix=$prefix \
41 ---with-osl-builddir=$SOURCE_DIR/openscop"
43 - ./configure ${configureopts} ${archopts}
47 -dnl Configuring Candl-osl
48 -dnl can't enable the gmp version without modifying
49 -dnl the precision the is used elsewhere in pluto
51 -echo "=========================="
52 -echo "Configuring Candl"
53 -echo "=========================="
54 -configureopts="--enable-llint-version \
56 ---with-piplib=build \
57 ---with-piplib-builddir=$SOURCE_DIR/piplib \
59 ---with-osl-builddir=$SOURCE_DIR/openscop"
61 - ./configure ${configureopts} ${archopts}
65 -dnl Configuring polylib
67 -echo "======================"
68 -echo "Configuring polylib"
69 -echo "======================"
70 -configureopts="--enable-longlongint-lib \
73 - ./configure ${configureopts}
78 @@ -219,32 +151,6 @@ configureopts="--with-gmp=system \
82 -dnl Configuring Cloog 0.14.1 (long long int)
84 -echo "=========================="
85 -echo "Configuring Cloog-isl"
86 -echo "=========================="
87 -if test x$external_isl = xfalse; then
88 -configureopts="--with-isl=build \
89 ---with-isl-builddir=$SOURCE_DIR/isl \
91 ---with-gmp-prefix=$GMP_PREFIX \
93 ---with-osl-builddir=$SOURCE_DIR/openscop \
96 -configureopts="--with-isl=system \
97 ---with-isl-prefix=$isl_prefix \
99 ---with-gmp-prefix=$GMP_PREFIX \
101 ---with-osl-builddir=$SOURCE_DIR/openscop \
105 - ./configure ${configureopts} ${archopts}
108 AC_PATH_PROGS(BASH, bash)
110 AC_CONFIG_FILES([getversion.sh], [chmod +x ./getversion.sh])
111 --- pluto-0.11.0/Makefile.am.orig 2014-05-30 10:28:06.000000000 +0200
112 +++ pluto-0.11.0/Makefile.am 2014-10-05 15:40:59.042473155 +0200
117 -SUBDIRS = piplib openscop clan candl polylib $(MAY_ISL) cloog-isl src
120 ACLOCAL_AMFLAGS = -I m4
122 --- pluto-0.11.0/src/Makefile.am.orig 2014-05-30 10:28:07.000000000 +0200
123 +++ pluto-0.11.0/src/Makefile.am 2014-10-05 15:51:12.572447520 +0200
126 pluto_SOURCES = constraints.c constraints_polylib.c constraints_isl.c math_support.c ddg.c transforms.c pluto.c post_transform.c framework.c pluto_codegen_if.c polyloop.c ast_transform.c main.c constraints.h math_support.h pluto.h program.c program.h tile.c unit_tests.c
127 pluto_CPPFLAGS = -O3 -funroll-loops -fopenmp \
128 - -DSCOPLIB_INT_T_IS_LONGLONG -DCLOOG_INT_GMP \
130 - -I../piplib/include \
131 - -I../clan/include \
133 - -I../cloog-isl/include \
134 - -I../openscop/include \
135 - -I../candl/include \
136 - -I../polylib/include
137 + -DSCOPLIB_INT_T_IS_MP -DCLOOG_INT_GMP \
140 -pluto_LDFLAGS = -static -fopenmp
141 +pluto_LDFLAGS = -fopenmp
143 - ../piplib/libpiplib64.la \
144 - ../openscop/libosl.la \
145 - ../clan/libclan.la \
146 - ../cloog-isl/libcloog-isl.la \
148 - ../polylib/libpolylib64.la \
149 - ../candl/libcandl.la \
150 + -lpiplibMP -losl -lclan -lcloog-isl -lisl -lpolylibgmp -lcandl -lgmp \
153 lib_LTLIBRARIES = libpluto.la
155 # libpluto doesn't use polylib-based functions
156 libpluto_la_SOURCES = constraints.c constraints_isl.c math_support.c ddg.c transforms.c pluto.c post_transform.c framework.c polyloop.c libpluto.c constraints.h math_support.h pluto.h program.c program.h tile.c
157 libpluto_la_CPPFLAGS = -O3 -funroll-loops -fopenmp \
158 - -DSCOPLIB_INT_T_IS_LONGLONG -DCLOOG_INT_GMP \
160 - -I../piplib/include \
161 - -I../clan/include \
162 - -I../openscop/include \
163 - -I../candl/include \
164 - -I../cloog-isl/include \
166 + -DSCOPLIB_INT_T_IS_MP -DCLOOG_INT_GMP \
169 # libpluto doesn't use polylib
170 libpluto_la_LIBADD = \
171 - ../piplib/libpiplib64.la \
172 - ../openscop/libosl.la \
173 - ../clan/libclan.la \
174 - ../candl/libcandl.la \
176 + -lpiplibMP -losl -lclan -lcandl -lisl \