]>
Commit | Line | Data |
---|---|---|
78230f28 JB |
1 | --- pluto-0.11.4/configure.ac.orig 2015-10-28 16:24:59.000000000 +0100 |
2 | +++ pluto-0.11.4/configure.ac 2015-12-03 16:02:55.363732747 +0100 | |
3 | @@ -114,6 +114,7 @@ | |
4 | ||
5 | ||
6 | ||
7 | +if test x$external_piplib = xfalse ; then | |
8 | dnl Configuring PipLib (long long int is 64 bits) | |
9 | echo "" | |
10 | echo "==========================" | |
11 | @@ -126,8 +127,10 @@ | |
12 | $RM config.cache; | |
13 | ./configure ${configureopts} ${archopts} | |
14 | ) | |
15 | +fi | |
16 | ||
17 | ||
18 | +if test x$external_openscop = xfalse ; then | |
19 | dnl Configuring Openscop | |
20 | echo "" | |
21 | echo "==========================" | |
22 | @@ -139,8 +142,10 @@ | |
23 | (cd openscop/ | |
24 | ./configure ${configureopts} ${archopts} | |
25 | ) | |
26 | +fi | |
27 | ||
28 | ||
29 | +if test x$external_clan = xfalse ; then | |
30 | dnl Configuring Clan-osl | |
31 | echo "" | |
32 | echo "==========================" | |
33 | @@ -155,8 +160,10 @@ | |
34 | ||
35 | dnl check if clan configure failed | |
36 | AC_CHECK_FILE([clan/Makefile], [], [AC_MSG_ERROR([configure in clan/ failed])]) | |
37 | +fi | |
38 | ||
39 | ||
40 | +if test x$external_candl = xfalse ; then | |
41 | dnl Configuring Candl-osl | |
42 | dnl can't enable the gmp version without modifying | |
43 | dnl the precision the is used elsewhere in pluto | |
44 | @@ -173,8 +180,10 @@ | |
45 | (cd candl/ | |
46 | ./configure ${configureopts} ${archopts} | |
47 | ) | |
48 | +fi | |
49 | ||
50 | ||
51 | +if test x$external_polylib = xfalse ; then | |
52 | dnl Configuring polylib | |
53 | echo "" | |
54 | echo "======================" | |
55 | @@ -185,6 +194,7 @@ | |
56 | (cd polylib/ | |
57 | ./configure ${configureopts} | |
58 | ) | |
59 | +fi | |
cffb6e24 JB |
60 | |
61 | ||
62 | AC_SUBST(ISL_INCLUDE) | |
78230f28 | 63 | @@ -222,6 +232,7 @@ |
cffb6e24 JB |
64 | fi |
65 | ||
66 | ||
78230f28 JB |
67 | +if test x$external_cloog = xfalse; then |
68 | dnl Configuring Cloog 0.14.1 (long long int) | |
69 | echo "" | |
70 | echo "==========================" | |
71 | @@ -247,6 +258,7 @@ | |
72 | (cd cloog-isl/ | |
73 | ./configure ${configureopts} ${archopts} | |
74 | ) | |
75 | +fi | |
76 | ||
cffb6e24 JB |
77 | AC_PATH_PROGS(BASH, bash) |
78 | ||
cffb6e24 JB |
79 | --- pluto-0.11.0/Makefile.am.orig 2014-05-30 10:28:06.000000000 +0200 |
80 | +++ pluto-0.11.0/Makefile.am 2014-10-05 15:40:59.042473155 +0200 | |
81 | @@ -18,7 +18,7 @@ | |
82 | endif | |
83 | ||
84 | ||
85 | -SUBDIRS = piplib openscop clan candl polylib $(MAY_ISL) cloog-isl src | |
86 | +SUBDIRS = src | |
87 | ||
88 | ACLOCAL_AMFLAGS = -I m4 | |
89 | ||
78230f28 JB |
90 | --- pluto-0.11.4/src/Makefile.am.orig 2015-12-03 15:33:25.990473676 +0100 |
91 | +++ pluto-0.11.4/src/Makefile.am 2015-12-03 16:12:33.643708512 +0100 | |
92 | @@ -27,25 +27,18 @@ | |
93 | endif | |
cffb6e24 | 94 | |
78230f28 | 95 | pluto_CPPFLAGS = $(OPT_FLAGS) $(DEBUG_FLAGS) -funroll-loops -fopenmp \ |
cffb6e24 JB |
96 | - -DSCOPLIB_INT_T_IS_LONGLONG -DCLOOG_INT_GMP \ |
97 | - -I../include \ | |
98 | - -I../piplib/include \ | |
99 | - -I../clan/include \ | |
100 | - $(ISL_INCLUDE) \ | |
101 | - -I../cloog-isl/include \ | |
102 | - -I../openscop/include \ | |
103 | - -I../candl/include \ | |
104 | - -I../polylib/include | |
105 | + -DSCOPLIB_INT_T_IS_MP -DCLOOG_INT_GMP \ | |
106 | + -I../include | |
107 | ||
108 | -pluto_LDFLAGS = -static -fopenmp | |
109 | +pluto_LDFLAGS = -fopenmp | |
110 | pluto_LDADD = \ | |
111 | - ../piplib/libpiplib64.la \ | |
112 | - ../openscop/libosl.la \ | |
113 | - ../clan/libclan.la \ | |
114 | - ../cloog-isl/libcloog-isl.la \ | |
115 | - $(ISL_LIBADD) \ | |
116 | - ../polylib/libpolylib64.la \ | |
117 | - ../candl/libcandl.la \ | |
78230f28 JB |
118 | + -lpiplibMP \ |
119 | + -losl \ | |
120 | + -lclan \ | |
121 | + -lcloog-isl \ | |
122 | + -lisl \ | |
123 | + -lpolylibgmp \ | |
124 | + -lcandl \ | |
cffb6e24 JB |
125 | -lm |
126 | ||
127 | lib_LTLIBRARIES = libpluto.la | |
78230f28 | 128 | @@ -53,20 +46,14 @@ |
cffb6e24 | 129 | # libpluto doesn't use polylib-based functions |
78230f28 JB |
130 | libpluto_la_SOURCES = constraints.c constraints_isl.c math_support.c ddg.c transforms.c pluto.c post_transform.c framework.c polyloop.c iss.c libpluto.c libpluto_dummy.c constraints.h math_support.h pluto.h program.c program.h tile.c |
131 | libpluto_la_CPPFLAGS = $(OPT_FLAGS) $(DEBUG_FLAGS) \ | |
132 | - -DLIB_PLUTO -DSCOPLIB_INT_T_IS_LONGLONG -DCLOOG_INT_GMP \ | |
cffb6e24 JB |
133 | - -I../include \ |
134 | - -I../piplib/include \ | |
135 | - -I../clan/include \ | |
136 | - -I../openscop/include \ | |
137 | - -I../candl/include \ | |
138 | - -I../cloog-isl/include \ | |
139 | - $(ISL_INCLUDE) | |
78230f28 | 140 | + -DLIB_PLUTO -DSCOPLIB_INT_T_IS_MP -DCLOOG_INT_GMP \ |
cffb6e24 JB |
141 | + -I../include |
142 | ||
143 | # libpluto doesn't use polylib | |
144 | libpluto_la_LIBADD = \ | |
145 | - ../piplib/libpiplib64.la \ | |
146 | - ../openscop/libosl.la \ | |
147 | - ../clan/libclan.la \ | |
148 | - ../candl/libcandl.la \ | |
149 | - $(ISL_LIBADD) \ | |
78230f28 JB |
150 | + -lpiplibMP \ |
151 | + -losl \ | |
152 | + -lclan \ | |
153 | + -lcandl \ | |
154 | + -lisl \ | |
cffb6e24 | 155 | -lm -lgomp |