On Mon Jul 29, 2019 at 12:12:36PM +0200, Rafael Sadowski wrote:
> Hi all porters,
>
> I sent[1] a cmake update to 3.14 which unfortunately has received no
> attention two months ago. Anyway this is a new try to update cmake.
>
> I have tried to do many things differently, here the innovations:
>
> - Stop build cmake itself with ninja. Upstream has decided not to
> support this anymore. I see no benefit and it's getting harder and
> harder to take care of.
> - Use cmake's internel libuv, json-cpp etc. to build the bootstrap
> cmake (only bootstrap). I see no reasons to do this, it's also
> getting harder to maintain this.
> - Fix SONAME in cmake ports[2]!
>
> and also the old highlights from [1]:
>
> - Fix COMPILER, it's not possible to build the old and the new cmake
> version with base-gcc, isn't.
> - It doesn't make any sense to keep the m88k XXX tags. CMake don't build
> under m88k, correct?
> - Tech cmake to detect/provide system JDK11, lua and new ruby versions
> (of course upcoming ruby 2.7)
> - I took some pre-configure commands from FreeBSDs port.
> - Add --docdir to avoid warnings and sort CONFIGURE_ARGS
>
> Tested only on amd64 with base-clang and ports-gcc.
>
> I'd be very happy if this could go forward.
>
> Best regards,
>
> RS
>
> [1]: https://marc.info/?l=openbsd-ports&m=155947250218253&w=2
> [2]: https://marc.info/?l=openbsd-ports&m=155777198827043&w=2
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/cmake/Makefile,v
> retrieving revision 1.175
> diff -u -p -u -p -r1.175 Makefile
> --- Makefile 12 Jul 2019 20:44:05 -0000 1.175
> +++ Makefile 29 Jul 2019 04:49:11 -0000
> @@ -1,18 +1,17 @@
> # $OpenBSD: Makefile,v 1.175 2019/07/12 20:44:05 sthen Exp $
>
> -DPB_PROPERTIES =parallel
> +DPB_PROPERTIES = parallel
>
> COMMENT = portable build system
>
> -VER = 3.10.2
> +VER = 3.15.0
> EPOCH = 0
> -REVISION = 3
> DISTNAME = cmake-${VER}
> CATEGORIES = devel
>
> HOMEPAGE = https://www.cmake.org/
>
> -MASTER_SITES = ${HOMEPAGE}files/v${VER:R}/
> +MASTER_SITES = https://www.cmake.org/files/v${VER:R}/
>
> # BSD
> PERMIT_PACKAGE = Yes
> @@ -20,14 +19,9 @@ PERMIT_PACKAGE = Yes
> WANTLIB += ${COMPILER_LIBCXX} archive c curl curses expat form
> WANTLIB += jsoncpp m rhash uv z
>
> -COMPILER = base-clang ports-gcc base-gcc
> +COMPILER = base-clang ports-gcc
>
> -# XXX: Ninja is broken on m88k
> -.if ${MACHINE_ARCH} != "m88k"
> -BUILD_DEPENDS = devel/ninja>=1.5.1
> -.endif
> -
> -BUILD_DEPENDS += textproc/py-sphinx>=1.4
> +BUILD_DEPENDS += textproc/py-sphinx>=1.4 \
>
Here was a small typo at the end of the line. Fixed version below.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.175
diff -u -p -u -p -r1.175 Makefile
--- Makefile 12 Jul 2019 20:44:05 -0000 1.175
+++ Makefile 29 Jul 2019 19:01:06 -0000
@@ -1,18 +1,17 @@
# $OpenBSD: Makefile,v 1.175 2019/07/12 20:44:05 sthen Exp $
-DPB_PROPERTIES =parallel
+DPB_PROPERTIES = parallel
COMMENT = portable build system
-VER = 3.10.2
+VER = 3.15.0
EPOCH = 0
-REVISION = 3
DISTNAME = cmake-${VER}
CATEGORIES = devel
HOMEPAGE = https://www.cmake.org/
-MASTER_SITES = ${HOMEPAGE}files/v${VER:R}/
+MASTER_SITES = https://www.cmake.org/files/v${VER:R}/
# BSD
PERMIT_PACKAGE = Yes
@@ -20,12 +19,7 @@ PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} archive c curl curses expat form
WANTLIB += jsoncpp m rhash uv z
-COMPILER = base-clang ports-gcc base-gcc
-
-# XXX: Ninja is broken on m88k
-.if ${MACHINE_ARCH} != "m88k"
-BUILD_DEPENDS = devel/ninja>=1.5.1
-.endif
+COMPILER = base-clang ports-gcc
BUILD_DEPENDS += textproc/py-sphinx>=1.4
@@ -36,12 +30,13 @@ LIB_DEPENDS = archivers/libarchive \
security/rhash
CONFIGURE_STYLE = simple
-CONFIGURE_ARGS = --prefix=${PREFIX} \
- --datadir=share/cmake \
+
+CONFIGURE_ARGS = --datadir=share/cmake \
--docdir=share/doc/cmake \
--mandir=man \
--no-qt-gui \
--parallel=${MAKE_JOBS} \
+ --prefix=${PREFIX} \
--sphinx-build=${LOCALBASE}/bin/sphinx-build \
--sphinx-html \
--sphinx-man \
@@ -50,44 +45,38 @@ CONFIGURE_ARGS = --prefix=${PREFIX} \
CONFIGURE_ENV += MAKE=${MAKE_PROGRAM}
+MAKE_FLAGS += VERBOSE=1
+
PORTHOME = ${WRKDIR}
SEPARATE_BUILD = Yes
TEST_TARGET = test
-MAKE_FLAGS += VERBOSE=1
+TEST_DEPENDS += devel/git
+
+SUBST_FILES = ${WRKSRC}/Source/cmLocalGenerator.cxx \
+ ${WRKSRC}/Source/CPack/cmCPackGenerator.cxx \
+ ${WRKSRC}/bootstrap
+
+post-patch:
+ (find ${WRKSRC}/Modules -name "*.cmake" -print0; \
+ find ${WRKSRC}/Tests -name "CMakeLists.txt" -print0) | \
+ xargs -0 perl -e 's,/usr/local,${LOCALBASE},g; \
+ s,/usr/X11R6,${LOCALBASE},g'
+ perl -e 's,/usr/local,${LOCALBASE},g' \
+ ${SUBST_FILES}
+ perl -e 's,/usr/include,${LOCALBASE}/include,' \
+ ${WRKSRC}/Modules/FindDCMTK.cmake \
pre-configure:
cp ${FILESDIR}/*.cmake ${WRKSRC}/Modules/
- ${SUBST_CMD} ${WRKSRC}/Modules/CMakeDetermineJavaCompiler.cmake \
- ${WRKSRC}/Modules/FindJNI.cmake \
- ${WRKSRC}/Modules/FindJava.cmake \
- ${WRKSRC}/Modules/FindMPEG.cmake \
- ${WRKSRC}/Modules/FindMPEG2.cmake \
- ${WRKSRC}/Modules/FindQt.cmake \
- ${WRKSRC}/Modules/FindQt4.cmake \
- ${WRKSRC}/Modules/FindSDL.cmake \
- ${WRKSRC}/Modules/FindTCL.cmake
-
-# XXX: Ninja is broken on m88k
-.if ${MACHINE_ARCH} != "m88k"
-do-build:
- cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} ninja -v -j \
- ${MAKE_JOBS} ${ALL_TARGET}
-
-do-install:
- cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} \
- ${FAKE_SETUP} ninja -v -j ${MAKE_JOBS} ${FAKE_TARGET}
-
-do-test:
- cd ${WRKBUILD} && exec ${SETENV} ${ALL_TEST_ENV} ninja -v -j \
- ${MAKE_JOBS} ${TEST_FLAGS} ${TEST_TARGET}
-.endif
+ (find ${WRKSRC}/Modules -name "*.cmake" -print0; \
+ find ${WRKSRC}/Tests -name "CMakeLists.txt" -print0) | \
+ xargs -0 ${SUBST_CMD}
+ ${SUBST_CMD} ${SUBST_FILES}
post-install:
- rm ${WRKINST}${LOCALBASE}/share/cmake/Modules/*.{beforesubst,orig} \
- ${WRKINST}${LOCALBASE}/share/cmake/Modules/Compiler/*.orig \
- ${WRKINST}${LOCALBASE}/share/cmake/Modules/Platform/*.orig
+ @find ${WRKINST}${LOCALBASE} \( -name "*.bak" -o -name "*.orig" -o -name "*.beforesubst" \) -exec rm {} \;
.include <bsd.port.mk>
Index: cmake.port.mk
===================================================================
RCS file: /cvs/ports/devel/cmake/cmake.port.mk,v
retrieving revision 1.64
diff -u -p -u -p -r1.64 cmake.port.mk
--- cmake.port.mk 11 Sep 2018 12:12:31 -0000 1.64
+++ cmake.port.mk 29 Jul 2019 19:01:06 -0000
@@ -9,11 +9,6 @@ MAKE_ENV+=LIB${_n}_VERSION=${_v}
USE_NINJA ?= Yes
-# XXX: Ninja is broken on m88k
-.if ${MACHINE_ARCH} == "m88k"
-USE_NINJA = No
-.endif
-
.if ${USE_NINJA:L} == "yes"
BUILD_DEPENDS += devel/ninja>=1.5.1
NINJA ?= ninja
@@ -82,15 +77,15 @@ MODCMAKE_configure= cd ${WRKBUILD} && ${
CC="${CC}" CFLAGS="${CFLAGS}" \
CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
${CONFIGURE_ENV} ${LOCALBASE}/bin/cmake \
- -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY:Bool=True \
+ -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON \
-G ${_MODCMAKE_GEN} ${CONFIGURE_ARGS} ${WRKSRC}
.if !defined(CONFIGURE_ARGS) || ! ${CONFIGURE_ARGS:M*CMAKE_BUILD_TYPE*}
. if ${MODCMAKE_DEBUG:L} == "yes"
-CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE:String=Debug
+CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE=Debug
MODCMAKE_BUILD_SUFFIX = -debug.cmake
. else
-CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE:String=Release
+CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE=Release
MODCMAKE_BUILD_SUFFIX = -release.cmake
. endif
.endif
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/cmake/distinfo,v
retrieving revision 1.53
diff -u -p -u -p -r1.53 distinfo
--- distinfo 14 Jun 2018 17:04:45 -0000 1.53
+++ distinfo 29 Jul 2019 19:01:06 -0000
@@ -1,2 +1,2 @@
-SHA256 (cmake-3.10.2.tar.gz) = gND6rUq1beB6ohp/xpLIjEzmFW1CsFecaWIASnCjIYs=
-SIZE (cmake-3.10.2.tar.gz) = 7824452
+SHA256 (cmake-3.15.0.tar.gz) = BnjXSkWDLKyuoFPYWlaF8+2DUkdebd+fy3Qv/KABmbU=
+SIZE (cmake-3.15.0.tar.gz) = 9266870
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 14 Jun 2018 17:04:45 -0000 1.26
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,50 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.26 2018/06/14 17:04:45 sthen Exp $
-Index: CMakeLists.txt
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -317,6 +317,15 @@ macro (CMAKE_BUILD_UTILITIES)
- CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}TestSharedForward "${kwsys_folder}")
- endif()
-
-+ if($ENV{LOCALBASE})
-+ set(OPENBSD_LOCALBASE $ENV{LOCALBASE})
-+ else()
-+ set(OPENBSD_LOCALBASE "/usr/local")
-+ endif()
-+
-+ # to find expat and curl
-+ link_directories("${OPENBSD_LOCALBASE}/lib")
-+
- #---------------------------------------------------------------------
- # Setup third-party libraries.
- # Everything in the tree should be able to include files from the
-@@ -350,7 +359,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)
-@@ -516,7 +526,8 @@ macro (CMAKE_BUILD_UTILITIES)
- message(FATAL_ERROR
- "CMAKE_USE_SYSTEM_JSONCPP is ON but a JsonCpp is not found!")
- endif()
-- set(CMAKE_JSONCPP_LIBRARIES JsonCpp::JsonCpp)
-+ set(CMAKE_JSONCPP_INCLUDES ${JsonCpp_INCLUDE_DIRS})
-+ set(CMAKE_JSONCPP_LIBRARIES ${JsonCpp_LIBRARIES})
- else()
- set(CMAKE_JSONCPP_LIBRARIES cmjsoncpp)
- add_subdirectory(Utilities/cmjsoncpp)
-@@ -531,7 +542,8 @@ macro (CMAKE_BUILD_UTILITIES)
- message(FATAL_ERROR
- "CMAKE_USE_SYSTEM_LIBUV is ON but a libuv is not found!")
- endif()
-- set(CMAKE_LIBUV_LIBRARIES LibUV::LibUV)
-+ set(CMAKE_LIBUV_INCLUDES ${LibUV_INCLUDE_DIRS})
-+ set(CMAKE_LIBUV_LIBRARIES ${LibUV_LIBRARIES})
- else()
- set(CMAKE_LIBUV_LIBRARIES cmlibuv)
- add_subdirectory(Utilities/cmlibuv)
Index: patches/patch-Modules_CMakeCInformation_cmake
===================================================================
RCS file: patches/patch-Modules_CMakeCInformation_cmake
diff -N patches/patch-Modules_CMakeCInformation_cmake
--- patches/patch-Modules_CMakeCInformation_cmake 14 Jun 2018 17:04:45 -0000 1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-Modules_CMakeCInformation_cmake,v 1.8 2018/06/14 17:04:45 sthen Exp $
-Index: Modules/CMakeCInformation.cmake
---- Modules/CMakeCInformation.cmake.orig
-+++ Modules/CMakeCInformation.cmake
-@@ -165,7 +165,7 @@ include(CMakeCommonLanguageInclude)
- # create a C shared library
- if(NOT CMAKE_C_CREATE_SHARED_LIBRARY)
- set(CMAKE_C_CREATE_SHARED_LIBRARY
-- "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> <SONAME_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
-+ "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
- endif()
-
- # create a C shared module just copy the shared library rule
Index: patches/patch-Modules_CMakeCXXInformation_cmake
===================================================================
RCS file: patches/patch-Modules_CMakeCXXInformation_cmake
diff -N patches/patch-Modules_CMakeCXXInformation_cmake
--- patches/patch-Modules_CMakeCXXInformation_cmake 14 Jun 2018 17:04:45 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-$OpenBSD: patch-Modules_CMakeCXXInformation_cmake,v 1.7 2018/06/14 17:04:45 sthen Exp $
---- Modules/CMakeCXXInformation.cmake.orig Fri Nov 11 15:37:13 2016
-+++ Modules/CMakeCXXInformation.cmake Fri Nov 25 22:31:44 2016
-@@ -134,10 +134,6 @@ if(NOT DEFINED CMAKE_EXE_EXPORTS_CXX_FLAG)
- set(CMAKE_EXE_EXPORTS_CXX_FLAG ${CMAKE_EXE_EXPORTS_C_FLAG})
- endif()
-
--if(NOT DEFINED CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG)
-- set(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG ${CMAKE_SHARED_LIBRARY_SONAME_C_FLAG})
--endif()
--
- if(NOT CMAKE_EXECUTABLE_RUNTIME_CXX_FLAG)
- set(CMAKE_EXECUTABLE_RUNTIME_CXX_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG})
- endif()
-@@ -253,7 +249,7 @@ include(CMakeCommonLanguageInclude)
- # create a shared C++ library
- if(NOT CMAKE_CXX_CREATE_SHARED_LIBRARY)
- set(CMAKE_CXX_CREATE_SHARED_LIBRARY
-- "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <SONAME_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
-+ "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
- endif()
-
- # create a c++ shared module copy the shared library rule by default
Index: patches/patch-Modules_CMakeFortranInformation_cmake
===================================================================
RCS file: patches/patch-Modules_CMakeFortranInformation_cmake
diff -N patches/patch-Modules_CMakeFortranInformation_cmake
--- patches/patch-Modules_CMakeFortranInformation_cmake 14 Jun 2018 17:04:45 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-$OpenBSD: patch-Modules_CMakeFortranInformation_cmake,v 1.7 2018/06/14 17:04:45 sthen Exp $
---- Modules/CMakeFortranInformation.cmake.orig Fri Nov 11 15:37:13 2016
-+++ Modules/CMakeFortranInformation.cmake Fri Nov 25 22:31:44 2016
-@@ -115,10 +115,6 @@ if(NOT DEFINED CMAKE_EXE_EXPORTS_Fortran_FLAG)
- set(CMAKE_EXE_EXPORTS_Fortran_FLAG ${CMAKE_EXE_EXPORTS_C_FLAG})
- endif()
-
--if(NOT DEFINED CMAKE_SHARED_LIBRARY_SONAME_Fortran_FLAG)
-- set(CMAKE_SHARED_LIBRARY_SONAME_Fortran_FLAG ${CMAKE_SHARED_LIBRARY_SONAME_C_FLAG})
--endif()
--
- # for most systems a module is the same as a shared library
- # so unless the variable CMAKE_MODULE_EXISTS is set just
- # copy the values from the LIBRARY variables
-@@ -182,7 +178,7 @@ include(CMakeCommonLanguageInclude)
- # create a Fortran shared library
- if(NOT CMAKE_Fortran_CREATE_SHARED_LIBRARY)
- set(CMAKE_Fortran_CREATE_SHARED_LIBRARY
-- "<CMAKE_Fortran_COMPILER> <CMAKE_SHARED_LIBRARY_Fortran_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS> <SONAME_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
-+ "<CMAKE_Fortran_COMPILER> <CMAKE_SHARED_LIBRARY_Fortran_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
- endif()
-
- # create a Fortran shared module just copy the shared library rule
Index: patches/patch-Modules_Compiler_GNU-Fortran_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_Compiler_GNU-Fortran_cmake,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-Modules_Compiler_GNU-Fortran_cmake
--- patches/patch-Modules_Compiler_GNU-Fortran_cmake 14 Mar 2018 12:24:54 -0000 1.7
+++ patches/patch-Modules_Compiler_GNU-Fortran_cmake 29 Jul 2019 19:01:06 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-Modules_Compiler_GNU-For
Index: Modules/Compiler/GNU-Fortran.cmake
--- Modules/Compiler/GNU-Fortran.cmake.orig
+++ Modules/Compiler/GNU-Fortran.cmake
-@@ -9,10 +9,6 @@ set(CMAKE_Fortran_FORMAT_FREE_FLAG "-ffree-form")
+@@ -12,10 +12,6 @@ set(CMAKE_Fortran_FORMAT_FREE_FLAG "-ffree-form")
set(CMAKE_Fortran_POSTPROCESS_FLAG "-fpreprocessed")
Index: patches/patch-Modules_Compiler_GNU_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_Compiler_GNU_cmake,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 patch-Modules_Compiler_GNU_cmake
--- patches/patch-Modules_Compiler_GNU_cmake 26 Aug 2017 17:53:35 -0000 1.12
+++ patches/patch-Modules_Compiler_GNU_cmake 29 Jul 2019 19:01:06 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-Modules_Compiler_GNU_cma
Index: Modules/Compiler/GNU.cmake
--- Modules/Compiler/GNU.cmake.orig
+++ Modules/Compiler/GNU.cmake
-@@ -39,9 +39,9 @@ macro(__compiler_gnu lang)
+@@ -49,9 +49,9 @@ macro(__compiler_gnu lang)
# Initial configuration flags.
string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g")
Index: patches/patch-Modules_FindJNI_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindJNI_cmake,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 patch-Modules_FindJNI_cmake
--- patches/patch-Modules_FindJNI_cmake 14 Jun 2018 17:04:45 -0000 1.23
+++ patches/patch-Modules_FindJNI_cmake 29 Jul 2019 19:01:06 -0000
@@ -2,16 +2,16 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v
Index: Modules/FindJNI.cmake
--- Modules/FindJNI.cmake.orig
+++ Modules/FindJNI.cmake
-@@ -25,6 +25,8 @@
- # JAVA_INCLUDE_PATH2 = the include path to jni_md.h
- # JAVA_AWT_INCLUDE_PATH = the include path to jawt.h
+@@ -45,6 +45,8 @@ The following cache variables are also available to se
+ the include path to jawt.h
+ #]=======================================================================]
+set(MODJAVA_VER $ENV{MODJAVA_VER})
+
- # Expand {libarch} occurences to java_libarch subdirectory(-ies) and set ${_var}
+ # Expand {libarch} occurrences to java_libarch subdirectory(-ies) and set ${_var}
macro(java_append_library_directories _var)
# Determine java arch-specific library subdir
-@@ -70,8 +72,10 @@ macro(java_append_library_directories _var)
+@@ -93,8 +95,10 @@ macro(java_append_library_directories _var)
# Append default list architectures if CMAKE_SYSTEM_PROCESSOR was empty or
# system is non-Linux (where the code above has not been well tested)
@@ -24,7 +24,7 @@ Index: Modules/FindJNI.cmake
endif()
# Sometimes ${CMAKE_SYSTEM_PROCESSOR} is added to the list to prefer
-@@ -107,60 +111,66 @@ if(_JAVA_HOME_EXPLICIT)
+@@ -130,17 +134,71 @@ if(_JAVA_HOME_EXPLICIT)
set(CMAKE_FIND_FRAMEWORK NEVER)
endif()
@@ -40,10 +40,9 @@ Index: Modules/FindJNI.cmake
- ${_JAVA_HOME}
+ ${LOCALBASE}/jdk-1.8.0/jre/lib/{libarch}
+ ${LOCALBASE}/jre-1.8.0/lib/{libarch}
++ ${LOCALBASE}/jdk-11/jre/lib/{libarch}
++ ${LOCALBASE}/jre-11/lib/{libarch}
)
--endif()
--get_filename_component(java_install_version
-- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit;CurrentVersion]" NAME)
+else(MODJAVA_VER)
+ set(JAVA_AWT_LIBRARY_DIRECTORIES)
+ if(_JAVA_HOME)
@@ -54,178 +53,68 @@ Index: Modules/FindJNI.cmake
+ ${_JAVA_HOME}/lib
+ ${_JAVA_HOME}
+ )
-+ endif()
-+ get_filename_component(java_install_version
-+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit;CurrentVersion]" NAME)
-
--list(APPEND JAVA_AWT_LIBRARY_DIRECTORIES
-- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/lib"
-- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/lib"
-- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/lib"
-- )
--JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
-- /usr/lib
-- /usr/local/lib
-- /usr/lib/jvm/java/lib
-- /usr/lib/java/jre/lib/{libarch}
-- /usr/lib/jvm/jre/lib/{libarch}
-- /usr/local/lib/java/jre/lib/{libarch}
-- /usr/local/share/java/jre/lib/{libarch}
-- /usr/lib/j2sdk1.4-sun/jre/lib/{libarch}
-- /usr/lib/j2sdk1.5-sun/jre/lib/{libarch}
-- /opt/sun-jdk-1.5.0.04/jre/lib/{libarch}
-- /usr/lib/jvm/java-6-sun/jre/lib/{libarch}
-- /usr/lib/jvm/java-1.5.0-sun/jre/lib/{libarch}
-- /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/{libarch} # can this one be removed according to #8821 ? Alex
-- /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
-- /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/{libarch} # fedora
-- # Debian specific paths for default JVM
-- /usr/lib/jvm/default-java/jre/lib/{libarch}
-- /usr/lib/jvm/default-java/jre/lib
-- /usr/lib/jvm/default-java/lib
-- # Arch Linux specific paths for default JVM
-- /usr/lib/jvm/default/jre/lib/{libarch}
-- /usr/lib/jvm/default/lib/{libarch}
-- # Ubuntu specific paths for default JVM
-- /usr/lib/jvm/java-8-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10
-- /usr/lib/jvm/java-7-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10
-- /usr/lib/jvm/java-6-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10
-- # OpenBSD specific paths for default JVM
-- /usr/local/jdk-1.7.0/jre/lib/{libarch}
-- /usr/local/jre-1.7.0/lib/{libarch}
-- /usr/local/jdk-1.6.0/jre/lib/{libarch}
-- /usr/local/jre-1.6.0/lib/{libarch}
-- # SuSE specific paths for default JVM
-- /usr/lib64/jvm/java/jre/lib/{libarch}
-- /usr/lib64/jvm/jre/lib/{libarch}
-- )
-+ list(APPEND JAVA_AWT_LIBRARY_DIRECTORIES
-+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/lib"
-+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/lib"
-+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/lib"
-+ )
-+ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
-+ /usr/lib
-+ /usr/local/lib
-+ /usr/lib/jvm/java/lib
-+ /usr/lib/java/jre/lib/{libarch}
-+ /usr/lib/jvm/jre/lib/{libarch}
-+ /usr/local/lib/java/jre/lib/{libarch}
-+ /usr/local/share/java/jre/lib/{libarch}
-+ /usr/lib/j2sdk1.4-sun/jre/lib/{libarch}
-+ /usr/lib/j2sdk1.5-sun/jre/lib/{libarch}
-+ /opt/sun-jdk-1.5.0.04/jre/lib/{libarch}
-+ /usr/lib/jvm/java-6-sun/jre/lib/{libarch}
-+ /usr/lib/jvm/java-1.5.0-sun/jre/lib/{libarch}
-+ /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/{libarch} # can this one be removed according to #8821 ? Alex
-+ /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
-+ /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/{libarch} # fedora
-+ # Debian specific paths for default JVM
-+ /usr/lib/jvm/default-java/jre/lib/{libarch}
-+ /usr/lib/jvm/default-java/jre/lib
-+ /usr/lib/jvm/default-java/lib
-+ # Arch Linux specific paths for default JVM
-+ /usr/lib/jvm/default/jre/lib/{libarch}
-+ /usr/lib/jvm/default/lib/{libarch}
-+ # Ubuntu specific paths for default JVM
-+ /usr/lib/jvm/java-8-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10
-+ /usr/lib/jvm/java-7-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10
-+ /usr/lib/jvm/java-6-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10
-+ # OpenBSD specific paths for default JVM
-+ ${LOCALBASE}/jdk-1.8.0/jre/lib/{libarch}
-+ ${LOCALBASE}/jre-1.8.0/lib/{libarch}
-+ # SuSE specific paths for default JVM
-+ /usr/lib64/jvm/java/jre/lib/{libarch}
-+ /usr/lib64/jvm/jre/lib/{libarch}
-+ )
+ endif()
++list(APPEND JAVA_AWT_LIBRARY_DIRECTORIES
++ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/lib"
++ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/lib"
++ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/lib"
++ )
++JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
++ /usr/lib
++ /usr/local/lib
++ /usr/lib/jvm/java/lib
++ /usr/lib/java/jre/lib/{libarch}
++ /usr/lib/jvm/jre/lib/{libarch}
++ /usr/local/lib/java/jre/lib/{libarch}
++ /usr/local/share/java/jre/lib/{libarch}
++ /usr/lib/j2sdk1.4-sun/jre/lib/{libarch}
++ /usr/lib/j2sdk1.5-sun/jre/lib/{libarch}
++ /opt/sun-jdk-1.5.0.04/jre/lib/{libarch}
++ /usr/lib/jvm/java-6-sun/jre/lib/{libarch}
++ /usr/lib/jvm/java-1.5.0-sun/jre/lib/{libarch}
++ /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/{libarch} # can this one be removed ac
++ /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
++ /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/{libarch} # fedora
++ # Debian specific paths for default JVM
++ /usr/lib/jvm/default-java/jre/lib/{libarch}
++ /usr/lib/jvm/default-java/jre/lib
++ /usr/lib/jvm/default-java/lib
++ # Arch Linux specific paths for default JVM
++ /usr/lib/jvm/default/jre/lib/{libarch}
++ /usr/lib/jvm/default/lib/{libarch}
++ # Ubuntu specific paths for default JVM
++ /usr/lib/jvm/java-8-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10
++ /usr/lib/jvm/java-7-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10
++ /usr/lib/jvm/java-6-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10
++ # OpenBSD specific paths for default JVM
++ ${LOCALBASE}/jdk-1.8.0/jre/lib/{libarch}
++ ${LOCALBASE}/jre-1.8.0/lib/{libarch}
++ ${LOCALBASE}/jdk-11/jre/lib/{libarch}
++ ${LOCALBASE}/jre-11/lib/{libarch}
++ # SuSE specific paths for default JVM
++ /usr/lib64/jvm/java/jre/lib/{libarch}
++ /usr/lib64/jvm/jre/lib/{libarch}
++ )
+endif(MODJAVA_VER)
- set(JAVA_JVM_LIBRARY_DIRECTORIES)
- foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
-@@ -174,43 +184,50 @@ foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
- )
- endforeach()
-
--set(JAVA_AWT_INCLUDE_DIRECTORIES)
--if(_JAVA_HOME)
-- list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES ${_JAVA_HOME}/include)
--endif()
--list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES
-- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include"
-- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
-- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
--)
--
--JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_INCLUDE_DIRECTORIES
-- /usr/include
-- /usr/local/include
-- /usr/lib/java/include
-- /usr/local/lib/java/include
-- /usr/lib/jvm/java/include
-- /usr/lib/jvm/java-6-sun/include
-- /usr/lib/jvm/java-1.5.0-sun/include
-- /usr/lib/jvm/java-6-sun-1.6.0.00/include # can this one be removed according to #8821 ? Alex
-- /usr/lib/jvm/java-6-openjdk/include
-- /usr/lib/jvm/java-8-openjdk-{libarch}/include # ubuntu 15.10
-- /usr/lib/jvm/java-7-openjdk-{libarch}/include # ubuntu 15.10
-- /usr/lib/jvm/java-6-openjdk-{libarch}/include # ubuntu 15.10
-- /usr/local/share/java/include
-- /usr/lib/j2sdk1.4-sun/include
-- /usr/lib/j2sdk1.5-sun/include
-- /opt/sun-jdk-1.5.0.04/include
-- # Debian specific path for default JVM
-- /usr/lib/jvm/default-java/include
-- # Arch specific path for default JVM
-- /usr/lib/jvm/default/include
-- # OpenBSD specific path for default JVM
-- /usr/local/jdk-1.7.0/include
-- /usr/local/jdk-1.6.0/include
-- # SuSE specific paths for default JVM
-- /usr/lib64/jvm/java/include
-+if(MODJAVA_VER)
-+ set(JAVA_AWT_INCLUDE_DIRECTORIES)
-+ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_INCLUDE_DIRECTORIES
-+ ${LOCALBASE}/jdk-1.8.0/include
-+ )
-+else(MODJAVA_VER)
-+ set(JAVA_AWT_INCLUDE_DIRECTORIES)
-+ if(_JAVA_HOME)
-+ list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES ${_JAVA_HOME}/include)
-+ endif()
-+ list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES
-+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include"
-+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
-+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
-+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
- )
++get_filename_component(java_install_version
++ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit;CurrentVersion]" NAME)
+
-+ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_INCLUDE_DIRECTORIES
-+ /usr/include
-+ /usr/local/include
-+ /usr/lib/java/include
-+ /usr/local/lib/java/include
-+ /usr/lib/jvm/java/include
-+ /usr/lib/jvm/java-6-sun/include
-+ /usr/lib/jvm/java-1.5.0-sun/include
-+ /usr/lib/jvm/java-6-sun-1.6.0.00/include # can this one be removed according to #8821 ? Alex
-+ /usr/lib/jvm/java-6-openjdk/include
-+ /usr/lib/jvm/java-8-openjdk-{libarch}/include # ubuntu 15.10
-+ /usr/lib/jvm/java-7-openjdk-{libarch}/include # ubuntu 15.10
-+ /usr/lib/jvm/java-6-openjdk-{libarch}/include # ubuntu 15.10
-+ /usr/local/share/java/include
-+ /usr/lib/j2sdk1.4-sun/include
-+ /usr/lib/j2sdk1.5-sun/include
-+ /opt/sun-jdk-1.5.0.04/include
-+ # Debian specific path for default JVM
-+ /usr/lib/jvm/default-java/include
-+ # Arch specific path for default JVM
-+ /usr/lib/jvm/default/include
-+ # OpenBSD specific path for default JVM
-+ ${LOCALBASE}/jdk-1.8.0/include
-+ # SuSE specific paths for default JVM
-+ /usr/lib64/jvm/java/include
-+ )
-+endif(MODJAVA_VER)
-
- foreach(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}")
- get_filename_component(jpath "${JAVA_PROG}" PATH)
+ if (WIN32)
+ set (_JNI_HINTS)
+ execute_process(COMMAND REG QUERY HKLM\\SOFTWARE\\JavaSoft\\JDK /f "." /k
+@@ -209,10 +267,10 @@ set(_JNI_JAVA_DIRECTORIES_BASE
+ /usr/lib/jvm/java-7-openjdk-{libarch} # Ubuntu 15.10
+ /usr/lib/jvm/java-6-openjdk-{libarch} # Ubuntu 15.10
+ # OpenBSD specific paths for default JVM
+- /usr/local/jdk-1.7.0
+- /usr/local/jre-1.7.0
+- /usr/local/jdk-1.6.0
+- /usr/local/jre-1.6.0
++ ${LOCALBASE}/jdk-1.8.0
++ ${LOCALBASE}/jre-1.8.0
++ ${LOCALBASE}/jdk-11
++ ${LOCALBASE}/jre-11
+ # SuSE specific paths for default JVM
+ /usr/lib64/jvm/java
+ /usr/lib64/jvm/jre
Index: patches/patch-Modules_FindJava_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindJava_cmake,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 patch-Modules_FindJava_cmake
--- patches/patch-Modules_FindJava_cmake 14 Jun 2018 17:04:45 -0000 1.24
+++ patches/patch-Modules_FindJava_cmake 29 Jul 2019 19:01:06 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-Modules_FindJava_cmake,v
Index: Modules/FindJava.cmake
--- Modules/FindJava.cmake.orig
+++ Modules/FindJava.cmake
-@@ -72,6 +72,8 @@
+@@ -78,6 +78,8 @@ Example Usages:
include(${CMAKE_CURRENT_LIST_DIR}/CMakeFindJavaCommon.cmake)
@@ -11,8 +11,8 @@ Index: Modules/FindJava.cmake
# The HINTS option should only be used for values computed from the system.
set(_JAVA_HINTS)
if(_JAVA_HOME)
-@@ -97,19 +99,22 @@ list(APPEND _JAVA_HINTS
- )
+@@ -133,19 +135,22 @@ endif()
+
# Hard-coded guesses should still go in PATHS. This ensures that the user
# environment can always override hard guesses.
-set(_JAVA_PATHS
Index: patches/patch-Modules_FindKDE3_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindKDE3_cmake,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-Modules_FindKDE3_cmake
--- patches/patch-Modules_FindKDE3_cmake 14 Jun 2018 17:04:45 -0000 1.6
+++ patches/patch-Modules_FindKDE3_cmake 29 Jul 2019 19:01:06 -0000
@@ -1,16 +1,17 @@
-$OpenBSD: patch-Modules_FindKDE3_cmake,v 1.6 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD$
+
Index: Modules/FindKDE3.cmake
--- Modules/FindKDE3.cmake.orig
+++ Modules/FindKDE3.cmake
@@ -294,12 +294,6 @@ if(KDE3_FOUND)
- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common")
- endif ()
+ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common")
+ endif ()
-- # if no special buildtype is selected, add -O2 as default optimization
-- if (NOT CMAKE_BUILD_TYPE AND _KDE3_USE_FLAGS)
-- set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2")
-- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
-- endif ()
+- # if no special buildtype is selected, add -O2 as default optimization
+- if (NOT CMAKE_BUILD_TYPE AND _KDE3_USE_FLAGS)
+- set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
+- endif ()
-
#set(CMAKE_SHARED_LINKER_FLAGS "-avoid-version -module -Wl,--no-undefined -Wl,--allow-shlib-undefined")
#set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -avoid-version -Wl,--no-undefined -lc")
Index: patches/patch-Modules_FindLua_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindLua_cmake,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-Modules_FindLua_cmake
--- patches/patch-Modules_FindLua_cmake 26 Aug 2017 17:53:35 -0000 1.6
+++ patches/patch-Modules_FindLua_cmake 29 Jul 2019 19:01:06 -0000
@@ -1,8 +1,9 @@
-$OpenBSD: patch-Modules_FindLua_cmake,v 1.6 2017/08/26 17:53:35 dcoppa Exp $
+$OpenBSD$
+
Index: Modules/FindLua.cmake
--- Modules/FindLua.cmake.orig
+++ Modules/FindLua.cmake
-@@ -40,9 +40,16 @@ unset(_lua_include_subdirs)
+@@ -46,9 +46,16 @@ unset(_lua_include_subdirs)
unset(_lua_library_names)
unset(_lua_append_versions)
@@ -10,24 +11,23 @@ Index: Modules/FindLua.cmake
+set(MODLUA_INCL_DIR $ENV{MODLUA_INCL_DIR})
+
# this is a function only to have all the variables inside go away automatically
- function(_lua_set_version_vars)
+ function(_lua_get_versions)
- set(LUA_VERSIONS5 5.3 5.2 5.1 5.0)
+ if(MODLUA_VERSION)
-+ set(LUA_VERSIONS5 ${MODLUA_VERSION})
++ set(LUA_VERSIONS5 ${MODLUA_VERSION})
+ else()
-+ set(LUA_VERSIONS5 5.3 5.2 5.1 5.0)
++ set(LUA_VERSIONS5 5.3 5.2 5.1 5.0)
+ endif()
if (Lua_FIND_VERSION_EXACT)
if (Lua_FIND_VERSION_COUNT GREATER 1)
-@@ -114,6 +121,10 @@ function(_lua_check_header_version _hdr_file)
- endfunction(_lua_check_header_version)
+@@ -145,6 +152,9 @@ endfunction(_lua_get_header_version)
- _lua_set_version_vars()
-+
-+if(MODLUA_INCL_DIR)
-+ set(LUA_INCLUDE_DIR "${MODLUA_INCL_DIR}")
-+endif()
+ function(_lua_find_header)
+ _lua_set_version_vars()
++ if(MODLUA_INCL_DIR)
++ set(LUA_INCLUDE_DIR "${MODLUA_INCL_DIR}")
++ endif()
- if (LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/lua.h")
- _lua_check_header_version("${LUA_INCLUDE_DIR}/lua.h")
+ # Initialize as local variable
+ set(CMAKE_IGNORE_PATH ${CMAKE_IGNORE_PATH})
Index: patches/patch-Modules_FindMPEG2_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindMPEG2_cmake,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 patch-Modules_FindMPEG2_cmake
--- patches/patch-Modules_FindMPEG2_cmake 14 Jun 2018 17:04:45 -0000 1.10
+++ patches/patch-Modules_FindMPEG2_cmake 29 Jul 2019 19:01:06 -0000
@@ -2,36 +2,7 @@ $OpenBSD: patch-Modules_FindMPEG2_cmake,
Index: Modules/FindMPEG2.cmake
--- Modules/FindMPEG2.cmake.orig
+++ Modules/FindMPEG2.cmake
-@@ -23,24 +23,19 @@
- # MPEG2_vo_LIBRARY, where to find the vo library.
-
- find_path(MPEG2_INCLUDE_DIR
-- NAMES mpeg2.h mpeg2dec/mpeg2.h
-- PATHS /usr/local/livid
-+ NAMES mpeg2dec/mpeg2.h
-+ PATHS ${LOCALBASE}/include
- )
-
- find_library(MPEG2_mpeg2_LIBRARY mpeg2
-- /usr/local/livid/mpeg2dec/libmpeg2/.libs
-+ ${LOCALBASE}/lib
- )
-
--find_library( MPEG2_vo_LIBRARY vo
-- /usr/local/livid/mpeg2dec/libvo/.libs
--)
--
- include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG2 DEFAULT_MSG MPEG2_mpeg2_LIBRARY MPEG2_INCLUDE_DIR)
-
- if(MPEG2_FOUND)
-- set( MPEG2_LIBRARIES ${MPEG2_mpeg2_LIBRARY}
-- ${MPEG2_vo_LIBRARY})
-+ set( MPEG2_LIBRARIES ${MPEG2_mpeg2_LIBRARY})
-
- #some native mpeg2 installations will depend
- #on libSDL, if found, add it in.
-@@ -50,4 +45,4 @@ if(MPEG2_FOUND)
+@@ -47,4 +47,4 @@ if(MPEG2_FOUND)
endif()
endif()
Index: patches/patch-Modules_FindMPEG_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindMPEG_cmake,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 patch-Modules_FindMPEG_cmake
--- patches/patch-Modules_FindMPEG_cmake 14 Jun 2018 17:04:45 -0000 1.11
+++ patches/patch-Modules_FindMPEG_cmake 29 Jul 2019 19:01:06 -0000
@@ -2,32 +2,17 @@ $OpenBSD: patch-Modules_FindMPEG_cmake,v
Index: Modules/FindMPEG.cmake
--- Modules/FindMPEG.cmake.orig
+++ Modules/FindMPEG.cmake
-@@ -22,23 +22,19 @@
- # MPEG_mpeg2_LIBRARY, where to find the MPEG library.
- # MPEG_vo_LIBRARY, where to find the vo library.
+@@ -28,8 +28,6 @@ find_path(MPEG_INCLUDE_DIR
--find_path(MPEG_INCLUDE_DIR mpeg2dec/include/video_out.h
-- /usr/local/livid
-+find_path(MPEG_INCLUDE_DIR mpeg2dec/mpeg2.h
-+ ${LOCALBASE}/include
- )
+ find_library(MPEG_mpeg2_LIBRARY mpeg2)
- find_library(MPEG_mpeg2_LIBRARY mpeg2
-- /usr/local/livid/mpeg2dec/libmpeg2/.libs
-+ ${LOCALBASE}/lib
- )
-
--find_library( MPEG_vo_LIBRARY vo
-- /usr/local/livid/mpeg2dec/libvo/.libs
--)
+-find_library(MPEG_vo_LIBRARY vo)
-
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
--FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG DEFAULT_MSG MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY MPEG_vo_LIBRARY)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG DEFAULT_MSG MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG DEFAULT_MSG MPEG_mpeg2_LIBRARY MPEG_INCLUDE_DIR)
- if(MPEG_FOUND)
-- set( MPEG_LIBRARIES ${MPEG_mpeg2_LIBRARY} ${MPEG_vo_LIBRARY} )
-+ set( MPEG_LIBRARIES ${MPEG_mpeg2_LIBRARY} )
+@@ -40,4 +38,4 @@ if(MPEG_FOUND)
+ endif()
endif()
-mark_as_advanced(MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY MPEG_vo_LIBRARY)
Index: patches/patch-Modules_FindOpenMP_cmake
===================================================================
RCS file: patches/patch-Modules_FindOpenMP_cmake
diff -N patches/patch-Modules_FindOpenMP_cmake
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Modules_FindOpenMP_cmake 29 Jul 2019 19:01:06 -0000
@@ -0,0 +1,27 @@
+$OpenBSD$
+
+Add libs and paths. Ensure the lib is used for the C case.
+
+Index: Modules/FindOpenMP.cmake
+--- Modules/FindOpenMP.cmake.orig
++++ Modules/FindOpenMP.cmake
+@@ -84,8 +84,8 @@ function(_OPENMP_FLAG_CANDIDATES LANG)
+ if(NOT OpenMP_${LANG}_FLAG)
+ unset(OpenMP_FLAG_CANDIDATES)
+
+- set(OMP_FLAG_GNU "-fopenmp")
+- set(OMP_FLAG_Clang "-fopenmp=libomp" "-fopenmp=libiomp5" "-fopenmp")
++ set(OMP_FLAG_GNU "-fopenmp -lgomp")
++ set(OMP_FLAG_Clang "-fopenmp -I${LOCALBASE}/include -Wl,-L${LOCALBASE}/lib,-lomp")
+ set(OMP_FLAG_AppleClang "-Xclang -fopenmp")
+ set(OMP_FLAG_HP "+Oopenmp")
+ if(WIN32)
+@@ -127,7 +127,7 @@ set(OpenMP_C_CXX_TEST_SOURCE
+ int main(void) {
+ #ifdef _OPENMP
+ omp_get_max_threads();
+- return 0;
++ return 0*omp_get_num_threads();
+ #else
+ breaks_on_purpose
+
No comments:
Post a Comment