Attachment 168329 Details for Bug 208033 – Patch v2

[patch] Patch v2

cmake-3.5.0-v2.patch (text/plain), 26.33 KB, created by Raphael Kubo da Costa on 2016-03-17 16:35:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Raphael Kubo da Costa

Created: 2016-03-17 16:35:05 UTC

Size: 26.33 KB

patch

obsolete

>diff --git a/audio/fplib/files/patch-CMakeLists.txt b/audio/fplib/files/patch-CMakeLists.txt
>new file mode 100644
>index 0000000..979c8c8
>--- /dev/null
>+++ b/audio/fplib/files/patch-CMakeLists.txt
>@@ -0,0 +1,15 @@
>+Link against an actual target name, not the generated library name.
>+
>+If we link against the latter, there is no dependency between lastfm-fpclient
>+and fplib, which can break parallel builds starting with CMake 3.5.0.
>+--- CMakeLists.txt.orig	2016-03-16 09:53:03 UTC
>++++ CMakeLists.txt
>+@@ -139,7 +139,7 @@ ADD_EXECUTABLE(lastfm-fpclient
>+ 
>+ # Link the executable
>+ TARGET_LINK_LIBRARIES(lastfm-fpclient
>+-   fplib
>++   fplib_shared
>+    fftw3f
>+    mad
>+    tag
>diff --git a/comms/gnuradio/files/patch-cmake-3.5.0 b/comms/gnuradio/files/patch-cmake-3.5.0
>new file mode 100644
>index 0000000..89bd1dc
>--- /dev/null
>+++ b/comms/gnuradio/files/patch-cmake-3.5.0
>@@ -0,0 +1,162 @@
>+Changing CMAKE_{SOURCE,BINARY}_DIR like volk does in its top-level
>+CMakeLists.txt no longer works with CMake 3.5.0.
>+
>+Use PROJECT_{BINARY,SOURCE}_DIR instead.
>+
>+Obtained from: http://pkgs.fedoraproject.org/cgit/rpms/gnuradio.git/commit/?id=b50c7e66f6e3a1e6a84e25505d3fd873756c2027
>+Upstream patch and discussion: https://github.com/gnuradio/volk/pull/65
>+--- volk/apps/CMakeLists.txt.cmake35	2016-02-07 10:09:12.000000000 -0700
>++++ volk/apps/CMakeLists.txt	2016-02-23 20:47:31.513538541 -0700
>+@@ -19,23 +19,23 @@
>+ # Setup profiler
>+ ########################################################################
>+ if(MSVC)
>+-    include_directories(${CMAKE_SOURCE_DIR}/cmake/msvc)
>++    include_directories(${PROJECT_SOURCE_DIR}/cmake/msvc)
>+ endif(MSVC)
>+ 
>+ include_directories(
>+     ${CMAKE_CURRENT_SOURCE_DIR}
>+     ${CMAKE_CURRENT_BINARY_DIR}
>+-    ${CMAKE_SOURCE_DIR}/include
>+-    ${CMAKE_BINARY_DIR}/include
>+-    ${CMAKE_SOURCE_DIR}/lib
>+-    ${CMAKE_BINARY_DIR}/lib
>++    ${PROJECT_SOURCE_DIR}/include
>++    ${PROJECT_BINARY_DIR}/include
>++    ${PROJECT_SOURCE_DIR}/lib
>++    ${PROJECT_BINARY_DIR}/lib
>+     ${Boost_INCLUDE_DIRS}
>+ )
>+ 
>+ # MAKE volk_profile
>+ add_executable(volk_profile
>+     ${CMAKE_CURRENT_SOURCE_DIR}/volk_profile.cc
>+-    ${CMAKE_SOURCE_DIR}/lib/qa_utils.cc
>++    ${PROJECT_SOURCE_DIR}/lib/qa_utils.cc
>+ )
>+ 
>+ 
>+--- volk/lib/CMakeLists.txt.cmake35	2016-02-07 10:09:12.000000000 -0700
>++++ volk/lib/CMakeLists.txt	2016-02-23 20:47:31.516538564 -0700
>+@@ -90,7 +90,7 @@ endif()
>+ ########################################################################
>+ execute_process(
>+     COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
>+-    ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py
>++    ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py
>+     --mode "arch_flags" --compiler "${COMPILER_NAME}"
>+     OUTPUT_VARIABLE arch_flag_lines OUTPUT_STRIP_TRAILING_WHITESPACE
>+ )
>+@@ -278,7 +278,7 @@ message(STATUS "Available architectures:
>+ ########################################################################
>+ execute_process(
>+     COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
>+-    ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py
>++    ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py
>+     --mode "machines" --archs "${available_archs}"
>+     OUTPUT_VARIABLE available_machines OUTPUT_STRIP_TRAILING_WHITESPACE
>+ )
>+@@ -310,9 +310,9 @@ message(STATUS "Available machines: ${av
>+ ########################################################################
>+ 
>+ #dependencies are all python, xml, and header implementation files
>+-file(GLOB xml_files ${CMAKE_SOURCE_DIR}/gen/*.xml)
>+-file(GLOB py_files ${CMAKE_SOURCE_DIR}/gen/*.py)
>+-file(GLOB h_files ${CMAKE_SOURCE_DIR}/kernels/volk/*.h)
>++file(GLOB xml_files ${PROJECT_SOURCE_DIR}/gen/*.xml)
>++file(GLOB py_files ${PROJECT_SOURCE_DIR}/gen/*.py)
>++file(GLOB h_files ${PROJECT_SOURCE_DIR}/kernels/volk/*.h)
>+ 
>+ macro(gen_template tmpl output)
>+     list(APPEND volk_gen_sources ${output})
>+@@ -320,21 +320,21 @@ macro(gen_template tmpl output)
>+         OUTPUT ${output}
>+         DEPENDS ${xml_files} ${py_files} ${h_files} ${tmpl}
>+         COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
>+-        ${CMAKE_SOURCE_DIR}/gen/volk_tmpl_utils.py
>++        ${PROJECT_SOURCE_DIR}/gen/volk_tmpl_utils.py
>+         --input ${tmpl} --output ${output} ${ARGN}
>+     )
>+ endmacro(gen_template)
>+ 
>+-make_directory(${CMAKE_BINARY_DIR}/include/volk)
>++make_directory(${PROJECT_BINARY_DIR}/include/volk)
>+ 
>+-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk.tmpl.h              ${CMAKE_BINARY_DIR}/include/volk/volk.h)
>+-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk.tmpl.c              ${CMAKE_BINARY_DIR}/lib/volk.c)
>+-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_typedefs.tmpl.h     ${CMAKE_BINARY_DIR}/include/volk/volk_typedefs.h)
>+-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_cpu.tmpl.h          ${CMAKE_BINARY_DIR}/include/volk/volk_cpu.h)
>+-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_cpu.tmpl.c          ${CMAKE_BINARY_DIR}/lib/volk_cpu.c)
>+-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_config_fixed.tmpl.h ${CMAKE_BINARY_DIR}/include/volk/volk_config_fixed.h)
>+-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machines.tmpl.h     ${CMAKE_BINARY_DIR}/lib/volk_machines.h)
>+-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machines.tmpl.c     ${CMAKE_BINARY_DIR}/lib/volk_machines.c)
>++gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk.tmpl.h              ${PROJECT_BINARY_DIR}/include/volk/volk.h)
>++gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk.tmpl.c              ${PROJECT_BINARY_DIR}/lib/volk.c)
>++gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_typedefs.tmpl.h     ${PROJECT_BINARY_DIR}/include/volk/volk_typedefs.h)
>++gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_cpu.tmpl.h          ${PROJECT_BINARY_DIR}/include/volk/volk_cpu.h)
>++gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_cpu.tmpl.c          ${PROJECT_BINARY_DIR}/lib/volk_cpu.c)
>++gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_config_fixed.tmpl.h ${PROJECT_BINARY_DIR}/include/volk/volk_config_fixed.h)
>++gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machines.tmpl.h     ${PROJECT_BINARY_DIR}/lib/volk_machines.h)
>++gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machines.tmpl.c     ${PROJECT_BINARY_DIR}/lib/volk_machines.c)
>+ 
>+ set(BASE_CFLAGS NONE)
>+ string(TOUPPER ${CMAKE_BUILD_TYPE} CBTU)
>+@@ -362,12 +362,12 @@ set(COMPILER_INFO "${CMAKE_C_COMPILER}::
>+ foreach(machine_name ${available_machines})
>+     #generate machine source
>+     set(machine_source ${CMAKE_CURRENT_BINARY_DIR}/volk_machine_${machine_name}.c)
>+-    gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machine_xxx.tmpl.c ${machine_source} ${machine_name})
>++    gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machine_xxx.tmpl.c ${machine_source} ${machine_name})
>+ 
>+     #determine machine flags
>+     execute_process(
>+         COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
>+-        ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py
>++        ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py
>+         --mode "machine_flags" --machine "${machine_name}" --compiler "${COMPILER_NAME}"
>+         OUTPUT_VARIABLE ${machine_name}_flags OUTPUT_STRIP_TRAILING_WHITESPACE
>+     )
>+@@ -393,9 +393,9 @@ string(REPLACE "\n" " \\n" COMPILER_INFO
>+ # Set local include directories first
>+ ########################################################################
>+ include_directories(
>+-    ${CMAKE_BINARY_DIR}/include
>+-    ${CMAKE_SOURCE_DIR}/include
>+-    ${CMAKE_SOURCE_DIR}/kernels
>++    ${PROJECT_BINARY_DIR}/include
>++    ${PROJECT_SOURCE_DIR}/include
>++    ${PROJECT_SOURCE_DIR}/kernels
>+     ${CMAKE_CURRENT_BINARY_DIR}
>+     ${CMAKE_CURRENT_SOURCE_DIR}
>+ )
>+@@ -420,8 +420,8 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8
>+       # setup architecture specific assembler flags
>+       set(ARCH_ASM_FLAGS "-mfpu=neon -g")
>+       # then add the files
>+-      include_directories(${CMAKE_SOURCE_DIR}/kernels/volk/asm/neon)
>+-      file(GLOB asm_files ${CMAKE_SOURCE_DIR}/kernels/volk/asm/neon/*.s)
>++      include_directories(${PROJECT_SOURCE_DIR}/kernels/volk/asm/neon)
>++      file(GLOB asm_files ${PROJECT_SOURCE_DIR}/kernels/volk/asm/neon/*.s)
>+       foreach(asm_file ${asm_files})
>+         list(APPEND volk_sources ${asm_file})
>+         message(STATUS "Adding source file: ${asm_file}")
>+@@ -453,7 +453,7 @@ if(ORC_FOUND)
>+     list(APPEND volk_libraries ${ORC_LIBRARIES})
>+ 
>+     #setup orc functions
>+-    file(GLOB orc_files ${CMAKE_SOURCE_DIR}/kernels/volk/asm/orc/*.orc)
>++    file(GLOB orc_files ${PROJECT_SOURCE_DIR}/kernels/volk/asm/orc/*.orc)
>+     foreach(orc_file ${orc_files})
>+ 
>+         #extract the name for the generated c source from the orc file
>+@@ -511,7 +511,7 @@ PROPERTIES COMPILE_DEFINITIONS "${machin
>+ 
>+ if(MSVC)
>+     #add compatibility includes for stdint types
>+-    include_directories(${CMAKE_SOURCE_DIR}/cmake/msvc)
>++    include_directories(${PROJECT_SOURCE_DIR}/cmake/msvc)
>+     add_definitions(-DHAVE_CONFIG_H)
>+     #compile the sources as C++ due to the lack of complex.h under MSVC
>+     set_source_files_properties(${volk_sources} PROPERTIES LANGUAGE CXX)
>+diff -up gnuradio-3.7.9.1/volk/python/volk_modtool/CMakeLists.txt.cmake35 gnuradio-3.7.9.1/volk/python/volk_modtool/CMakeLists.txt
>diff --git a/devel/cmake-gui/Makefile b/devel/cmake-gui/Makefile
>index a3b0c88..a040496 100644
>--- a/devel/cmake-gui/Makefile
>+++ b/devel/cmake-gui/Makefile
>@@ -1,9 +1,9 @@
> # $FreeBSD$
> 
> PORTNAME=	cmake
>-PORTVERSION=	3.4.2
>+PORTVERSION=	3.5.0
> CATEGORIES=	devel
>-MASTER_SITES=	https://www.cmake.org/files/v3.4/
>+MASTER_SITES=	https://www.cmake.org/files/v3.5/
> PKGNAMESUFFIX=	-gui
> 
> MAINTAINER=	kde@FreeBSD.org
>diff --git a/devel/cmake-modules/pkg-plist b/devel/cmake-modules/pkg-plist
>index fb09a0f..52c3b6b 100644
>--- a/devel/cmake-modules/pkg-plist
>+++ b/devel/cmake-modules/pkg-plist
>@@ -69,10 +69,12 @@
> %%DATADIR%%/Modules/CMakeFortranInformation.cmake
> %%DATADIR%%/Modules/CMakeGenericSystem.cmake
> %%DATADIR%%/Modules/CMakeGraphVizOptions.cmake
>+%%DATADIR%%/Modules/CMakeIOSInstallCombined.cmake
> %%DATADIR%%/Modules/CMakeImportBuildSettings.cmake
> %%DATADIR%%/Modules/CMakeJOMFindMake.cmake
> %%DATADIR%%/Modules/CMakeJavaCompiler.cmake.in
> %%DATADIR%%/Modules/CMakeJavaInformation.cmake
>+%%DATADIR%%/Modules/CMakeLanguageInformation.cmake
> %%DATADIR%%/Modules/CMakeMSYSFindMake.cmake
> %%DATADIR%%/Modules/CMakeMinGWFindMake.cmake
> %%DATADIR%%/Modules/CMakeNMakeFindMake.cmake
>@@ -169,6 +171,11 @@
> %%DATADIR%%/Modules/CheckVariableExists.c
> %%DATADIR%%/Modules/CheckVariableExists.cmake
> %%DATADIR%%/Modules/Compiler/ADSP-DetermineCompiler.cmake
>+%%DATADIR%%/Modules/Compiler/ARMCC-ASM.cmake
>+%%DATADIR%%/Modules/Compiler/ARMCC-C.cmake
>+%%DATADIR%%/Modules/Compiler/ARMCC-CXX.cmake
>+%%DATADIR%%/Modules/Compiler/ARMCC-DetermineCompiler.cmake
>+%%DATADIR%%/Modules/Compiler/ARMCC.cmake
> %%DATADIR%%/Modules/Compiler/Absoft-Fortran.cmake
> %%DATADIR%%/Modules/Compiler/AppleClang-ASM.cmake
> %%DATADIR%%/Modules/Compiler/AppleClang-C-FeatureTests.cmake
>@@ -194,6 +201,22 @@
> %%DATADIR%%/Modules/Compiler/Cray-CXX.cmake
> %%DATADIR%%/Modules/Compiler/Cray-DetermineCompiler.cmake
> %%DATADIR%%/Modules/Compiler/Cray-Fortran.cmake
>+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-C.cmake
>+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-CXX.cmake
>+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Cray-C.cmake
>+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Cray-CXX.cmake
>+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Cray-Fortran.cmake
>+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Fortran.cmake
>+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-GNU-C.cmake
>+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-GNU-CXX.cmake
>+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-GNU-Fortran.cmake
>+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Intel-C.cmake
>+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Intel-CXX.cmake
>+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Intel-Fortran.cmake
>+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-PGI-C.cmake
>+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-PGI-CXX.cmake
>+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-PGI-Fortran.cmake
>+%%DATADIR%%/Modules/Compiler/CrayPrgEnv.cmake
> %%DATADIR%%/Modules/Compiler/Embarcadero-DetermineCompiler.cmake
> %%DATADIR%%/Modules/Compiler/Fujitsu-DetermineCompiler.cmake
> %%DATADIR%%/Modules/Compiler/G95-Fortran.cmake
>@@ -422,6 +445,7 @@
> %%DATADIR%%/Modules/FindX11.cmake
> %%DATADIR%%/Modules/FindXCTest.cmake
> %%DATADIR%%/Modules/FindXMLRPC.cmake
>+%%DATADIR%%/Modules/FindXalanC.cmake
> %%DATADIR%%/Modules/FindXercesC.cmake
> %%DATADIR%%/Modules/FindZLIB.cmake
> %%DATADIR%%/Modules/Findosg.cmake
>@@ -541,6 +565,7 @@
> %%DATADIR%%/Modules/Platform/CYGWIN-windres.cmake
> %%DATADIR%%/Modules/Platform/CYGWIN.cmake
> %%DATADIR%%/Modules/Platform/Catamount.cmake
>+%%DATADIR%%/Modules/Platform/CrayLinuxEnvironment.cmake
> %%DATADIR%%/Modules/Platform/Darwin-Absoft-Fortran.cmake
> %%DATADIR%%/Modules/Platform/Darwin-AppleClang-C.cmake
> %%DATADIR%%/Modules/Platform/Darwin-AppleClang-CXX.cmake
>diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
>index e5c0ce5..66ab147 100644
>--- a/devel/cmake/Makefile
>+++ b/devel/cmake/Makefile
>@@ -2,10 +2,10 @@
> # $FreeBSD$
> 
> PORTNAME=	cmake
>-PORTVERSION=	3.4.2
>+PORTVERSION=	3.5.0
> PORTREVISION?=	0
> CATEGORIES=	devel
>-MASTER_SITES=	https://www.cmake.org/files/v3.4/
>+MASTER_SITES=	https://www.cmake.org/files/v3.5/
> 
> MAINTAINER=	kde@FreeBSD.org
> COMMENT?=	Cross-platform Makefile generator
>diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
>index bcc0875..c92200a 100644
>--- a/devel/cmake/distinfo
>+++ b/devel/cmake/distinfo
>@@ -1,2 +1,2 @@
>-SHA256 (cmake-3.4.2.tar.gz) = da7cc34e1ce1d82e67a32ab081c02c2845534cd8bf2e09d88077a1b282e97392
>-SIZE (cmake-3.4.2.tar.gz) = 6722152
>+SHA256 (cmake-3.5.0.tar.gz) = 92c83ad8a4fd6224cf6319a60b399854f55b38ebe9d297c942408b792b1a9efa
>+SIZE (cmake-3.5.0.tar.gz) = 6861686
>diff --git a/devel/cmake/files/patch-Modules_FindDCMTK.cmake b/devel/cmake/files/patch-Modules_FindDCMTK.cmake
>deleted file mode 100644
>index f99754d..0000000
>--- a/devel/cmake/files/patch-Modules_FindDCMTK.cmake
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- Modules/FindDCMTK.cmake.orig	2012-07-11 12:01:05.000000000 +0200
>-+++ Modules/FindDCMTK.cmake	2012-07-11 12:01:51.000000000 +0200
>-@@ -56,6 +56,7 @@
>-     ijg12
>-     ijg16
>-     ijg8
>-+    oflog
>-     ofstd)
>- 
>-   find_library(DCMTK_${lib}_LIBRARY
>diff --git a/devel/cmake/files/patch-git_9d653f9c b/devel/cmake/files/patch-git_9d653f9c
>deleted file mode 100644
>index 9d893b8..0000000
>--- a/devel/cmake/files/patch-git_9d653f9c
>+++ /dev/null
>@@ -1,59 +0,0 @@
>-Fixes a crash in CMake itself when configuring x11-toolkits/fltk-devel with
>-CMake 3.4.0.
>-
>-commit 9d653f9c1cc129be4fdce7f0e93c282760c7603e
>-Author: Stephen Kelly <steveire@gmail.com>
>-Date:   Sat Aug 29 18:05:46 2015 +0200
>-
>-    cmFLTKWrapUI: Remove CMake 2.2 compat code.
>-
>-    CMake 3.0 dropped CMake <= 2.4 compatibility.
>-
>---- Source/cmFLTKWrapUICommand.cxx
>-+++ Source/cmFLTKWrapUICommand.cxx
>-@@ -129,45 +129,6 @@ void cmFLTKWrapUICommand::FinalPass()
>-     cmSystemTools::Message(msg.c_str(),"Warning");
>-     return;
>-     }
>--  std::vector<cmSourceFile*> srcs;
>--  target->GetSourceFiles(srcs, "");
>--  bool found = false;
>--  for (unsigned int i = 0; i < srcs.size(); ++i)
>--    {
>--    if (srcs[i]->GetFullPath() ==
>--        this->GeneratedSourcesClasses[0]->GetFullPath())
>--      {
>--      found = true;
>--      break;
>--      }
>--    }
>--  if (!found)
>--    {
>--    std::string msg =
>--      "In CMake 2.2 the FLTK_WRAP_UI command sets a variable to the list of "
>--      "source files that should be added to your executable or library. It "
>--      "appears that you have not added these source files to your target. "
>--      "You should change your CMakeLists.txt file to "
>--      "directly add the generated files to the target. "
>--      "For example FTLK_WRAP_UI(foo src1 src2 src3) "
>--      "will create a variable named foo_FLTK_UI_SRCS that contains the list "
>--      "of sources to add to your target when you call ADD_LIBRARY or "
>--      "ADD_EXECUTABLE. For now CMake will add the sources to your target "
>--      "for you as was done in CMake 2.0 and earlier. In the future this may "
>--      "become an error.";
>--    msg +="The problem was found while processing the source directory: ";
>--    msg += this->Makefile->GetCurrentSourceDirectory();
>--    cmSystemTools::Message(msg.c_str(),"Warning");
>--    // first we add the rules for all the .fl to .h and .cxx files
>--    size_t lastHeadersClass = this->GeneratedSourcesClasses.size();
>--
>--    // Generate code for all the .fl files
>--    for(size_t classNum = 0; classNum < lastHeadersClass; classNum++)
>--      {
>--      this->Makefile->GetTargets()[this->Target]
>--        .AddSource(this->GeneratedSourcesClasses[classNum]->GetFullPath());
>--      }
>--    }
>- }
>- 
>- 
>diff --git a/devel/cmake/pkg-plist b/devel/cmake/pkg-plist
>index a0c52e9..ea63776 100644
>--- a/devel/cmake/pkg-plist
>+++ b/devel/cmake/pkg-plist
>@@ -39,6 +39,7 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Help/command/build_name.rst
> %%DATADIR%%/Help/command/cmake_host_system_information.rst
> %%DATADIR%%/Help/command/cmake_minimum_required.rst
>+%%DATADIR%%/Help/command/cmake_parse_arguments.rst
> %%DATADIR%%/Help/command/cmake_policy.rst
> %%DATADIR%%/Help/command/configure_file.rst
> %%DATADIR%%/Help/command/continue.rst
>@@ -296,10 +297,10 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Help/module/FindHTMLHelp.rst
> %%DATADIR%%/Help/module/FindHg.rst
> %%DATADIR%%/Help/module/FindITK.rst
>-%%DATADIR%%/Help/module/FindIntl.rst
> %%DATADIR%%/Help/module/FindIce.rst
> %%DATADIR%%/Help/module/FindIcotool.rst
> %%DATADIR%%/Help/module/FindImageMagick.rst
>+%%DATADIR%%/Help/module/FindIntl.rst
> %%DATADIR%%/Help/module/FindJNI.rst
> %%DATADIR%%/Help/module/FindJPEG.rst
> %%DATADIR%%/Help/module/FindJasper.rst
>@@ -370,6 +371,7 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Help/module/FindX11.rst
> %%DATADIR%%/Help/module/FindXCTest.rst
> %%DATADIR%%/Help/module/FindXMLRPC.rst
>+%%DATADIR%%/Help/module/FindXalanC.rst
> %%DATADIR%%/Help/module/FindXercesC.rst
> %%DATADIR%%/Help/module/FindZLIB.rst
> %%DATADIR%%/Help/module/Findosg.rst
>@@ -706,6 +708,7 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Help/prop_tgt/INTERFACE_SYSTEM_INCLUDE_DIRECTORIES.rst
> %%DATADIR%%/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION.rst
> %%DATADIR%%/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst
>+%%DATADIR%%/Help/prop_tgt/IOS_INSTALL_COMBINED.rst
> %%DATADIR%%/Help/prop_tgt/JOB_POOL_COMPILE.rst
> %%DATADIR%%/Help/prop_tgt/JOB_POOL_LINK.rst
> %%DATADIR%%/Help/prop_tgt/LABELS.rst
>@@ -802,6 +805,7 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Help/release/3.2.rst
> %%DATADIR%%/Help/release/3.3.rst
> %%DATADIR%%/Help/release/3.4.rst
>+%%DATADIR%%/Help/release/3.5.rst
> %%DATADIR%%/Help/release/dev.txt
> %%DATADIR%%/Help/release/index.rst
> %%DATADIR%%/Help/variable/APPLE.rst
>@@ -884,6 +888,7 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Help/variable/CMAKE_EXECUTABLE_SUFFIX.rst
> %%DATADIR%%/Help/variable/CMAKE_EXE_LINKER_FLAGS.rst
> %%DATADIR%%/Help/variable/CMAKE_EXE_LINKER_FLAGS_CONFIG.rst
>+%%DATADIR%%/Help/variable/CMAKE_EXPORT_COMPILE_COMMANDS.rst
> %%DATADIR%%/Help/variable/CMAKE_EXPORT_NO_PACKAGE_REGISTRY.rst
> %%DATADIR%%/Help/variable/CMAKE_EXTRA_GENERATOR.rst
> %%DATADIR%%/Help/variable/CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES.rst
>@@ -935,6 +940,7 @@ share/aclocal/cmake.m4
> %%DATADIR%%/Help/variable/CMAKE_INSTALL_RPATH.rst
> %%DATADIR%%/Help/variable/CMAKE_INSTALL_RPATH_USE_LINK_PATH.rst
> %%DATADIR%%/Help/variable/CMAKE_INTERNAL_PLATFORM_ABI.rst
>+%%DATADIR%%/Help/variable/CMAKE_IOS_INSTALL_COMBINED.rst
> %%DATADIR%%/Help/variable/CMAKE_JOB_POOL_COMPILE.rst
> %%DATADIR%%/Help/variable/CMAKE_JOB_POOL_LINK.rst
> %%DATADIR%%/Help/variable/CMAKE_LANG_ARCHIVE_APPEND.rst
>diff --git a/devel/kdevplatform/files/patch-plugins_filetemplates_CMakeLists.txt b/devel/kdevplatform/files/patch-plugins_filetemplates_CMakeLists.txt
>new file mode 100644
>index 0000000..d8a8a75
>--- /dev/null
>+++ b/devel/kdevplatform/files/patch-plugins_filetemplates_CMakeLists.txt
>@@ -0,0 +1,14 @@
>+Make sure the dependency exists, as testfiletemplates depends on ui files
>+generated by kdevfiletemplates.
>+
>+Submitted upstream: https://phabricator.kde.org/D1160
>+--- plugins/filetemplates/CMakeLists.txt.orig	2016-03-17 11:59:47 UTC
>++++ plugins/filetemplates/CMakeLists.txt
>+@@ -81,6 +81,7 @@ main.cpp
>+ )
>+ 
>+ kde4_add_executable(testfiletemplates ${test_srcs})
>++add_dependencies(testfiletemplates kdevfiletemplates)
>+ 
>+ target_link_libraries(testfiletemplates
>+     ${KDE4_KDECORE_LIBS}
>diff --git a/emulators/aqemu/files/patch-CMakeLists.txt b/emulators/aqemu/files/patch-CMakeLists.txt
>index dca00ea..5ac7206 100644
>--- a/emulators/aqemu/files/patch-CMakeLists.txt
>+++ b/emulators/aqemu/files/patch-CMakeLists.txt
>@@ -1,6 +1,18 @@
>---- ./CMakeLists.txt.orig	2010-12-21 19:45:24.000000000 +0300
>-+++ ./CMakeLists.txt	2011-04-17 13:03:32.608958928 +0400
>-@@ -318,6 +318,6 @@
>+The libvncclient target was removed because it was not used anywhere (aqemu
>+links against the systems libvncclient.so, only the definitions and includes
>+are needed from this block) and did not declare its dependency on the moc and
>+ui files, possibly causing problems in parallel builds.
>+--- CMakeLists.txt.orig	2011-01-14 19:38:53 UTC
>++++ CMakeLists.txt
>+@@ -164,7 +164,6 @@ IF( NOT WITHOUT_EMBEDDED_DISPLAY )
>+ 										Embedded_Display/vncclientthread.cpp Embedded_Display/vncview.cpp )
>+ 	
>+ 	ADD_DEFINITIONS( -DVNC_DISPLAY -DQTONLY )
>+-	ADD_LIBRARY( libvncclient SHARED ${aqemu_headers} ${aqemu_sources} )
>+ 	
>+ 	INCLUDE_DIRECTORIES( ${VNCCLIENT_INCLUDE_DIRS} ${LIBVNCCLIENT_INCLUDE_DIR} )
>+ ENDIF( NOT WITHOUT_EMBEDDED_DISPLAY )
>+@@ -318,6 +317,6 @@ IF( INSTALL_MAN )
>  		MESSAGE( STATUS "MAN_PAGE_COMPRESSOR flag not set. Available values: gzip, bzip2, lzma" )
>  		MESSAGE( STATUS "Will be installed not compressed MAN pages" )
>  		
>diff --git a/games/vavoom/Makefile b/games/vavoom/Makefile
>index 8018594..ceedd9b 100644
>--- a/games/vavoom/Makefile
>+++ b/games/vavoom/Makefile
>@@ -17,8 +17,6 @@ LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
> USES=		cmake dos2unix jpeg tar:bzip2
> DOS2UNIX_REGEX=	((.*\.(c|cpp|h|s|asm|inc|vc|ls|acs|cfg|txt|vs|mak|mgw"))$$|\/(makefile\..*|makefile|Makefile)$$)
> 
>-MAKE_JOBS_UNSAFE=	yes
>-
> OPTIONS_DEFINE=	FLAC LAUNCHER MAD MIKMOD OPENAL OPTIMIZED_CFLAGS VORBIS SDL DOCS
> OPTIONS_DEFAULT=	OPENGL SDL
> LAUNCHER_DESC=	Build GUI launcher
>diff --git a/games/vavoom/files/patch-progs_common_CMakeLists.txt b/games/vavoom/files/patch-progs_common_CMakeLists.txt
>new file mode 100644
>index 0000000..bc3a96e
>--- /dev/null
>+++ b/games/vavoom/files/patch-progs_common_CMakeLists.txt
>@@ -0,0 +1,8 @@
>+--- progs/common/CMakeLists.txt.orig	2016-03-16 16:45:41 UTC
>++++ progs/common/CMakeLists.txt
>+@@ -17,4 +17,4 @@ add_custom_command(OUTPUT ${OUTDIR}/uiba
>+ 	COMMAND ${VCC} ARGS -P${OUTDIR} ${CMAKE_CURRENT_SOURCE_DIR}/uibase/classes.vc ${OUTDIR}/uibase.dat
>+ 	DEPENDS vcc uibase/*.vc ${OUTDIR}/engine.dat)
>+ add_custom_target(uibase ALL DEPENDS ${OUTDIR}/uibase.dat)
>+-add_dependencies(uibase vcc engine)
>++add_dependencies(uibase vcc engine linespec)
>diff --git a/games/vavoom/files/patch-source_CMakeLists.txt b/games/vavoom/files/patch-source_CMakeLists.txt
>new file mode 100644
>index 0000000..bc3fdde
>--- /dev/null
>+++ b/games/vavoom/files/patch-source_CMakeLists.txt
>@@ -0,0 +1,20 @@
>+--- source/CMakeLists.txt.orig	2016-03-16 16:43:57 UTC
>++++ source/CMakeLists.txt
>+@@ -790,7 +790,7 @@ if (MAIN_COMPILE_FLAGS)
>+ 	set_target_properties(vavoom PROPERTIES COMPILE_FLAGS ${MAIN_COMPILE_FLAGS})
>+ endif (MAIN_COMPILE_FLAGS)
>+ target_link_libraries(vavoom ${MAIN_LIBS})
>+-add_dependencies(vavoom core timidity glbsp libglvis)
>++add_dependencies(vavoom core timidity glbsp libglvis revision_check)
>+ 
>+ install(TARGETS vavoom DESTINATION ${BINDIR})
>+ 
>+@@ -845,7 +845,7 @@ else(ENABLE_WRAPPERS)
>+ endif(ENABLE_WRAPPERS)
>+ set_target_properties(vavoom-dedicated PROPERTIES COMPILE_FLAGS -DSERVER)
>+ target_link_libraries(vavoom-dedicated glbsp core ${ZLIB_LIBRARY} ${NET_LIBRARIES})
>+-add_dependencies(vavoom-dedicated core glbsp)
>++add_dependencies(vavoom-dedicated core glbsp revision_check)
>+ 
>+ install(TARGETS vavoom-dedicated DESTINATION ${BINDIR})
>+ 
>diff --git a/net-im/telepathy-qt4/files/patch-git_7389dc9 b/net-im/telepathy-qt4/files/patch-git_7389dc9
>new file mode 100644
>index 0000000..63aba69
>--- /dev/null
>+++ b/net-im/telepathy-qt4/files/patch-git_7389dc9
>@@ -0,0 +1,19 @@
>+This commit is required to avoid occasional build failures in parallel builds.
>+
>+From 7389dc990c67d4269f3a79c924c054e87f2e4ac5 Mon Sep 17 00:00:00 2001
>+From: Alexandr Akulich <akulichalexander@gmail.com>
>+Date: Fri, 15 Jan 2016 18:54:09 +0500
>+Subject: CMakeLists: Added missing service dependence.
>+
>+telepathy-qt-service depends on generated stable and future types and consts.
>+
>+--- TelepathyQt/CMakeLists.txt
>++++ TelepathyQt/CMakeLists.txt
>+@@ -953,6 +953,7 @@ if(ENABLE_SERVICE_SUPPORT)
>+     #endif (ENABLE_COMPILER_COVERAGE)
>+     # lets build a static only library until we have a stable API/ABI
>+     add_library(telepathy-qt${QT_VERSION_MAJOR}-service STATIC ${telepathy_qt_service_SRCS})
>++    add_dependencies(telepathy-qt${QT_VERSION_MAJOR}-service stable-typesgen future-typesgen)
>+ 
>+     # generate service moc files
>+     foreach(moc_src ${telepathy_qt_service_MOC_SRCS})
>diff --git a/science/orthanc/Makefile b/science/orthanc/Makefile
>index 38e52b0..bba0052 100644
>--- a/science/orthanc/Makefile
>+++ b/science/orthanc/Makefile
>@@ -34,6 +34,7 @@ LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
> 		libpugixml.so:${PORTSDIR}/textproc/pugixml
> 
> CMAKE_ARGS=	-DDCMTK_LIBRARIES="dcmdsig;charls;dcmjpls" \
>+		-DDCMTK_DIR="${LOCALBASE}" \
> 		-DDCMTK_DICTIONARY_DIR="${LOCALBASE}/share/dcmtk" \
> 		-DUSE_SYSTEM_MONGOOSE=OFF \
> 		-DUNIT_TESTS_WITH_HTTP_CONNEXIONS=OFF
>diff --git a/science/orthanc/files/patch-Resources_CMake_DcmtkConfiguration.cmake b/science/orthanc/files/patch-Resources_CMake_DcmtkConfiguration.cmake
>new file mode 100644
>index 0000000..ddc0bcd
>--- /dev/null
>+++ b/science/orthanc/files/patch-Resources_CMake_DcmtkConfiguration.cmake
>@@ -0,0 +1,22 @@
>+Fix the build with CMake 3.5.0.
>+
>+FindDCMTK.cmake was rewritten upstream, and is incompatible with the uses in
>+this file: we need to set DCMTK_DIR in the port's Makefile, and it does not
>+match the directory used for searching for the headers below.
>+--- Resources/CMake/DcmtkConfiguration.cmake.orig	2015-12-15 16:49:02 UTC
>++++ Resources/CMake/DcmtkConfiguration.cmake
>+@@ -186,10 +186,10 @@ else()
>+     -DHAVE_CONFIG_H=1
>+     )
>+ 
>+-  if (EXISTS "${DCMTK_DIR}/config/cfunix.h")
>+-    set(DCMTK_CONFIGURATION_FILE "${DCMTK_DIR}/config/cfunix.h")
>+-  elseif (EXISTS "${DCMTK_DIR}/config/osconfig.h")  # This is for Arch Linux
>+-    set(DCMTK_CONFIGURATION_FILE "${DCMTK_DIR}/config/osconfig.h")
>++  if (EXISTS "${DCMTK_config_INCLUDE_DIR}/cfunix.h")
>++    set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/cfunix.h")
>++  elseif (EXISTS "${DCMTK_config_INCLUDE_DIR}/osconfig.h")  # This is for Arch Linux
>++    set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/osconfig.h")
>+   else()
>+     message(FATAL_ERROR "Please install libdcmtk*-dev")
>+   endif()

Actions: View | Diff

Attachments on bug 208033: 168244 | 168329 | 168369