summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2015-11-16 18:57:40 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2015-11-16 19:04:18 +0100
commit36b9a1d12bc04b58c4e9d987a5cd314312459a6b (patch)
tree2e88a0889defb67a9f9fb320495c14977f398ca2
parent73a933885d64f7a46a66dd1544ff02d32783cd2e (diff)
downloadOSELAS.Toolchain-36b9a1d12bc04b58c4e9d987a5cd314312459a6b.tar.gz
OSELAS.Toolchain-36b9a1d12bc04b58c4e9d987a5cd314312459a6b.tar.xz
host-cloog: version bump 0.18.2 -> 0.18.4
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/cloog-0.18.2/0001-HACK-add-missing-cmake-files.patch77
-rw-r--r--patches/cloog-0.18.2/series4
-rw-r--r--rules/host-cloog.make5
3 files changed, 3 insertions, 83 deletions
diff --git a/patches/cloog-0.18.2/0001-HACK-add-missing-cmake-files.patch b/patches/cloog-0.18.2/0001-HACK-add-missing-cmake-files.patch
deleted file mode 100644
index 35c0e82..0000000
--- a/patches/cloog-0.18.2/0001-HACK-add-missing-cmake-files.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 28 Nov 2014 17:16:02 +0100
-Subject: [PATCH] HACK: add missing cmake files
-
-They got lost during 'make dist'
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- cmake/cloog-isl-config.cmake | 26 ++++++++++++++++++++++++++
- cmake/isl-config.cmake | 25 +++++++++++++++++++++++++
- 2 files changed, 51 insertions(+)
- create mode 100644 cmake/cloog-isl-config.cmake
- create mode 100644 cmake/isl-config.cmake
-
-diff --git a/cmake/cloog-isl-config.cmake b/cmake/cloog-isl-config.cmake
-new file mode 100644
-index 000000000000..1cdfedca499b
---- /dev/null
-+++ b/cmake/cloog-isl-config.cmake
-@@ -0,0 +1,26 @@
-+# Try to find the cloog-isl library
-+
-+# CLOOG_ISL_FOUND - System has cloog-isl lib
-+# CLOOG_ISL_INCLUDE_DIR - The cloog-isl include directory
-+# CLOOG_ISL_LIBRARY - Library needed to use cloog-isl
-+
-+
-+if (CLOOG_ISL_INCLUDE_DIR AND CLOOG_ISL_LIBRARY)
-+ # Already in cache, be silent
-+ set(CLOOG_ISL_FIND_QUIETLY TRUE)
-+endif()
-+
-+find_path(CLOOG_ISL_INCLUDE_DIR NAMES cloog/isl/cloog.h)
-+find_library(CLOOG_ISL_LIBRARY NAMES cloog-isl)
-+
-+if (CLOOG_ISL_LIBRARY AND CLOOG_ISL_INCLUDE_DIR)
-+ message(STATUS "Library cloog-isl found =) ${CLOOG_ISL_LIBRARY}")
-+else()
-+ message(STATUS "Library cloog-isl not found =(")
-+endif()
-+
-+
-+include(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(CLOOG_ISL DEFAULT_MSG CLOOG_ISL_INCLUDE_DIR CLOOG_ISL_LIBRARY)
-+
-+mark_as_advanced(CLOOG_ISL_INCLUDE_DIR CLOOG_ISL_LIBRARY)
-diff --git a/cmake/isl-config.cmake b/cmake/isl-config.cmake
-new file mode 100644
-index 000000000000..ae9c2412eabd
---- /dev/null
-+++ b/cmake/isl-config.cmake
-@@ -0,0 +1,25 @@
-+# Try to find the isl library
-+
-+# ISL_FOUND - System has isl lib
-+# ISL_INCLUDE_DIR - The isl include directory
-+# ISL_LIBRARY - Library needed to use isl
-+
-+
-+if (ISL_INCLUDE_DIR AND ISL_LIBRARY)
-+ # Already in cache, be silent
-+ set(ISL_FIND_QUIETLY TRUE)
-+endif()
-+
-+find_path(ISL_INCLUDE_DIR NAMES isl/version.h)
-+find_library(ISL_LIBRARY NAMES isl)
-+
-+if (ISL_LIBRARY AND ISL_INCLUDE_DIR)
-+ message(STATUS "Library isl found =) ${ISL_LIBRARY}")
-+else()
-+ message(STATUS "Library isl not found =(")
-+endif()
-+
-+include(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ISL DEFAULT_MSG ISL_INCLUDE_DIR ISL_LIBRARY)
-+
-+mark_as_advanced(ISL_INCLUDE_DIR ISL_LIBRARY)
diff --git a/patches/cloog-0.18.2/series b/patches/cloog-0.18.2/series
deleted file mode 100644
index 9c7bfc3..0000000
--- a/patches/cloog-0.18.2/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-HACK-add-missing-cmake-files.patch
-# 6ac0e26cfedff8257ac8e6f4ca8036c5 - git-ptx-patches magic
diff --git a/rules/host-cloog.make b/rules/host-cloog.make
index b7d8aa0..5f83207 100644
--- a/rules/host-cloog.make
+++ b/rules/host-cloog.make
@@ -16,8 +16,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_CLOOG) += host-cloog
#
# Paths and names
#
-HOST_CLOOG_VERSION := 0.18.2
-HOST_CLOOG_MD5 := 69116aa6cd5e73f6b688d871875e1292
+HOST_CLOOG_VERSION := 0.18.4
+HOST_CLOOG_MD5 := e531f725244856c92c9bba009ff44faf
HOST_CLOOG := cloog-$(HOST_CLOOG_VERSION)
HOST_CLOOG_SUFFIX := tar.gz
HOST_CLOOG_URL := http://www.bastoul.net/cloog/pages/download/$(HOST_CLOOG).$(HOST_CLOOG_SUFFIX)
@@ -38,6 +38,7 @@ HOST_CLOOG_CONF_OPT := \
$(PTX_HOST_AUTOCONF) \
--disable-shared \
--enable-static \
+ --enable-portable-binary \
--with-isl=system \
--with-gmp=system \
--without-osl