pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/devel/cmake
Module Name: pkgsrc
Committed By: prlw1
Date: Thu Jul 28 17:44:43 UTC 2016
Modified Files:
pkgsrc/devel/cmake: Makefile PLIST distinfo
pkgsrc/devel/cmake/patches: patch-CMakeLists.txt
patch-Source_CursesDialog_ccmake.cxx patch-Source_cmELF.cxx
Added Files:
pkgsrc/devel/cmake: Makefile.version
Log Message:
Update cmake to 3.6.1
CMake 3.6 Release Notes
***********************
Changes made since CMake 3.5 include the following.
New Features
============
Generators
----------
* The :generator:`Ninja` generator learned to produce phony targets
of the form ``sub/dir/all`` to drive the build of a subdirectory.
This is equivalent to ``cd sub/dir; make all`` with
:ref:`Makefile Generators`.
* The :generator:`Ninja` generator now includes system header files in build
dependencies to ensure correct re-builds when system packages are updated.
* The :generator:`Visual Studio 14 2015` generator learned to support the
Clang/C2 toolsets, e.g. with the ``-T v140_clang_3_7`` option.
This feature is experimental.
Commands
--------
* The :command:`add_custom_command` and :command:`add_custom_target` commands
learned how to use the :prop_tgt:`CROSSCOMPILING_EMULATOR` executable
target property.
* The :command:`install` command learned a new ``EXCLUDE_FROM_ALL`` option
to leave installation rules out of the default installation.
* The :command:`list` command gained a ``FILTER`` sub-command to filter
list elements by regular expression.
* The :command:`string(TIMESTAMP)` and :command:`file(TIMESTAMP)`
commands gained support for the ``%s`` placeholder. This is
the number of seconds since the UNIX Epoch.
Variables
---------
* A :variable:`CMAKE_DEPENDS_IN_PROJECT_ONLY` variable was introduced
to tell :ref:`Makefile Generators` to limit dependency scanning only
to files in the project source and build trees.
* A new :variable:`CMAKE_HOST_SOLARIS` variable was introduced to
indicate when CMake is running on an Oracle Solaris host.
* A :variable:`CMAKE_<LANG>_STANDARD_INCLUDE_DIRECTORIES` variable was
added for use by toolchain files to specify system include directories
to be appended to all compiler command lines.
* The :variable:`CMAKE_<LANG>_STANDARD_LIBRARIES` variable is now documented.
It is intended for use by toolchain files to specify system libraries to be
added to all linker command lines.
* A :variable:`CMAKE_NINJA_OUTPUT_PATH_PREFIX` variable was introduced
to tell the :generator:`Ninja` generator to configure the generated
``build.ninja`` file for use as a ``subninja``.
* A :variable:`CMAKE_TRY_COMPILE_PLATFORM_VARIABLES` variable was
added for use by toolchain files to specify platform-specific
variables that must be propagated by the :command:`try_compile`
command into test projects.
* A :variable:`CMAKE_TRY_COMPILE_TARGET_TYPE` variable was added
to optionally tell the :command:`try_compile` command to build
a static library instead of an executable. This is useful for
cross-compiling toolchains that cannot link binaries without
custom flags or scripts.
Properties
----------
* A :prop_tgt:`DEPLOYMENT_REMOTE_DIRECTORY` target property was introduced
to tell the :generator:`Visual Studio 9 2008` and
:generator:`Visual Studio 8 2005` generators to generate the "remote
directory" for WinCE project deployment and debugger settings.
* A :prop_tgt:`<LANG>_CLANG_TIDY` target property and supporting
:variable:`CMAKE_<LANG>_CLANG_TIDY` variable were introduced to tell the
:ref:`Makefile Generators` and the :generator:`Ninja` generator to run
``clang-tidy`` along with the compiler for ``C`` and ``CXX`` languages.
* A :prop_test:`TIMEOUT_AFTER_MATCH` test property was introduced to
optionally tell CTest to enforce a secondary timeout after matching
certain output from a test.
* A :prop_tgt:`VS_CONFIGURATION_TYPE` target property was introduced
to specify a custom project file type for :ref:`Visual Studio Generators`
supporting VS 2010 and above.
* A :prop_dir:`VS_STARTUP_PROJECT` directory property was introduced
to specify for :ref:`Visual Studio Generators` the default startup
project for generated solutions (``.sln`` files).
Modules
-------
* The :module:`CMakePushCheckState` module now pushes/pops/resets the variable
``CMAKE_EXTRA_INCLUDE_FILE`` used in :module:`CheckTypeSize`.
* The :module:`ExternalProject` module leared the ``GIT_SHALLOW 1``
option to perform a shallow clone of a Git repository.
* The :module:`ExternalProject` module learned to initialize Git submodules
recursively and also to initialize new submodules on updates. Use the
``GIT_SUBMODULES`` option to restrict which submodules are initalized and
updated.
* The :module:`ExternalProject` module leared the ``DOWNLOAD_NO_EXTRACT 1``
argument to skip extracting the file that is downloaded (e.g., for
self-extracting shell installers or ``.msi`` files).
* The :module:`ExternalProject` module now uses ``TLS_VERIFY`` when fetching
from git repositories.
* The :module:`FindBLAS` and :module:`FindLAPACK` modules learned to
support `OpenBLAS <http://www.openblas.net>`__.
* The :module:`FindCUDA` module learned to find the ``cublas_device`` library.
* The :module:`FindGTest` module ``gtest_add_tests`` function now causes
CMake to automatically re-run when test sources change so that they
can be re-scanned.
* The :module:`FindLTTngUST` module was introduced to find the LTTng-UST
library.
* The :module:`FindPkgConfig` module learned to optionally create imported
targets for the libraries it has found.
* The :module:`FindProtobuf` module learned to provide a ``Protobuf_VERSION``
variable and check the version number requested in a :command:`find_package`
call.
* The :module:`InstallRequiredSystemLibraries` module learned a new
``CMAKE_INSTALL_UCRT_LIBRARIES`` option to enable app-local deployment
of the Windows Universal CRT libraries with Visual Studio 2015.
Platforms
---------
* The Clang compiler is now supported on CYGWIN.
* Support was added for the Bruce C Compiler with compiler id ``Bruce``.
CTest
-----
* The :command:`ctest_update` command now looks at the
:variable:`CTEST_GIT_INIT_SUBMODULES` variable to determine whether
submodules should be updated or not before updating.
* The :command:`ctest_update` command will now synchronize submodules on an
update. Updates which add submodules or change a submodule's URL will now be
pulled properly.
CPack
-----
* The :module:`CPackDeb` module learned how to handle ``$ORIGIN``
in ``CMAKE_INSTALL_RPATH`` when :variable:`CPACK_DEBIAN_PACKAGE_SHLIBDEPS`
is used for dependency auto detection.
* The :module:`CPackDeb` module learned how to generate ``DEBIAN/shlibs``
contorl file when package contains shared libraries.
* The :module:`CPackDeb` module learned how to generate ``DEBIAN/postinst`` and
``DEBIAN/postrm`` files if the package installs libraries in
ldconfig-controlled locations (e.g. ``/lib/``, ``/usr/lib/``).
* The :module:`CPackDeb` module learned how to generate dependencies between
Debian packages if multi-component setup is used and
:variable:`CPACK_COMPONENT_<compName>_DEPENDS` variables are set.
For backward compatibility this feature is disabled by default.
See :variable:`CPACK_DEBIAN_ENABLE_COMPONENT_DEPENDS`.
* The :module:`CPackDeb` module learned how to set custom package file names
including how to generate properly-named Debian packages::
<PackageName>_<VersionNumber>-<DebianRevisionNumber>_<DebianArchitecture>.deb
For backward compatibility this feature is disabled by default. See
:variable:`CPACK_DEBIAN_FILE_NAME` and
:variable:`CPACK_DEBIAN_<COMPONENT>_FILE_NAME`.
* The :module:`CPackDeb` module learned how to set the package release number
(``DebianRevisionNumber`` in package file name when used in combination with
``DEB-DEFAULT`` value set by :variable:`CPACK_DEBIAN_FILE_NAME`). See
:variable:`CPACK_DEBIAN_PACKAGE_RELEASE`.
* The :module:`CPackDeb` module learned how to set the package architecture
per-component. See :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_ARCHITECTURE`.
* The :module:`CPackDMG` module learned a new option to tell the CPack
``DragNDrop`` generaor to skip the ``/Applications`` symlink.
See the :variable:`CPACK_DMG_DISABLE_APPLICATIONS_SYMLINK` variable.
* The :module:`CPackIFW` module gained a new
:command:`cpack_ifw_update_repository` command to update a QtIFW-specific
repository from a remote repository.
* The :module:`CPackRPM` module learned how to set RPM ``dist`` tag as part of
RPM ``Release:`` tag when enabled (mandatory on some Linux distributions for
e.g. on Fedora).
See :variable:`CPACK_RPM_PACKAGE_RELEASE_DIST`.
* The :module:`CPackRPM` module learned how to set default values for owning
user/group and file/directory permissions of package content.
See :variable:`CPACK_RPM_DEFAULT_USER`, :variable:`CPACK_RPM_DEFAULT_GROUP`,
:variable:`CPACK_RPM_DEFAULT_FILE_PERMISSIONS`,
:variable:`CPACK_RPM_DEFAULT_DIR_PERMISSIONS` and their per component
counterparts.
* The :module:`CPackRPM` module learned how to set user defined package file
names, how to specify that rpmbuild should decide on file name format as
well as handling of multiple rpm packages generated by a single user defined
spec file.
See :variable:`CPACK_RPM_PACKAGE_NAME` and
:variable:`CPACK_RPM_<component>_PACKAGE_NAME`.
* The :module:`CPackRPM` module learned how to correctly handle symlinks
that are pointing outside generated packages.
Other
-----
* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
is now aware of features supported by Intel C++ compilers versions 12.1
through 16.0 on UNIX platforms.
Deprecated and Removed Features
===============================
* The :module:`CMakeForceCompiler` module and its macros are now deprecated.
See module documentation for an explanation.
* The :command:`find_library`, :command:`find_path`, and :command:`find_file`
commands no longer search in installation prefixes derived from the ``PATH``
environment variable on non-Windows platforms. This behavior was added in
CMake 3.3 to support Windows hosts but has proven problematic on UNIX hosts.
Users that keep some ``<prefix>/bin`` directories in the ``PATH`` just for
their tools do not necessarily want any supporting ``<prefix>/lib``
directories searched. One may set the ``CMAKE_PREFIX_PATH`` environment
variable with a :ref:`;-list <CMake Language Lists>` of prefixes that are
to be searched.
* The :generator:`Visual Studio 7 .NET 2003` generator is now
deprecated and will be removed in a future version of CMake.
* The :generator:`Visual Studio 7` generator (for VS .NET 2002) has been
removed. It had been deprecated since CMake 3.3.
* The :generator:`Visual Studio 6` generator has been removed.
It had been deprecated since CMake 3.3.
Other Changes
=============
* The precompiled OS X binary provided on ``cmake.org`` now requires
OS X 10.7 or newer.
* On Linux and FreeBSD platforms, when building CMake itself from source and
not using a system-provided libcurl, OpenSSL is now used by default if it is
found on the system. This enables SSL/TLS support for commands supporting
network communication via ``https``, such as :command:`file(DOWNLOAD)`,
:command:`file(UPLOAD)`, and :command:`ctest_submit`.
* The :manual:`cmake(1)` ``--build`` command-line tool now rejects multiple
``--target`` options with an error instead of silently ignoring all but the
last one.
* :prop_tgt:`AUTOMOC` now diagnoses name collisions when multiple source
files in different directories use ``#include <moc_foo.cpp>`` with the
same name (because the generated ``moc_foo.cpp`` files would collide).
* The :module:`FindBISON` module ``BISON_TARGET`` macro now supports
special characters by passing the ``VERBATIM`` option to internal
:command:`add_custom_command` calls. This may break clients that
added escaping manually to work around the bug.
* The :module:`FindFLEX` module ``FLEX_TARGET`` macro now supports
special characters by passing the ``VERBATIM`` option to internal
:command:`add_custom_command` calls. This may break clients that
added escaping manually to work around the bug.
* The :module:`FindProtobuf` module input and output variables were all renamed
from ``PROTOBUF_`` to ``Protobuf_`` for consistency with other find modules.
Input variables of the old case will be honored if provided, and output
variables of the old case are always provided.
* The :module:`CPackRPM` module now supports upper cased component
names in per component CPackRPM specific variables.
E.g. component named ``foo`` now expects component specific
variable to be ``CPACK_RPM_FOO_PACKAGE_NAME`` while before
it expected ``CPACK_RPM_foo_PACKAGE_NAME``.
Upper cased component name part in variables is compatible
with convention used for other CPack variables.
For back compatibility old format of variables is still valid
and preferred if both versions of variable are set, but the
preferred future use is upper cased component names in variables.
New variables that will be added to CPackRPM in later versions
will only support upper cased component variable format.
* The CPack NSIS generator's configuration file template was fixed to
quote the path to the uninstaller tool used by the
:variable:`CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL` option.
This avoids depending on an insecure Windows feature to run an
uninstaller tool with a space in the path.
To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 pkgsrc/devel/cmake/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/cmake/Makefile.version
cvs rdiff -u -r1.41 -r1.42 pkgsrc/devel/cmake/PLIST
cvs rdiff -u -r1.88 -r1.89 pkgsrc/devel/cmake/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/cmake/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/devel/cmake/patches/patch-Source_CursesDialog_ccmake.cxx
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/cmake/patches/patch-Source_cmELF.cxx
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/devel/cmake/Makefile
diff -u pkgsrc/devel/cmake/Makefile:1.119 pkgsrc/devel/cmake/Makefile:1.120
--- pkgsrc/devel/cmake/Makefile:1.119 Fri Jul 1 17:55:23 2016
+++ pkgsrc/devel/cmake/Makefile Thu Jul 28 17:44:43 2016
@@ -1,13 +1,11 @@
-# $NetBSD: Makefile,v 1.119 2016/07/01 17:55:23 jperkin Exp $
+# $NetBSD: Makefile,v 1.120 2016/07/28 17:44:43 prlw1 Exp $
-DISTNAME= cmake-${CMAKE_API}.2
-PKGREVISION= 1
+.include "Makefile.version"
+
+DISTNAME= cmake-${CMAKE_VERSION}
CATEGORIES= devel
MASTER_SITES= https://cmake.org/files/v${CMAKE_API}/
-# When changing this, please update devel/cmake-fedora as well.
-CMAKE_API= 3.5
-
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.cmake.org/
COMMENT= Cross platform make
Index: pkgsrc/devel/cmake/PLIST
diff -u pkgsrc/devel/cmake/PLIST:1.41 pkgsrc/devel/cmake/PLIST:1.42
--- pkgsrc/devel/cmake/PLIST:1.41 Mon Mar 14 10:49:55 2016
+++ pkgsrc/devel/cmake/PLIST Thu Jul 28 17:44:43 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.41 2016/03/14 10:49:55 adam Exp $
+@comment $NetBSD: PLIST,v 1.42 2016/07/28 17:44:43 prlw1 Exp $
bin/ccmake
bin/cmake
bin/cpack
@@ -293,6 +293,7 @@ share/cmake-${CMAKE_API}/Help/module/Fin
share/cmake-${CMAKE_API}/Help/module/FindKDE4.rst
share/cmake-${CMAKE_API}/Help/module/FindLAPACK.rst
share/cmake-${CMAKE_API}/Help/module/FindLATEX.rst
+share/cmake-${CMAKE_API}/Help/module/FindLTTngUST.rst
share/cmake-${CMAKE_API}/Help/module/FindLibArchive.rst
share/cmake-${CMAKE_API}/Help/module/FindLibLZMA.rst
share/cmake-${CMAKE_API}/Help/module/FindLibXml2.rst
@@ -504,6 +505,7 @@ share/cmake-${CMAKE_API}/Help/prop_dir/T
share/cmake-${CMAKE_API}/Help/prop_dir/VARIABLES.rst
share/cmake-${CMAKE_API}/Help/prop_dir/VS_GLOBAL_SECTION_POST_section.rst
share/cmake-${CMAKE_API}/Help/prop_dir/VS_GLOBAL_SECTION_PRE_section.rst
+share/cmake-${CMAKE_API}/Help/prop_dir/VS_STARTUP_PROJECT.rst
share/cmake-${CMAKE_API}/Help/prop_gbl/ALLOW_DUPLICATE_CUSTOM_TARGETS.rst
share/cmake-${CMAKE_API}/Help/prop_gbl/AUTOGEN_TARGETS_FOLDER.rst
share/cmake-${CMAKE_API}/Help/prop_gbl/AUTOMOC_TARGETS_FOLDER.rst
@@ -581,6 +583,7 @@ share/cmake-${CMAKE_API}/Help/prop_test/
share/cmake-${CMAKE_API}/Help/prop_test/RUN_SERIAL.rst
share/cmake-${CMAKE_API}/Help/prop_test/SKIP_RETURN_CODE.rst
share/cmake-${CMAKE_API}/Help/prop_test/TIMEOUT.rst
+share/cmake-${CMAKE_API}/Help/prop_test/TIMEOUT_AFTER_MATCH.rst
share/cmake-${CMAKE_API}/Help/prop_test/WILL_FAIL.rst
share/cmake-${CMAKE_API}/Help/prop_test/WORKING_DIRECTORY.rst
share/cmake-${CMAKE_API}/Help/prop_tgt/ALIASED_TARGET.rst
@@ -641,6 +644,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/C
share/cmake-${CMAKE_API}/Help/prop_tgt/C_STANDARD_REQUIRED.rst
share/cmake-${CMAKE_API}/Help/prop_tgt/DEBUG_POSTFIX.rst
share/cmake-${CMAKE_API}/Help/prop_tgt/DEFINE_SYMBOL.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/DEPLOYMENT_REMOTE_DIRECTORY.rst
share/cmake-${CMAKE_API}/Help/prop_tgt/ENABLE_EXPORTS.rst
share/cmake-${CMAKE_API}/Help/prop_tgt/EXCLUDE_FROM_ALL.rst
share/cmake-${CMAKE_API}/Help/prop_tgt/EXCLUDE_FROM_DEFAULT_BUILD.rst
@@ -696,6 +700,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/I
share/cmake-${CMAKE_API}/Help/prop_tgt/JOB_POOL_COMPILE.rst
share/cmake-${CMAKE_API}/Help/prop_tgt/JOB_POOL_LINK.rst
share/cmake-${CMAKE_API}/Help/prop_tgt/LABELS.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/LANG_CLANG_TIDY.rst
share/cmake-${CMAKE_API}/Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst
share/cmake-${CMAKE_API}/Help/prop_tgt/LANG_INCLUDE_WHAT_YOU_USE.rst
share/cmake-${CMAKE_API}/Help/prop_tgt/LANG_VISIBILITY_PRESET.rst
@@ -759,6 +764,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/S
share/cmake-${CMAKE_API}/Help/prop_tgt/TYPE.rst
share/cmake-${CMAKE_API}/Help/prop_tgt/VERSION.rst
share/cmake-${CMAKE_API}/Help/prop_tgt/VISIBILITY_INLINES_HIDDEN.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/VS_CONFIGURATION_TYPE.rst
share/cmake-${CMAKE_API}/Help/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION.rst
share/cmake-${CMAKE_API}/Help/prop_tgt/VS_DOTNET_REFERENCES.rst
share/cmake-${CMAKE_API}/Help/prop_tgt/VS_DOTNET_TARGET_FRAMEWORK_VERSION.rst
@@ -790,6 +796,7 @@ share/cmake-${CMAKE_API}/Help/release/3.
share/cmake-${CMAKE_API}/Help/release/3.3.rst
share/cmake-${CMAKE_API}/Help/release/3.4.rst
share/cmake-${CMAKE_API}/Help/release/3.5.rst
+share/cmake-${CMAKE_API}/Help/release/${CMAKE_API}.rst
share/cmake-${CMAKE_API}/Help/release/dev.txt
share/cmake-${CMAKE_API}/Help/release/index.rst
share/cmake-${CMAKE_API}/Help/variable/APPLE.rst
@@ -863,8 +870,13 @@ share/cmake-${CMAKE_API}/Help/variable/C
share/cmake-${CMAKE_API}/Help/variable/CMAKE_C_STANDARD_REQUIRED.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_DEBUG_POSTFIX.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_DEBUG_TARGET_PROPERTIES.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_DEPENDS_IN_PROJECT_ONLY.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_DL_LIBS.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ECLIPSE_MAKE_ARGUMENTS.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ECLIPSE_VERSION.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_EDIT_COMMAND.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_ENABLE_EXPORTS.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_ERROR_DEPRECATED.rst
@@ -903,6 +915,7 @@ share/cmake-${CMAKE_API}/Help/variable/C
share/cmake-${CMAKE_API}/Help/variable/CMAKE_GNUtoMS.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_HOME_DIRECTORY.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_HOST_APPLE.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_HOST_SOLARIS.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_HOST_SYSTEM.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_HOST_SYSTEM_NAME.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_HOST_SYSTEM_PROCESSOR.rst
@@ -930,6 +943,7 @@ share/cmake-${CMAKE_API}/Help/variable/C
share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_ARCHIVE_APPEND.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_ARCHIVE_CREATE.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_ARCHIVE_FINISH.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_CLANG_TIDY.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_COMPILER.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_COMPILER_ABI.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.rst
@@ -967,6 +981,8 @@ share/cmake-${CMAKE_API}/Help/variable/C
share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_SIMULATE_VERSION.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_SIZEOF_DATA_PTR.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_SOURCE_FILE_EXTENSIONS.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_STANDARD_INCLUDE_DIRECTORIES.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_STANDARD_LIBRARIES.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_VISIBILITY_PRESET.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_LIBRARY_ARCHITECTURE.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_LIBRARY_ARCHITECTURE_REGEX.rst
@@ -994,6 +1010,7 @@ share/cmake-${CMAKE_API}/Help/variable/C
share/cmake-${CMAKE_API}/Help/variable/CMAKE_MODULE_LINKER_FLAGS.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_MODULE_LINKER_FLAGS_CONFIG.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_MODULE_PATH.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_NINJA_OUTPUT_PATH_PREFIX.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_NOT_USING_CONFIG_FLAGS.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_NO_BUILTIN_CHRPATH.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_NO_SYSTEM_FROM_IMPORTED.rst
@@ -1032,7 +1049,6 @@ share/cmake-${CMAKE_API}/Help/variable/C
share/cmake-${CMAKE_API}/Help/variable/CMAKE_SKIP_RPATH.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_SOURCE_DIR.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_STAGING_PREFIX.rst
-share/cmake-${CMAKE_API}/Help/variable/CMAKE_STANDARD_LIBRARIES.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_STATIC_LIBRARY_PREFIX.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_STATIC_LIBRARY_SUFFIX.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_STATIC_LINKER_FLAGS.rst
@@ -1051,6 +1067,8 @@ share/cmake-${CMAKE_API}/Help/variable/C
share/cmake-${CMAKE_API}/Help/variable/CMAKE_SYSTEM_VERSION.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_TOOLCHAIN_FILE.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_TRY_COMPILE_CONFIGURATION.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_TRY_COMPILE_PLATFORM_VARIABLES.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_TRY_COMPILE_TARGET_TYPE.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_TWEAK_VERSION.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_USER_MAKE_RULES_OVERRIDE.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_USER_MAKE_RULES_OVERRIDE_LANG.rst
@@ -1062,7 +1080,6 @@ share/cmake-${CMAKE_API}/Help/variable/C
share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_INTEL_Fortran_PROJECT_VERSION.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_MSBUILD_COMMAND.rst
-share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_MSDEV_COMMAND.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_NsightTegra_VERSION.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_PLATFORM_NAME.rst
share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_PLATFORM_TOOLSET.rst
@@ -1122,6 +1139,7 @@ share/cmake-${CMAKE_API}/Help/variable/C
share/cmake-${CMAKE_API}/Help/variable/CTEST_DROP_SITE_USER.rst
share/cmake-${CMAKE_API}/Help/variable/CTEST_EXTRA_COVERAGE_GLOB.rst
share/cmake-${CMAKE_API}/Help/variable/CTEST_GIT_COMMAND.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_GIT_INIT_SUBMODULES.rst
share/cmake-${CMAKE_API}/Help/variable/CTEST_GIT_UPDATE_CUSTOM.rst
share/cmake-${CMAKE_API}/Help/variable/CTEST_GIT_UPDATE_OPTIONS.rst
share/cmake-${CMAKE_API}/Help/variable/CTEST_HG_COMMAND.rst
@@ -1296,9 +1314,7 @@ share/cmake-${CMAKE_API}/Modules/CMakeTe
share/cmake-${CMAKE_API}/Modules/CMakeTestJavaCompiler.cmake
share/cmake-${CMAKE_API}/Modules/CMakeTestRCCompiler.cmake
share/cmake-${CMAKE_API}/Modules/CMakeTestSwiftCompiler.cmake
-share/cmake-${CMAKE_API}/Modules/CMakeTestWatcomVersion.c
share/cmake-${CMAKE_API}/Modules/CMakeUnixFindMake.cmake
-share/cmake-${CMAKE_API}/Modules/CMakeVS6BackwardCompatibility.cmake
share/cmake-${CMAKE_API}/Modules/CMakeVS7BackwardCompatibility.cmake
share/cmake-${CMAKE_API}/Modules/CMakeVerifyManifest.cmake
share/cmake-${CMAKE_API}/Modules/CPack.DS_Store.in
@@ -1375,6 +1391,8 @@ share/cmake-${CMAKE_API}/Modules/Compile
share/cmake-${CMAKE_API}/Modules/Compiler/AppleClang-CXX.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/AppleClang-DetermineCompiler.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/Borland-DetermineCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Bruce-C-DetermineCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Bruce-C.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/CCur-Fortran.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/Clang-ASM.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/Clang-C-FeatureTests.cmake
@@ -1414,6 +1432,7 @@ share/cmake-${CMAKE_API}/Modules/Compile
share/cmake-${CMAKE_API}/Modules/Compiler/GHS-C.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/GHS-CXX.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/GHS-DetermineCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/GHS.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/GNU-ASM.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/GNU-C-FeatureTests.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/GNU-C.cmake
@@ -1436,7 +1455,9 @@ share/cmake-${CMAKE_API}/Modules/Compile
share/cmake-${CMAKE_API}/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/Intel-ASM.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Intel-C-FeatureTests.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/Intel-C.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Intel-CXX-FeatureTests.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/Intel-CXX.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/Intel-DetermineCompiler.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/Intel-Fortran.cmake
@@ -1496,7 +1517,6 @@ share/cmake-${CMAKE_API}/Modules/Compile
share/cmake-${CMAKE_API}/Modules/Compiler/zOS-C-DetermineCompiler.cmake
share/cmake-${CMAKE_API}/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake
share/cmake-${CMAKE_API}/Modules/CompilerId/VS-10.vcxproj.in
-share/cmake-${CMAKE_API}/Modules/CompilerId/VS-6.dsp.in
share/cmake-${CMAKE_API}/Modules/CompilerId/VS-7.vcproj.in
share/cmake-${CMAKE_API}/Modules/CompilerId/VS-Intel.vfproj.in
share/cmake-${CMAKE_API}/Modules/CompilerId/VS-NsightTegra.vcxproj.in
@@ -1511,6 +1531,8 @@ share/cmake-${CMAKE_API}/Modules/Documen
share/cmake-${CMAKE_API}/Modules/DummyCXXFile.cxx
share/cmake-${CMAKE_API}/Modules/ExternalData.cmake
share/cmake-${CMAKE_API}/Modules/ExternalData_config.cmake.in
+share/cmake-${CMAKE_API}/Modules/ExternalProject-download.cmake.in
+share/cmake-${CMAKE_API}/Modules/ExternalProject-verify.cmake.in
share/cmake-${CMAKE_API}/Modules/ExternalProject.cmake
share/cmake-${CMAKE_API}/Modules/FLTKCompatibility.cmake
share/cmake-${CMAKE_API}/Modules/FeatureSummary.cmake
@@ -1575,6 +1597,7 @@ share/cmake-${CMAKE_API}/Modules/FindKDE
share/cmake-${CMAKE_API}/Modules/FindKDE4.cmake
share/cmake-${CMAKE_API}/Modules/FindLAPACK.cmake
share/cmake-${CMAKE_API}/Modules/FindLATEX.cmake
+share/cmake-${CMAKE_API}/Modules/FindLTTngUST.cmake
share/cmake-${CMAKE_API}/Modules/FindLibArchive.cmake
share/cmake-${CMAKE_API}/Modules/FindLibLZMA.cmake
share/cmake-${CMAKE_API}/Modules/FindLibXml2.cmake
@@ -1749,6 +1772,8 @@ share/cmake-${CMAKE_API}/Modules/Platfor
share/cmake-${CMAKE_API}/Modules/Platform/BlueGeneQ-static-XL-Fortran.cmake
share/cmake-${CMAKE_API}/Modules/Platform/BlueGeneQ-static.cmake
share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN-Clang-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN-Clang-CXX.cmake
share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN-GNU-C.cmake
share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN-GNU-CXX.cmake
share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN-GNU-Fortran.cmake
@@ -1856,6 +1881,10 @@ share/cmake-${CMAKE_API}/Modules/Platfor
share/cmake-${CMAKE_API}/Modules/Platform/SunOS-GNU-CXX.cmake
share/cmake-${CMAKE_API}/Modules/Platform/SunOS-GNU-Fortran.cmake
share/cmake-${CMAKE_API}/Modules/Platform/SunOS-GNU.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/SunOS-PathScale-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/SunOS-PathScale-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/SunOS-PathScale-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/SunOS-PathScale.cmake
share/cmake-${CMAKE_API}/Modules/Platform/SunOS.cmake
share/cmake-${CMAKE_API}/Modules/Platform/Tru64.cmake
share/cmake-${CMAKE_API}/Modules/Platform/ULTRIX.cmake
@@ -1951,20 +1980,12 @@ share/cmake-${CMAKE_API}/Modules/readme.
share/cmake-${CMAKE_API}/Templates/AppleInfo.plist
share/cmake-${CMAKE_API}/Templates/CMakeVSMacros1.vsmacros
share/cmake-${CMAKE_API}/Templates/CMakeVSMacros2.vsmacros
-share/cmake-${CMAKE_API}/Templates/CMakeVisualStudio6Configurations.cmake
share/cmake-${CMAKE_API}/Templates/CPack.GenericDescription.txt
share/cmake-${CMAKE_API}/Templates/CPack.GenericLicense.txt
share/cmake-${CMAKE_API}/Templates/CPack.GenericWelcome.txt
share/cmake-${CMAKE_API}/Templates/CPackConfig.cmake.in
share/cmake-${CMAKE_API}/Templates/CTestScript.cmake.in
-share/cmake-${CMAKE_API}/Templates/DLLFooter.dsptemplate
-share/cmake-${CMAKE_API}/Templates/DLLHeader.dsptemplate
-share/cmake-${CMAKE_API}/Templates/EXEFooter.dsptemplate
-share/cmake-${CMAKE_API}/Templates/EXEHeader.dsptemplate
-share/cmake-${CMAKE_API}/Templates/EXEWinHeader.dsptemplate
share/cmake-${CMAKE_API}/Templates/TestDriver.cxx.in
-share/cmake-${CMAKE_API}/Templates/UtilityFooter.dsptemplate
-share/cmake-${CMAKE_API}/Templates/UtilityHeader.dsptemplate
share/cmake-${CMAKE_API}/Templates/Windows/ApplicationIcon.png
share/cmake-${CMAKE_API}/Templates/Windows/Logo.png
share/cmake-${CMAKE_API}/Templates/Windows/SmallLogo.png
@@ -1973,8 +1994,6 @@ share/cmake-${CMAKE_API}/Templates/Windo
share/cmake-${CMAKE_API}/Templates/Windows/StoreLogo.png
share/cmake-${CMAKE_API}/Templates/Windows/Windows_TemporaryKey.pfx
share/cmake-${CMAKE_API}/Templates/cygwin-package.sh.in
-share/cmake-${CMAKE_API}/Templates/staticLibFooter.dsptemplate
-share/cmake-${CMAKE_API}/Templates/staticLibHeader.dsptemplate
share/cmake-${CMAKE_API}/completions/cmake
share/cmake-${CMAKE_API}/completions/cpack
share/cmake-${CMAKE_API}/completions/ctest
Index: pkgsrc/devel/cmake/distinfo
diff -u pkgsrc/devel/cmake/distinfo:1.88 pkgsrc/devel/cmake/distinfo:1.89
--- pkgsrc/devel/cmake/distinfo:1.88 Sun Apr 17 10:10:04 2016
+++ pkgsrc/devel/cmake/distinfo Thu Jul 28 17:44:43 2016
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.88 2016/04/17 10:10:04 wiz Exp $
+$NetBSD: distinfo,v 1.89 2016/07/28 17:44:43 prlw1 Exp $
-SHA1 (cmake-3.5.2.tar.gz) = 5d6c68c3007d61cadd6257c170e60aa67154cda1
-RMD160 (cmake-3.5.2.tar.gz) = 9053820870f124dee5845eb5ba4717ac71477231
-SHA512 (cmake-3.5.2.tar.gz) = 7b08eb9f1b37993553f89c03eceedc465dc52b787dec99b78c74ebff2817d0aac9764e82ad835e8fc39f61cd2d2c0a3544d3f5ae299234ed52e9a940edf30b81
-Size (cmake-3.5.2.tar.gz) = 6863498 bytes
-SHA1 (patch-CMakeLists.txt) = ae722c41e0d9a1396fe80f1000266a33e406e2f6
+SHA1 (cmake-3.6.1.tar.gz) = a37785b3f256a31ee21a047569bc74a8f57067bb
+RMD160 (cmake-3.6.1.tar.gz) = 87a0bc724cd853177f5568d488c3b63ab9e46709
+SHA512 (cmake-3.6.1.tar.gz) = 69f20df70c58f7a09da7511a92a1e4492d89fecf30b11744aaf29a129f62384ff57ed7ed2d9dbb8b102abdc72d5722e744583161cb0ae71a01423473f36c8b1d
+Size (cmake-3.6.1.tar.gz) = 6895262 bytes
+SHA1 (patch-CMakeLists.txt) = a0b03f2fad5ea174095c4fe52cea67d94cf46e2d
SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c
SHA1 (patch-Modules_Platform_SCO__SV.cmake) = 3ed230b3a06ea693812db8f57bc73aebec12b99f
-SHA1 (patch-Source_CursesDialog_ccmake.cxx) = c77cf55df2b047908178e7ed1db6e5454834ea49
-SHA1 (patch-Source_cmELF.cxx) = ad6fa581da8ad36223aa53285a1a8dbec0c02a9d
+SHA1 (patch-Source_CursesDialog_ccmake.cxx) = e1b6feca837013c715b4268f2ccb134f956f3193
+SHA1 (patch-Source_cmELF.cxx) = f75ddc1b1b3e83169d9a99094bcb6042fabb4da3
SHA1 (patch-Source_kwsys_SystemInformation.cxx) = 5e8c8ff7875c329e48c54ee03570ea4a6d52953a
SHA1 (patch-Source_kwsys_SystemTools.cxx) = 634348b9bc8ccf8c72f23837baa6ba0bcacf5961
SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796
Index: pkgsrc/devel/cmake/patches/patch-CMakeLists.txt
diff -u pkgsrc/devel/cmake/patches/patch-CMakeLists.txt:1.4 pkgsrc/devel/cmake/patches/patch-CMakeLists.txt:1.5
--- pkgsrc/devel/cmake/patches/patch-CMakeLists.txt:1.4 Tue Sep 15 13:08:38 2015
+++ pkgsrc/devel/cmake/patches/patch-CMakeLists.txt Thu Jul 28 17:44:43 2016
@@ -1,4 +1,6 @@
-$NetBSD: patch-CMakeLists.txt,v 1.4 2015/09/15 13:08:38 joerg Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.5 2016/07/28 17:44:43 prlw1 Exp $
+
+Don't insist on ncurses.
--- CMakeLists.txt.orig 2015-09-14 13:22:28.000000000 +0000
+++ CMakeLists.txt
Index: pkgsrc/devel/cmake/patches/patch-Source_CursesDialog_ccmake.cxx
diff -u pkgsrc/devel/cmake/patches/patch-Source_CursesDialog_ccmake.cxx:1.1 pkgsrc/devel/cmake/patches/patch-Source_CursesDialog_ccmake.cxx:1.2
--- pkgsrc/devel/cmake/patches/patch-Source_CursesDialog_ccmake.cxx:1.1 Fri Dec 11 19:23:22 2015
+++ pkgsrc/devel/cmake/patches/patch-Source_CursesDialog_ccmake.cxx Thu Jul 28 17:44:43 2016
@@ -1,29 +1,31 @@
-$NetBSD: patch-Source_CursesDialog_ccmake.cxx,v 1.1 2015/12/11 19:23:22 joerg Exp $
+$NetBSD: patch-Source_CursesDialog_ccmake.cxx,v 1.2 2016/07/28 17:44:43 prlw1 Exp $
---- Source/CursesDialog/ccmake.cxx.orig 2015-12-02 15:43:21.000000000 +0000
+initscr() error path
+
+--- Source/CursesDialog/ccmake.cxx.orig 2016-07-07 14:47:27.000000000 +0000
+++ Source/CursesDialog/ccmake.cxx
-@@ -68,7 +68,11 @@ void onsig(int)
- if (cmCursesForm::CurrentForm)
- {
+@@ -54,7 +54,11 @@ void onsig(int)
+ {
+ if (cmCursesForm::CurrentForm) {
endwin();
-- initscr(); /* Initialization */
+- initscr(); /* Initialization */
+ if (initscr() == NULL) {
+ static const char errmsg[] = "terminal setup failed\n";
+ write(STDERR_FILENO, errmsg, sizeof(errmsg) - 1);
+ exit (1);
+ }
- noecho(); /* Echo off */
- cbreak(); /* nl- or cr not needed */
- keypad(stdscr,TRUE); /* Use key symbols as
-@@ -154,7 +158,10 @@ int main(int argc, char const* const* ar
+ noecho(); /* Echo off */
+ cbreak(); /* nl- or cr not needed */
+ keypad(stdscr, TRUE); /* Use key symbols as
+@@ -130,7 +134,10 @@ int main(int argc, char const* const* ar
cmCursesForm::DebugStart();
- }
+ }
-- initscr(); /* Initialization */
+- initscr(); /* Initialization */
+ if (initscr() == NULL) {
+ fprintf(stderr, "terminal setup failed\n");
+ exit (1);
+ }
- noecho(); /* Echo off */
- cbreak(); /* nl- or cr not needed */
- keypad(stdscr,TRUE); /* Use key symbols as
+ noecho(); /* Echo off */
+ cbreak(); /* nl- or cr not needed */
+ keypad(stdscr, TRUE); /* Use key symbols as
Index: pkgsrc/devel/cmake/patches/patch-Source_cmELF.cxx
diff -u pkgsrc/devel/cmake/patches/patch-Source_cmELF.cxx:1.3 pkgsrc/devel/cmake/patches/patch-Source_cmELF.cxx:1.4
--- pkgsrc/devel/cmake/patches/patch-Source_cmELF.cxx:1.3 Mon Mar 14 10:49:55 2016
+++ pkgsrc/devel/cmake/patches/patch-Source_cmELF.cxx Thu Jul 28 17:44:43 2016
@@ -1,20 +1,20 @@
-$NetBSD: patch-Source_cmELF.cxx,v 1.3 2016/03/14 10:49:55 adam Exp $
+$NetBSD: patch-Source_cmELF.cxx,v 1.4 2016/07/28 17:44:43 prlw1 Exp $
* SCO OpenServer 5.0.7/3.2 has not 64bit ELF support.
---- Source/cmELF.cxx.orig 2016-03-08 14:36:22.000000000 +0000
+--- Source/cmELF.cxx.orig 2016-07-07 14:47:27.000000000 +0000
+++ Source/cmELF.cxx
-@@ -45,6 +45,9 @@
+@@ -46,6 +46,9 @@ typedef struct Elf32_Rela Elf32_Rela;
#if defined(__sun)
- # include <sys/link.h> // For dynamic section information
+ #include <sys/link.h> // For dynamic section information
#endif
+#if defined(_SCO_DS)
+# include <link.h> // For DT_SONAME etc.
+#endif
- //----------------------------------------------------------------------------
// Low-level byte swapping implementation.
-@@ -199,6 +202,8 @@ struct cmELFTypes32
+ template <size_t s>
+@@ -214,6 +217,8 @@ struct cmELFTypes32
};
// Configure the implementation template for 64-bit ELF files.
@@ -23,26 +23,29 @@ $NetBSD: patch-Source_cmELF.cxx,v 1.3 20
struct cmELFTypes64
{
typedef Elf64_Ehdr ELF_Ehdr;
-@@ -208,6 +213,7 @@ struct cmELFTypes64
+@@ -223,6 +228,7 @@ struct cmELFTypes64
typedef KWIML_INT_uint64_t tagtype;
static const char* GetName() { return "64-bit"; }
};
+#endif
- //----------------------------------------------------------------------------
// Parser implementation template.
-@@ -790,11 +796,14 @@ cmELF::cmELF(const char* fname): Interna
+ template <class Types>
+@@ -799,10 +805,15 @@ cmELF::cmELF(const char* fname)
+ if (ident[EI_CLASS] == ELFCLASS32) {
// 32-bit ELF
this->Internal = new cmELFInternalImpl<cmELFTypes32>(this, fin, order);
- }
+- } else if (ident[EI_CLASS] == ELFCLASS64) {
++ }
+#if !defined(_SCO_DS)
+// SCO OpenServer 5.0.7/3.2 does not support 64-bit ELF.
- else if(ident[EI_CLASS] == ELFCLASS64)
- {
++ else if (ident[EI_CLASS] == ELFCLASS64) {
// 64-bit ELF
this->Internal = new cmELFInternalImpl<cmELFTypes64>(this, fin, order);
- }
+- } else {
++ }
+#endif
- else
- {
++ else {
this->ErrorMessage = "ELF file class is not 32-bit or 64-bit.";
+ return;
+ }
Added files:
Index: pkgsrc/devel/cmake/Makefile.version
diff -u /dev/null pkgsrc/devel/cmake/Makefile.version:1.1
--- /dev/null Thu Jul 28 17:44:43 2016
+++ pkgsrc/devel/cmake/Makefile.version Thu Jul 28 17:44:43 2016
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile.version,v 1.1 2016/07/28 17:44:43 prlw1 Exp $
+#
+# used by devel/cmake/Makefile
+# used by devel/cmake-fedora/Makefile
+CMAKE_VERSION= 3.6.1
+CMAKE_API= ${CMAKE_VERSION:R}
Home |
Main Index |
Thread Index |
Old Index