pluto-system-libs.patch

   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
   4
   5
   6
   7 -dnl Configuring PipLib (long long int is 64 bits)
   8 -echo ""
   9 -echo "=========================="
  10 -echo "Configuring PipLib"
  11 -echo "=========================="
  12 -configureopts="--with-gmp \
  13 ---with-gmp-prefix=$GMP_PREFIX \
  14 ---prefix=$prefix"
  15 -(cd piplib/
  16 - $RM config.cache;
  17 - ./configure ${configureopts} ${archopts}
  18 - )
  19 -
  20 -
  21 -dnl Configuring Openscop
  22 -echo ""
  23 -echo "=========================="
  24 -echo "Configuring Openscop"
  25 -echo "=========================="
  26 -configureopts="--with-gmp=system \
  27 ---with-gmp-prefix=$GMP_PREFIX \
  28 ---prefix=$prefix"
  29 -(cd openscop/
  30 - ./configure ${configureopts} ${archopts}
  31 - )
  32 -
  33 -
  34 -dnl Configuring Clan-osl
  35 -echo ""
  36 -echo "=========================="
  37 -echo "Configuring Clan"
  38 -echo "=========================="
  39 -configureopts="--prefix=$prefix \
  40 ---with-osl=build \
  41 ---with-osl-builddir=$SOURCE_DIR/openscop"
  42 -(cd clan/
  43 - ./configure ${configureopts} ${archopts}
  44 - )
  45 -
  46 -
  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
  50 -echo ""
  51 -echo "=========================="
  52 -echo "Configuring Candl"
  53 -echo "=========================="
  54 -configureopts="--enable-llint-version \
  55 ---prefix=$prefix \
  56 ---with-piplib=build \
  57 ---with-piplib-builddir=$SOURCE_DIR/piplib \
  58 ---with-osl=build \
  59 ---with-osl-builddir=$SOURCE_DIR/openscop"
  60 -(cd candl/
  61 - ./configure ${configureopts} ${archopts}
  62 - )
  63 -
  64 -
  65 -dnl Configuring polylib
  66 -echo ""
  67 -echo "======================"
  68 -echo "Configuring polylib"
  69 -echo "======================"
  70 -configureopts="--enable-longlongint-lib \
  71 ---prefix=$prefix"
  72 -(cd polylib/
  73 - ./configure ${configureopts}
  74 -)
  75
  76
  77  AC_SUBST(ISL_INCLUDE)
  78 @@ -219,32 +151,6 @@ configureopts="--with-gmp=system \
  79  fi
  80
  81
  82 -dnl Configuring Cloog 0.14.1 (long long int)
  83 -echo ""
  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 \
  90 ---with-gmp=system \
  91 ---with-gmp-prefix=$GMP_PREFIX \
  92 ---with-osl=build \
  93 ---with-osl-builddir=$SOURCE_DIR/openscop \
  94 ---prefix=$prefix"
  95 -else
  96 -configureopts="--with-isl=system \
  97 ---with-isl-prefix=$isl_prefix \
  98 ---with-gmp=system \
  99 ---with-gmp-prefix=$GMP_PREFIX \
 100 ---with-osl=build \
 101 ---with-osl-builddir=$SOURCE_DIR/openscop \
 102 ---prefix=$prefix"
 103 -fi
 104 -(cd cloog-isl/
 105 - ./configure ${configureopts} ${archopts}
 106 - )
 107 -
 108  AC_PATH_PROGS(BASH, bash)
 109
 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
 113 @@ -18,7 +18,7 @@
 114  endif
 115
 116
 117 -SUBDIRS = piplib openscop clan candl polylib $(MAY_ISL) cloog-isl src
 118 +SUBDIRS = src
 119
 120  ACLOCAL_AMFLAGS = -I m4
 121
 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
 124 @@ -19,25 +19,12 @@
 125
 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 \
 129 -   -I../include \
 130 -   -I../piplib/include \
 131 -   -I../clan/include \
 132 -   $(ISL_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 \
 138 +   -I../include
 139
 140 -pluto_LDFLAGS = -static -fopenmp
 141 +pluto_LDFLAGS = -fopenmp
 142  pluto_LDADD =  \
 143 -   ../piplib/libpiplib64.la \
 144 -   ../openscop/libosl.la \
 145 -   ../clan/libclan.la \
 146 -   ../cloog-isl/libcloog-isl.la \
 147 -   $(ISL_LIBADD) \
 148 -   ../polylib/libpolylib64.la \
 149 -   ../candl/libcandl.la \
 150 +   -lpiplibMP -losl -lclan -lcloog-isl -lisl -lpolylibgmp -lcandl \
 151     -lm
 152
 153  lib_LTLIBRARIES = libpluto.la
 154 @@ -45,20 +32,10 @@
 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 \
 159 -   -I../include \
 160 -   -I../piplib/include \
 161 -   -I../clan/include \
 162 -   -I../openscop/include \
 163 -   -I../candl/include \
 164 -   -I../cloog-isl/include \
 165 -   $(ISL_INCLUDE)
 166 +   -DSCOPLIB_INT_T_IS_MP -DCLOOG_INT_GMP \
 167 +   -I../include
 168
 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 \
 175 -   $(ISL_LIBADD) \
 176 +   -lpiplibMP -losl -lclan -lcandl -lisl \
 177     -lm -lgomp