From 4ac3c394ebccc20bb07cbf67f67a934b5e8ff058 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 28 Dec 2014 11:59:54 +0100 Subject: [PATCH] llvm: fix policy warnings * Move cmake files to data/llvm * Add missing cmd: entries. --- sys-devel/llvm/llvm-3.5.0.recipe | 3 + sys-devel/llvm/patches/llvm-3.5.0.patchset | 70 ++++++++++++++++++---- 2 files changed, 60 insertions(+), 13 deletions(-) diff --git a/sys-devel/llvm/llvm-3.5.0.recipe b/sys-devel/llvm/llvm-3.5.0.recipe index 84e25e69c..b47d34e70 100644 --- a/sys-devel/llvm/llvm-3.5.0.recipe +++ b/sys-devel/llvm/llvm-3.5.0.recipe @@ -45,6 +45,9 @@ PROVIDES=" cmd:llvm_tblgen cmd:macho_dump cmd:opt + cmd:FileCheck + cmd:count + cmd:not lib:BugpointPasses$secondaryArchSuffix lib:LLVMHello$secondaryArchSuffix lib:libLTO$secondaryArchSuffix diff --git a/sys-devel/llvm/patches/llvm-3.5.0.patchset b/sys-devel/llvm/patches/llvm-3.5.0.patchset index b73c6ab55..1880876e5 100644 --- a/sys-devel/llvm/patches/llvm-3.5.0.patchset +++ b/sys-devel/llvm/patches/llvm-3.5.0.patchset @@ -1,11 +1,8 @@ -From ea9fabb4c279b2d94e54e6a416d8c1d971cc2383 Mon Sep 17 00:00:00 2001 +From 2ffaad9e30a03b5688307fa31ab1a43a23013325 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 22 Jan 2014 05:04:31 +0000 -Subject: [PATCH 1/2] haiku: fix Host.h for endian.h +Subject: haiku: fix Host.h for endian.h ---- - include/llvm/Support/Host.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/llvm/Support/Host.h b/include/llvm/Support/Host.h index 8f4bf3c..8114f9b 100644 @@ -23,17 +20,12 @@ index 8f4bf3c..8114f9b 100644 -- 1.8.3.4 -From 568aa3d732e8482db2797470235f363077ab2900 Mon Sep 17 00:00:00 2001 + +From 346e9d142e5d8d34bd05e6f51b75f562df1269e3 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Tue, 9 Dec 2014 01:20:26 +0000 -Subject: [PATCH 2/2] LLVM: Update autoconf for Haiku x86_64 support +Subject: LLVM: Update autoconf for Haiku x86_64 support ---- - autoconf/config.guess | 371 ++++++++++++++++++-------------------------------- - autoconf/config.sub | 165 +++++++++++++--------- - 2 files changed, 235 insertions(+), 301 deletions(-) - mode change 100755 => 100644 autoconf/config.guess - mode change 100755 => 100644 autoconf/config.sub diff --git a/autoconf/config.guess b/autoconf/config.guess old mode 100755 @@ -1038,3 +1030,55 @@ index a8d8528..7ffe373 -- 1.8.3.4 + +From cfbee5322c336f241ec9dfac456e77e4e71a0478 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 27 Dec 2014 15:47:00 +0100 +Subject: Fix datadir for Haiku. + +Hardcoded to share... + +diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt +index c87193d..925c6e1 100644 +--- a/cmake/modules/CMakeLists.txt ++++ b/cmake/modules/CMakeLists.txt +@@ -1,4 +1,4 @@ +-set(LLVM_INSTALL_PACKAGE_DIR share/llvm/cmake) ++set(LLVM_INSTALL_PACKAGE_DIR data/llvm/cmake) + set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") + + get_property(LLVM_EXPORTS GLOBAL PROPERTY LLVM_EXPORTS) +diff --git a/cmake/modules/Makefile b/cmake/modules/Makefile +index ba45f17..615a19a 100644 +--- a/cmake/modules/Makefile ++++ b/cmake/modules/Makefile +@@ -13,7 +13,7 @@ LINK_COMPONENTS := all + + include $(LEVEL)/Makefile.common + +-PROJ_cmake := $(DESTDIR)$(PROJ_prefix)/share/llvm/cmake ++PROJ_cmake := $(DESTDIR)$(PROJ_prefix)/data/llvm/cmake + + ifeq ($(DISABLE_ASSERTIONS),1) + LLVM_ENABLE_ASSERTIONS := 0 +diff --git a/configure b/configure +index c11c395..b83ff65 100755 +--- a/configure ++++ b/configure +@@ -18539,10 +18539,10 @@ if test "${prefix}" = "NONE" ; then + fi + eval LLVM_PREFIX="${prefix}"; + eval LLVM_BINDIR="${prefix}/bin"; +-eval LLVM_DATADIR="${prefix}/share/llvm"; +-eval LLVM_DOCSDIR="${prefix}/share/doc/llvm"; ++eval LLVM_DATADIR="${prefix}/data/llvm"; ++eval LLVM_DOCSDIR="${prefix}/data/doc/llvm"; + eval LLVM_ETCDIR="${prefix}/etc/llvm"; +-eval LLVM_INCLUDEDIR="${prefix}/include"; ++eval LLVM_INCLUDEDIR="${prefix}/devlop/headers"; + eval LLVM_INFODIR="${prefix}/info"; + eval LLVM_MANDIR="${prefix}/man"; + LLVM_CONFIGTIME=`date` +-- +1.8.3.4 +