From 2aa2634d58075e20e12df0efe68661907531630b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nagy=20K=C3=A1roly=20G=C3=A1brl?= Date: Sat, 20 Feb 2016 20:06:59 +0000 Subject: [PATCH] cloog: Updated (0.16.3 -> 0.18.4) --- .../cloog-0.16.3-use-gdb-auto-load-dir.patch | 38 ------------------- develop/cloog/cloog.conf | 34 ++++++++++++----- develop/cloog/cloog.desc | 8 ++-- 3 files changed, 28 insertions(+), 52 deletions(-) delete mode 100644 develop/cloog/cloog-0.16.3-use-gdb-auto-load-dir.patch diff --git a/develop/cloog/cloog-0.16.3-use-gdb-auto-load-dir.patch b/develop/cloog/cloog-0.16.3-use-gdb-auto-load-dir.patch deleted file mode 100644 index 32eac4b34..000000000 --- a/develop/cloog/cloog-0.16.3-use-gdb-auto-load-dir.patch +++ /dev/null @@ -1,38 +0,0 @@ -Do not put gdb python plugin directly into $libdir - -Placing files like 'libisl.so.7.0.0-gdb.py' into '$libdir' results in -warnings when running 'ldconfig' because it is not an ELF file. -A common place where to put gdb plugins is '$datadir/gdb/auto-load$libdir' -like '/usr/share/gdb/auto-load/usr/lib'. - -Note: - -This patch assumes that gdb and gcc are using the same prefix! - ---- a/isl/Makefile.am 2013-02-11 15:59:59.276023102 +0100 -+++ b/isl/Makefile.am 2013-02-11 16:04:04.802994331 +0100 -@@ -258,6 +258,6 @@ - case $$libisl in \ - '') echo Cannot find isl library name. GDB bindings not installed.;; \ - *) echo $(INSTALL_DATA) $(srcdir)/isl.py \ -- $(DESTDIR)$(libdir)/$$libisl-gdb.py; \ -- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"; \ -- $(INSTALL_DATA) $(srcdir)/isl.py $(DESTDIR)$(libdir)/$$libisl-gdb.py; esac -+ $(DESTDIR)$(datadir)/gdb/auto-load$(libdir)/$$libisl-gdb.py; \ -+ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(datadir)/gdb/auto-load$(libdir)"; \ -+ $(INSTALL_DATA) $(srcdir)/isl.py $(DESTDIR)$(datadir)/gdb/auto-load$(libdir)/$$libisl-gdb.py; esac ---- a/isl/Makefile.in 2013-02-11 16:00:11.990994074 +0100 -+++ b/isl/Makefile.in 2013-02-11 16:03:32.413771959 +0100 -@@ -2189,9 +2189,9 @@ - case $$libisl in \ - '') echo Cannot find isl library name. GDB bindings not installed.;; \ - *) echo $(INSTALL_DATA) $(srcdir)/isl.py \ -- $(DESTDIR)$(libdir)/$$libisl-gdb.py; \ -- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"; \ -- $(INSTALL_DATA) $(srcdir)/isl.py $(DESTDIR)$(libdir)/$$libisl-gdb.py; esac -+ $(DESTDIR)$(datadir)/gdb/auto-load$(libdir)/$$libisl-gdb.py; \ -+ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(datadir)/gdb/auto-load$(libdir)"; \ -+ $(INSTALL_DATA) $(srcdir)/isl.py $(DESTDIR)$(datadir)/gdb/auto-load$(libdir)/$$libisl-gdb.py; esac - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/develop/cloog/cloog.conf b/develop/cloog/cloog.conf index e6d24aea9..b44016091 100644 --- a/develop/cloog/cloog.conf +++ b/develop/cloog/cloog.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../cloog/cloog.conf -# Copyright (C) 2009 - 2012 The OpenSDE Project +# Copyright (C) 2009 - 2016 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -12,15 +12,29 @@ # 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 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 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' +if atstage toolchain; then + var_append extraconfopt ' ' '--with-ppl=$root --with-ppl-library=$root$libdir' + var_append extraconfopt ' ' '--with-gmp-prefix=$root' + var_append extraconfopt ' ' '--with-isl-prefix=$root' +else + var_append extraconfopt ' ' '--with-ppl' fi -var_append confopt ' ' "--enable-shared" +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' + diff --git a/develop/cloog/cloog.desc b/develop/cloog/cloog.desc index a86fc123d..04acd8d20 100644 --- a/develop/cloog/cloog.desc +++ b/develop/cloog/cloog.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../cloog/cloog.desc -[COPY] Copyright (C) 2009 - 2012 The OpenSDE Project +[COPY] Copyright (C) 2009 - 2016 The OpenSDE Project [COPY] [COPY] More information can be found in the files COPYING and README. [COPY] @@ -30,7 +30,7 @@ [L] GPL [S] Stable -[V] 0.16.3 -[P] X 0--3-5---9 102.270 +[V] 0.18.4 +[P] X 01-3-5---9 102.270 -[D] 34914604 cloog-0.16.3.tar.gz http://www.bastoul.net/cloog/pages/download/ +[D] 1248150325 cloog-0.18.4.tar.gz http://www.bastoul.net/cloog/pages/download/