02.05.2013 15:17 пользователь "Sebastian Reitenbach" < sebas...@l00-bugdead-prods.de> написал: > > > On Wednesday, May 1, 2013 22:48 CEST, Vadim Zhukov <persg...@gmail.com> wrote: > > > Sorry, I have to run right now, so I could not dive in throughly ATM > > (but I will be able to do this tomorrow). > > > > Could you please test the following patch instead? Policy CMP0017 defaults > > to OLD now, I suspect this could be related. > > Whatever this policy is doing, it helps, and makes the libobjc2 configure > stage happy. > > > Below complete patch to LLVM port with REVISION bump. > > OK?
OK zhuk@. Please send this patch upstream then, too. > thanks, > Sebastian > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/devel/llvm/Makefile,v > retrieving revision 1.61 > diff -u -r1.61 Makefile > --- Makefile 30 Mar 2013 12:10:40 -0000 1.61 > +++ Makefile 2 May 2013 11:15:14 -0000 > @@ -10,7 +10,7 @@ > LLVM_V = 3.2 > DISTNAME = llvm-${LLVM_V}.src > PKGNAME = llvm-${LLVM_V} > -REVISION = 2 > +REVISION = 3 > CATEGORIES = devel > MASTER_SITES = http://llvm.org/releases/${LLVM_V}/ > > Index: patches/patch-cmake_modules_LLVMConfig_cmake_in > =================================================================== > RCS file: patches/patch-cmake_modules_LLVMConfig_cmake_in > diff -N patches/patch-cmake_modules_LLVMConfig_cmake_in > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-cmake_modules_LLVMConfig_cmake_in 2 May 2013 11:15:14 -0000 > @@ -0,0 +1,15 @@ > +$OpenBSD$ > + > +make it find include file in /usr/local/share/llvm/cmake > + > +--- cmake/modules/LLVMConfig.cmake.in.orig Sat Jul 7 05:12:28 2012 > ++++ cmake/modules/LLVMConfig.cmake.in Thu May 2 07:38:57 2013 > +@@ -36,6 +36,8 @@ set(LLVM_INCLUDE_DIRS ${LLVM_INSTALL_PREFIX}/include) > + set(LLVM_LIBRARY_DIRS ${LLVM_INSTALL_PREFIX}/lib) > + set(LLVM_DEFINITIONS "-D__STDC_LIMIT_MACROS" "-D__STDC_CONSTANT_MACROS") > + > ++cmake_policy(SET CMP0017 NEW) > ++ > + # We try to include using the current setting of CMAKE_MODULE_PATH, > + # which suppossedly was filled by the user with the directory where > + # this file was installed: > > > > > > > -- > > WBR, > > Vadim Zhukov > > > > > > $OpenBSD$ > > --- cmake/modules/LLVMConfig.cmake.in.orig Thu May 2 00:44:02 2013 > > +++ cmake/modules/LLVMConfig.cmake.in Thu May 2 00:43:19 2013 > > @@ -36,6 +36,8 @@ set(LLVM_INCLUDE_DIRS ${LLVM_INSTALL_PREFIX}/include) > > set(LLVM_LIBRARY_DIRS ${LLVM_INSTALL_PREFIX}/lib) > > set(LLVM_DEFINITIONS "-D__STDC_LIMIT_MACROS" "-D__STDC_CONSTANT_MACROS") > > > > +cmake_policy(SET CMP0017 NEW) > > + > > # We try to include using the current setting of CMAKE_MODULE_PATH, > > # which suppossedly was filled by the user with the directory where > > # this file was installed: > > > > >