pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
lld-git: Drop local patch for standalone build
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Mon Jan 30 23:41:14 2017 +0100
Changeset: 5cf35d6fc22a7f5f5b81161093532e5d6b39daae
Modified Files:
lld-git/distinfo
Removed Files:
lld-git/patches/patch-CMakeLists.txt
Log Message:
lld-git: Drop local patch for standalone build
This code is no longer needed.
Sponsored by <The NetBSD Foundation>
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5cf35d6fc22a7f5f5b81161093532e5d6b39daae
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
lld-git/distinfo | 1 -
lld-git/patches/patch-CMakeLists.txt | 138 -----------------------------------
2 files changed, 139 deletions(-)
diffs:
diff --git a/lld-git/distinfo b/lld-git/distinfo
index fea100e..7931384 100644
--- a/lld-git/distinfo
+++ b/lld-git/distinfo
@@ -12,4 +12,3 @@ Size (libcxx-3.6.2.src.tar.xz) = 944020 bytes
SHA1 (llvm-3.6.2.src.tar.xz) = 7a00257eb2bc9431e4c77c3a36b033072c54bc7e
RMD160 (llvm-3.6.2.src.tar.xz) = 521cbc5fe2925ea3c6e90c7a31f752a04045c972
Size (llvm-3.6.2.src.tar.xz) = 12802380 bytes
-SHA1 (patch-CMakeLists.txt) = 5da4ec9db33c694748352033c8757c767364c2ec
diff --git a/lld-git/patches/patch-CMakeLists.txt b/lld-git/patches/patch-CMakeLists.txt
deleted file mode 100644
index 01371c3..0000000
--- a/lld-git/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,138 +0,0 @@
-$NetBSD$
-
---- CMakeLists.txt.orig 2017-01-30 22:17:20.000000000 +0000
-+++ CMakeLists.txt
-@@ -51,6 +51,133 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRE
- include(HandleLLVMOptions)
- endif()
-
-+cmake_minimum_required(VERSION 3.4.3)
-+
-+# If we are not building as a part of LLVM, build LLD as an
-+# standalone project, using LLVM as an external library:
-+if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
-+ project(lld)
-+
-+ if (POLICY CMP0022)
-+ cmake_policy(SET CMP0022 NEW) # automatic when 2.8.12 is required
-+ endif()
-+
-+ option(LLVM_INSTALL_TOOLCHAIN_ONLY "Only include toolchain files in the 'install' target." OFF)
-+
-+ # Rely on llvm-config.
-+ set(CONFIG_OUTPUT)
-+ find_program(LLVM_CONFIG "llvm-config")
-+ if(LLVM_CONFIG)
-+ message(STATUS "Found LLVM_CONFIG as ${LLVM_CONFIG}")
-+ set(CONFIG_COMMAND ${LLVM_CONFIG}
-+ "--assertion-mode"
-+ "--bindir"
-+ "--libdir"
-+ "--includedir"
-+ "--prefix"
-+ "--src-root")
-+ execute_process(
-+ COMMAND ${CONFIG_COMMAND}
-+ RESULT_VARIABLE HAD_ERROR
-+ OUTPUT_VARIABLE CONFIG_OUTPUT
-+ )
-+ if(NOT HAD_ERROR)
-+ string(REGEX REPLACE
-+ "[ \t]*[\r\n]+[ \t]*" ";"
-+ CONFIG_OUTPUT ${CONFIG_OUTPUT})
-+ else()
-+ string(REPLACE ";" " " CONFIG_COMMAND_STR "${CONFIG_COMMAND}")
-+ message(STATUS "${CONFIG_COMMAND_STR}")
-+ message(FATAL_ERROR "llvm-config failed with status ${HAD_ERROR}")
-+ endif()
-+ else()
-+ message(FATAL_ERROR "llvm-config not found -- ${LLVM_CONFIG}")
-+ endif()
-+
-+ list(GET CONFIG_OUTPUT 0 ENABLE_ASSERTIONS)
-+ list(GET CONFIG_OUTPUT 1 TOOLS_BINARY_DIR)
-+ list(GET CONFIG_OUTPUT 2 LIBRARY_DIR)
-+ list(GET CONFIG_OUTPUT 3 INCLUDE_DIR)
-+ list(GET CONFIG_OUTPUT 4 LLVM_OBJ_ROOT)
-+ list(GET CONFIG_OUTPUT 5 MAIN_SRC_DIR)
-+
-+ if(NOT MSVC_IDE)
-+ set(LLVM_ENABLE_ASSERTIONS ${ENABLE_ASSERTIONS}
-+ CACHE BOOL "Enable assertions")
-+ # Assertions should follow llvm-config's.
-+ mark_as_advanced(LLVM_ENABLE_ASSERTIONS)
-+ endif()
-+
-+ set(LLVM_TOOLS_BINARY_DIR ${TOOLS_BINARY_DIR} CACHE PATH "Path to llvm/bin")
-+ set(LLVM_LIBRARY_DIR ${LIBRARY_DIR} CACHE PATH "Path to llvm/lib")
-+ set(LLVM_MAIN_INCLUDE_DIR ${INCLUDE_DIR} CACHE PATH "Path to llvm/include")
-+ set(LLVM_DIR ${LLVM_OBJ_ROOT}/cmake/modules/CMakeFiles CACHE PATH "Path to LLVM build tree CMake files")
-+ set(LLVM_BINARY_DIR ${LLVM_OBJ_ROOT} CACHE PATH "Path to LLVM build tree")
-+ set(LLVM_MAIN_SRC_DIR ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source tree")
-+
-+ find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR}
-+ NO_DEFAULT_PATH)
-+
-+ set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm")
-+ set(LLVMCONFIG_FILE "${LLVM_CMAKE_PATH}/LLVMConfig.cmake")
-+ if(EXISTS ${LLVMCONFIG_FILE})
-+ list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_PATH}")
-+ include(${LLVMCONFIG_FILE})
-+ else()
-+ message(FATAL_ERROR "Not found: ${LLVMCONFIG_FILE}")
-+ endif()
-+
-+ # They are used as destination of target generators.
-+ set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin)
-+ set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})
-+ if(WIN32 OR CYGWIN)
-+ # DLL platform -- put DLLs into bin.
-+ set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
-+ else()
-+ set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_LIBRARY_OUTPUT_INTDIR})
-+ endif()
-+
-+ include(AddLLVM)
-+ include(HandleLLVMOptions)
-+ include(CheckAtomic)
-+ include(TableGen)
-+
-+ if (PYTHON_EXECUTABLE STREQUAL "")
-+ set(Python_ADDITIONAL_VERSIONS 3.5 3.4 3.3 3.2 3.1 3.0 2.7 2.6 2.5)
-+ include(FindPythonInterp)
-+ if( NOT PYTHONINTERP_FOUND )
-+ message(FATAL_ERROR
-+ "Unable to find Python interpreter, required for builds and testing.
-+ Please install Python or specify the PYTHON_EXECUTABLE CMake variable.")
-+ endif()
-+ else()
-+ message("-- Found PythonInterp: ${PYTHON_EXECUTABLE}")
-+ endif()
-+
-+ # Import CMake library targets from LLVM and Clang.
-+ include("${LLVM_OBJ_ROOT}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm/LLVMConfig.cmake")
-+
-+ set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
-+
-+ set(LLVM_BINARY_DIR ${CMAKE_BINARY_DIR})
-+
-+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
-+ include_directories("${LLVM_BINARY_DIR}/include" "${LLVM_MAIN_INCLUDE_DIR}")
-+ # Next three include directories are needed when llvm-config is located in build directory.
-+ # LLVM and Cland are assumed to be built together
-+ if (EXISTS "${LLVM_OBJ_ROOT}/include")
-+ include_directories("${LLVM_OBJ_ROOT}/include")
-+ endif()
-+ link_directories("${LLVM_LIBRARY_DIR}")
-+
-+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX})
-+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX})
-+
-+ set(LLD_BUILT_STANDALONE 1)
-+endif()
-+
-+
- set(LLD_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
- set(LLD_INCLUDE_DIR ${LLD_SOURCE_DIR}/include )
- set(LLD_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
Home |
Main Index |
Thread Index |
Old Index