Re: [UPDATE] CMake-3.9.0
On Sun, Aug 13, 2017 at 2:22 PM, Rafael Sadowski wrote: > On Thu Aug 10, 2017 at 05:26:46PM +0200, David Coppa wrote: >> >> Hi all, >> >> Here's the update to the latest CMake. >> >> As usual, I'd like to have the attached diff tested in a ports bulk >> build... >> >> Thanks! >> David >> > > fix x11/kde4/libs with CMake 3.9.0 > > Index: patches/patch-kdeui_CMakeLists_txt > === > RCS file: patches/patch-kdeui_CMakeLists_txt > diff -N patches/patch-kdeui_CMakeLists_txt > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-kdeui_CMakeLists_txt 13 Aug 2017 12:21:39 - > @@ -0,0 +1,14 @@ > +$OpenBSD$ > + > +Index: kdeui/CMakeLists.txt > +--- kdeui/CMakeLists.txt.orig > kdeui/CMakeLists.txt > +@@ -313,8 +313,6 @@ if (Q_WS_MAC AND MAC_USE_OSXKEYCHAIN) > + add_definitions(-DMAC_USE_OSXKEYCHAIN) > + else(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN) > + set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet.cpp) > +-else(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN) > +- set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet.cpp) > + endif(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN) > + > + if(NOT WINCE) lol :) Sure, ok with me. Ciao! David -- "If you try a few times and give up, you'll never get there. But if you keep at it... There's a lot of problems in the world which can really be solved by applying two or three times the persistence that other people will." -- Stewart Nelson
Re: [UPDATE] CMake-3.9.0
On Thu Aug 10, 2017 at 05:26:46PM +0200, David Coppa wrote: > > Hi all, > > Here's the update to the latest CMake. > > As usual, I'd like to have the attached diff tested in a ports bulk > build... > > Thanks! > David > fix x11/kde4/libs with CMake 3.9.0 Index: patches/patch-kdeui_CMakeLists_txt === RCS file: patches/patch-kdeui_CMakeLists_txt diff -N patches/patch-kdeui_CMakeLists_txt --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-kdeui_CMakeLists_txt 13 Aug 2017 12:21:39 - @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: kdeui/CMakeLists.txt +--- kdeui/CMakeLists.txt.orig kdeui/CMakeLists.txt +@@ -313,8 +313,6 @@ if (Q_WS_MAC AND MAC_USE_OSXKEYCHAIN) + add_definitions(-DMAC_USE_OSXKEYCHAIN) + else(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN) + set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet.cpp) +-else(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN) +- set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet.cpp) + endif(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN) + + if(NOT WINCE)
Re: [UPDATE] CMake-3.9.0
On Thu, 10 Aug 2017, Rafael Sadowski wrote: > On Thu Aug 10, 2017 at 05:26:46PM +0200, David Coppa wrote: > > > > Hi all, > > > > Here's the update to the latest CMake. > > > > As usual, I'd like to have the attached diff tested in a ports bulk > > build... > > > > Thanks! > > David > > $ make regress > 100% tests passed, 0 tests failed out of 451 > > CMake tests are all green but it breaks my graphics/lensfun build: ... > FAILED: tests/CMakeFiles/test_modifier.dir/test_modifier.cpp.o > /usr/ports/pobj/lensfun-0.3.2/bin/c++ -I. > -I/usr/ports/pobj/lensfun-0.3.2/lensfun-0.3.2/include/lensfun -isystem > /usr/local/lib/glib-2.0/include -isystem /usr/local/include/glib-2.0 -O2 > -pipe NOTFOUND -DNDEBUG -MD -MT > tests/CMakeFiles/test_modifier.dir/test_modifier.cpp.o -MF > tests/CMakeFiles/test_modifier.dir/test_modifier.cpp.o.d -o > tests/CMakeFiles/test_modifier.dir/test_modifier.cpp.o -c > /usr/ports/pobj/lensfun-0.3.2/lensfun-0.3.2/tests/test_modifier.cpp > c++: error: no such file or directory: 'NOTFOUND' > ninja: build stopped: subcommand failed. > *** Error 1 in . (/usr/ports/devel/cmake/cmake.port.mk:31 'do-build': @cd > /usr/ports/pobj/lensfun-0.3.2/build-amd64 && exec /usr/bin/env -i ...) > *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2701 > '/usr/ports/pobj/lensfun-0.3.2/build-amd64/.build_done') > *** Error 1 in /usr/ports/graphics/lensfun > (/usr/ports/infrastructure/mk/bsd.port.mk:2408 'all') CMake-3.9 found a bug: "${OpenMP_CXX_FLAGS}" should not be used unconditionally... Index: patches/patch-tests_CMakeLists_txt === RCS file: patches/patch-tests_CMakeLists_txt diff -N patches/patch-tests_CMakeLists_txt --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-tests_CMakeLists_txt 11 Aug 2017 05:00:09 - @@ -0,0 +1,16 @@ +$OpenBSD$ + +Index: tests/CMakeLists.txt +--- tests/CMakeLists.txt.orig tests/CMakeLists.txt +@@ -7,7 +7,9 @@ TARGET_LINK_LIBRARIES(test_modifier lensfun ${COMMON_L + ADD_TEST(Modifier test_modifier) + + find_package(OpenMP) +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") ++if(OpenMP_CXX_FOUND) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") ++endif() + + ADD_EXECUTABLE(test_modifier_color test_modifier_color.cpp) + TARGET_LINK_LIBRARIES(test_modifier_color lensfun ${COMMON_LIBS})
Re: [UPDATE] CMake-3.9.0
On Thu Aug 10, 2017 at 05:26:46PM +0200, David Coppa wrote: > > Hi all, > > Here's the update to the latest CMake. > > As usual, I'd like to have the attached diff tested in a ports bulk > build... > > Thanks! > David $ make regress 100% tests passed, 0 tests failed out of 451 CMake tests are all green but it breaks my graphics/lensfun build: ===> lensfun-0.3.2p2 depends on: cmake-* -> cmake-3.9.0 ===> lensfun-0.3.2p2 depends on: ninja->=1.5.1 -> ninja-1.7.2p1 ===> lensfun-0.3.2p2 depends on: glib2-* -> glib2-2.52.3 ===> lensfun-0.3.2p2 depends on: png-* -> png-1.6.29 ===> Verifying specs: c glib-2.0 m png c++ c++abi pthread z ===> found c.89.6 glib-2.0.4200.5 m.10.0 png.17.3 c++.0.0 c++abi.0.0 pthread.23.0 z.5.0 ===> Checking files for lensfun-0.3.2p2 `/usr/ports/distfiles/lensfun-0.3.2.tar.gz' is up to date. >> (SHA256) lensfun-0.3.2.tar.gz: OK ===> Extracting for lensfun-0.3.2p2 ===> Patching for lensfun-0.3.2p2 ===> Applying OpenBSD patch patch-cmake_modules_FindGLIB2_cmake Hmm... Looks like a unified diff to me... The text leading up to this was: -- |$OpenBSD: patch-cmake_modules_FindGLIB2_cmake,v 1.1 2017/01/31 09:58:35 sthen Exp $ |Avoid messing up between paths found by pkg-config and CMake itself. |--- cmake/modules/FindGLIB2.cmake.orig Sun Nov 15 18:07:26 2015 |+++ cmake/modules/FindGLIB2.cmake Sun Jan 29 10:12:03 2017 -- Patching file cmake/modules/FindGLIB2.cmake using Plan A... Hunk #1 succeeded at 1. Hunk #2 succeeded at 9. Hunk #3 succeeded at 23. Hunk #4 succeeded at 34. Hunk #5 succeeded at 60. done ===> Applying OpenBSD patch patch-docs_CMakeLists_txt Hmm... Looks like a unified diff to me... The text leading up to this was: -- |$OpenBSD: patch-docs_CMakeLists_txt,v 1.2 2017/01/31 09:58:35 sthen Exp $ |1. This directory is already covered by BUILD_DOC option, so | no reason to not to add "doc" target in build-by-default list; |2. Actually depend on configured file, CMake already takes care on | depending on source file; |3. No need for GLOB, we can simply use "INSTALL(DIRECTORY foo/" | syntax here. |--- docs/CMakeLists.txt.orig Sun Nov 15 18:07:26 2015 |+++ docs/CMakeLists.txtSun Jan 29 09:59:09 2017 -- Patching file docs/CMakeLists.txt using Plan A... Hunk #1 succeeded at 12. done ===> Compiler link: clang -> /usr/bin/clang ===> Compiler link: clang++ -> /usr/bin/clang++ ===> Compiler link: cc -> /usr/bin/cc ===> Compiler link: c++ -> /usr/bin/c++ ===> Configuring for lensfun-0.3.2p2 -- The C compiler identification is Clang 4.0.0 -- The CXX compiler identification is Clang 4.0.0 -- Check for working C compiler: /usr/ports/pobj/lensfun-0.3.2/bin/cc -- Check for working C compiler: /usr/ports/pobj/lensfun-0.3.2/bin/cc -- works -- Detecting C compiler ABI info -- Detecting C compiler ABI info - done -- Detecting C compile features -- Detecting C compile features - done -- Check for working CXX compiler: /usr/ports/pobj/lensfun-0.3.2/bin/c++ -- Check for working CXX compiler: /usr/ports/pobj/lensfun-0.3.2/bin/c++ -- works -- Detecting CXX compiler ABI info -- Detecting CXX compiler ABI info - done -- Detecting CXX compile features -- Detecting CXX compile features - done -- Looking for include file regex.h -- Looking for include file regex.h - found -- Looking for include file endian.h -- Looking for include file endian.h - found -- Found PkgConfig: /usr/bin/pkg-config (found version "0.27.1") -- Checking for one of the modules 'glib-2.0' -- Could NOT find OpenMP_C (missing: OpenMP_C_FLAGS OpenMP_C_LIB_NAMES) (found version "1.0") -- Could NOT find OpenMP_CXX (missing: OpenMP_CXX_FLAGS OpenMP_CXX_LIB_NAMES) (found version "1.0") -- Found PythonInterp: /usr/local/bin/python (found version "2.7.13") -- Found ZLIB: /usr/lib/libz.so.5.0 (found version "1.2.3") -- Found PNG: /usr/local/lib/libpng.so.17.3 (found version "1.6.29") -- - -- Building Lensfun 0.3.2.0 -- - -- Build as dynamic/shared library -- Build type: Release -- Build doc: No -- Build test suite: Yes -- Build lenstool: Yes -- Build with support for SSE: ON -- Build with support for SSE2: ON -- Install helper scripts: ON -- Install prefix: /usr/local -- Using: -- GLIB2 include dir: /usr/local/lib/glib-2.0/include;/usr/local/include/glib-2.0 -- GLIB2 library: /usr/local/lib/libglib-2.0.so.4200.5 -- Configuring done -- Generating done -- Build files have been written to: /usr/ports/pobj/lensfun-0.3.2/build-amd64 ===> Building for lensfun-0.3.2p2 [1/32] /usr/ports/pobj/lensfun-0.3.2/bin/c++ -Dlensfun_EXPORTS -I. -I/usr/ports/pobj/lensfun-0.3.2/lensfun-0.3.2/include/lensfun -isystem /usr/local/lib/glib-2.0/include -isystem /usr/local/include/glib-2.0 -O2 -pipe -DNDEBUG -fPIC -DCONF_SYMBOL_VISIBILITY -MD -MT libs/lensf
Re: [UPDATE] CMake-3.9.0
On Thu, 10 Aug 2017, David Coppa wrote: > > Hi all, > > Here's the update to the latest CMake. > > As usual, I'd like to have the attached diff tested in a ports bulk > build... > > Thanks! > David New revision of the diff fixing a problem with FindLua.cmake. Please, trash the previous one. Cheers! David cmake-3.9.0_rev2.diff.gz Description: application/gunzip
[UPDATE] CMake-3.9.0
Hi all, Here's the update to the latest CMake. As usual, I'd like to have the attached diff tested in a ports bulk build... Thanks! David Index: Makefile === RCS file: /cvs/ports/devel/cmake/Makefile,v retrieving revision 1.161 diff -u -p -u -p -r1.161 Makefile --- Makefile26 Jul 2017 22:45:17 - 1.161 +++ Makefile10 Aug 2017 15:21:38 - @@ -4,10 +4,9 @@ DPB_PROPERTIES =parallel COMMENT = portable build system -VER = 3.7.2 +VER = 3.9.0 DISTNAME = cmake-${VER} CATEGORIES = devel -REVISION = 4 HOMEPAGE = https://www.cmake.org/ @@ -19,7 +18,7 @@ MASTER_SITES =${HOMEPAGE}files/v${VER:R PERMIT_PACKAGE_CDROM = Yes WANTLIB += archive c curl expat form jsoncpp m ncurses pthread -WANTLIB += ${COMPILER_LIBCXX} z +WANTLIB += rhash ${COMPILER_LIBCXX} z # XXX: Ninja is broken on m88k .if ${MACHINE_ARCH} != "m88k" @@ -30,7 +29,8 @@ BUILD_DEPENDS += textproc/py-sphinx>=1.4 LIB_DEPENDS = archivers/libarchive \ devel/jsoncpp \ - net/curl + net/curl \ + security/rhash CONFIGURE_STYLE = simple CONFIGURE_ARGS = --prefix=${PREFIX} \ Index: distinfo === RCS file: /cvs/ports/devel/cmake/distinfo,v retrieving revision 1.47 diff -u -p -u -p -r1.47 distinfo --- distinfo16 Jan 2017 08:51:50 - 1.47 +++ distinfo10 Aug 2017 15:21:38 - @@ -1,2 +1,2 @@ -SHA256 (cmake-3.7.2.tar.gz) = 3BJGxObRaOpNbgQs+6V3wazWX+6iflb1/zffkgwwyuA= -SIZE (cmake-3.7.2.tar.gz) = 7361593 +SHA256 (cmake-3.9.0.tar.gz) = FncBUlGD27ciuf/mn7UlqiuBeYzxL1zhwCDJM5Tfrg8= +SIZE (cmake-3.9.0.tar.gz) = 7691313 Index: patches/patch-CMakeLists_txt === RCS file: /cvs/ports/devel/cmake/patches/patch-CMakeLists_txt,v retrieving revision 1.22 diff -u -p -u -p -r1.22 patch-CMakeLists_txt --- patches/patch-CMakeLists_txt28 Nov 2016 09:15:13 - 1.22 +++ patches/patch-CMakeLists_txt10 Aug 2017 15:21:38 - @@ -1,7 +1,8 @@ $OpenBSD: patch-CMakeLists_txt,v 1.22 2016/11/28 09:15:13 dcoppa Exp $ CMakeLists.txt.origFri Nov 11 15:37:13 2016 -+++ CMakeLists.txt Sat Nov 26 15:18:08 2016 -@@ -274,6 +274,15 @@ macro (CMAKE_BUILD_UTILITIES) +Index: CMakeLists.txt +--- CMakeLists.txt.orig CMakeLists.txt +@@ -305,6 +305,15 @@ macro (CMAKE_BUILD_UTILITIES) CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}TestSharedForward "${kwsys_folder}") endif() @@ -17,7 +18,17 @@ $OpenBSD: patch-CMakeLists_txt,v 1.22 20 #- # Setup third-party libraries. # Everything in the tree should be able to include files from the -@@ -453,7 +462,8 @@ macro (CMAKE_BUILD_UTILITIES) +@@ -342,7 +351,8 @@ macro (CMAKE_BUILD_UTILITIES) + message(FATAL_ERROR + "CMAKE_USE_SYSTEM_LIBRHASH is ON but LibRHash is not found!") + endif() +-set(CMAKE_LIBRHASH_LIBRARIES LibRHash::LibRHash) ++set(CMAKE_LIBRHASH_INCLUDES ${LibRHash_INCLUDE_DIRS}) ++set(CMAKE_LIBRHASH_LIBRARIES ${LibRHash_LIBRARIES}) + else() + set(CMAKE_LIBRHASH_LIBRARIES cmlibrhash) + add_subdirectory(Utilities/cmlibrhash) +@@ -512,7 +522,8 @@ macro (CMAKE_BUILD_UTILITIES) message(FATAL_ERROR "CMAKE_USE_SYSTEM_JSONCPP is ON but a JsonCpp is not found!") endif() @@ -27,7 +38,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.22 20 else() set(CMAKE_JSONCPP_LIBRARIES cmjsoncpp) add_subdirectory(Utilities/cmjsoncpp) -@@ -463,7 +473,7 @@ macro (CMAKE_BUILD_UTILITIES) +@@ -522,7 +533,7 @@ macro (CMAKE_BUILD_UTILITIES) #- # Build libuv library. if(NOT DEFINED CMAKE_USE_LIBUV) @@ -36,7 +47,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.22 20 if(APPLE) include(CheckCSourceCompiles) check_c_source_compiles(" -@@ -499,7 +509,8 @@ int main(void) { return 0; } +@@ -552,7 +563,8 @@ int main(void) { return 0; } message(FATAL_ERROR "CMAKE_USE_SYSTEM_LIBUV is ON but a libuv is not found!") endif() Index: patches/patch-Modules_CMakeCInformation_cmake === RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_CMakeCInformation_cmake,v retrieving revision 1.5 diff -u -p -u -p -r1.5 patch-Modules_CMakeCInformation_cmake --- patches/patch-Modules_CMakeCInformation_cmake 28 Nov 2016 09:15:13 - 1.5 +++ patches/patch-Modules_CMakeCInformation_cmake 10 Aug 2017 15:21:38 - @@ -1,7 +1,8 @@ $OpenBSD: patch-Modules_CMakeCInformation_cmake,v 1.5 2016/11/28 09:15:13 dcoppa Exp $ Modules/CMakeCInformation.cmake.orig Fri Nov 11 15:37:13 2016 -+++ Modules/CMakeCInf