From 41b6d1dc131ec3003e4dee76fa80467292a39a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nagy=20K=C3=A1roly=20G=C3=A1brl?= Date: Sun, 21 Feb 2016 10:37:59 +0000 Subject: [PATCH] cloog: fixed to build with different aclocal and friends --- develop/cloog/cloog.conf | 14 +------------- develop/cloog/no_clang.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 13 deletions(-) create mode 100644 develop/cloog/no_clang.patch diff --git a/develop/cloog/cloog.conf b/develop/cloog/cloog.conf index b44016091..f86c585fa 100644 --- a/develop/cloog/cloog.conf +++ b/develop/cloog/cloog.conf @@ -12,19 +12,6 @@ # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- -#if pkginstalled -f isl; then -# var_append extraconfopt ' ' "--with-isl=system" -# var_append extraconfopt ' ' "--with-isl-prefix=$( pkgprefix -r isl )" -#fi -# -#if pkginstalled -f gmp; then -# var_append extraconfopt ' ' "--with-gmp=system" -# var_append extraconfopt ' ' "--with-gmp-prefix=$( pkgprefix -r gmp )" -# var_append extraconfopt ' ' '--with-bits=gmp' -#fi - -#var_append confopt ' ' "--enable-shared" - if atstage toolchain; then var_append extraconfopt ' ' '--with-ppl=$root --with-ppl-library=$root$libdir' var_append extraconfopt ' ' '--with-gmp-prefix=$root' @@ -38,3 +25,4 @@ var_append confopt ' ' '--enable-shared --with-isl=system' [[ $libdir = *lib64 ]] && hook_add preconf 3 'sed -e "s,ppl_prefix/lib,ppl_prefix/lib64,g" -i configure' +hook_add preconf 9 'autoreconf -vfi' diff --git a/develop/cloog/no_clang.patch b/develop/cloog/no_clang.patch new file mode 100644 index 000000000..e71467dc5 --- /dev/null +++ b/develop/cloog/no_clang.patch @@ -0,0 +1,28 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../cloog/no_clang.patch +# Copyright (C) 2016 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +--- ./isl/configure.ac.orig 2015-07-24 12:23:09.000000000 +0000 ++++ ./isl/configure.ac 2016-02-21 09:42:44.118489911 +0000 +@@ -222,9 +222,6 @@ + AC_CONFIG_HEADERS(isl_config.h) + AC_CONFIG_FILES(Makefile) + AC_CONFIG_FILES(doc/Makefile) +-if test $with_clang = system; then +- AC_CONFIG_FILES(interface/Makefile) +-fi + AC_CONFIG_FILES([bound_test.sh], [chmod +x bound_test.sh]) + AC_CONFIG_FILES([codegen_test.sh], [chmod +x codegen_test.sh]) + AC_CONFIG_FILES([pip_test.sh], [chmod +x pip_test.sh])