On Tue, 20 Aug 2013, David Coppa wrote: > The diff below disables elf parsing on arm:
Sorry, wrong diff! Index: patches/patch-Source_CMakeLists_txt =================================================================== RCS file: /cvs/ports/devel/cmake/patches/patch-Source_CMakeLists_txt,v retrieving revision 1.3 diff -u -p -u -p -r1.3 patch-Source_CMakeLists_txt --- patches/patch-Source_CMakeLists_txt 25 Jun 2013 07:16:46 -0000 1.3 +++ patches/patch-Source_CMakeLists_txt 20 Aug 2013 09:25:12 -0000 @@ -13,18 +13,22 @@ OpenBSD provides ELF ABI declarations in Teach the platform check and cmELF implementation to use these. ---- Source/CMakeLists.txt.orig Wed May 15 19:38:13 2013 -+++ Source/CMakeLists.txt Fri Jun 21 09:15:02 2013 -@@ -11,7 +11,11 @@ +XXX: broken on arm + +--- Source/CMakeLists.txt.orig Tue Jul 2 15:41:40 2013 ++++ Source/CMakeLists.txt Tue Aug 20 11:22:32 2013 +@@ -11,8 +11,12 @@ #============================================================================= include(CheckIncludeFile) # Check if we can build support for ELF parsing. -CHECK_INCLUDE_FILE("elf.h" HAVE_ELF_H) +-if(HAVE_ELF_H) +if(CMAKE_CXX_PLATFORM_ID MATCHES "OpenBSD") + CHECK_INCLUDE_FILES("stdint.h;elf_abi.h" HAVE_ELF_H) +else() + CHECK_INCLUDE_FILE("elf.h" HAVE_ELF_H) +endif() - if(HAVE_ELF_H) ++if(HAVE_ELF_H AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") set(CMAKE_USE_ELF_PARSER 1) else() + set(CMAKE_USE_ELF_PARSER) Index: patches/patch-bootstrap =================================================================== RCS file: /cvs/ports/devel/cmake/patches/patch-bootstrap,v retrieving revision 1.3 diff -u -p -u -p -r1.3 patch-bootstrap --- patches/patch-bootstrap 28 Jun 2013 14:58:23 -0000 1.3 +++ patches/patch-bootstrap 20 Aug 2013 09:25:12 -0000 @@ -1,15 +1,20 @@ $OpenBSD: patch-bootstrap,v 1.3 2013/06/28 14:58:23 dcoppa Exp $ Use Ninja to build CMake +XXX: broken on arm ---- bootstrap.orig Thu Jun 27 11:26:07 2013 -+++ bootstrap Thu Jun 27 11:26:31 2013 -@@ -112,7 +112,7 @@ if ${cmake_system_mingw}; then +--- bootstrap.orig Tue Jul 2 15:41:41 2013 ++++ bootstrap Tue Aug 20 10:55:10 2013 +@@ -112,7 +112,11 @@ if ${cmake_system_mingw}; then cmake_bootstrap_generator="MSYS Makefiles" else # Bootstrapping from a standard UNIX prompt. - cmake_bootstrap_generator="Unix Makefiles" -+ cmake_bootstrap_generator="Ninja" ++ if arch -s | grep ^arm >/dev/null 2>&1; then ++ cmake_bootstrap_generator="Unix Makefiles" ++ else ++ cmake_bootstrap_generator="Ninja" ++ fi fi # Choose tools and extensions for this platform.