mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-07 06:40:06 +00:00
Code Issues Releases Activity

Update devel/llbuild to SNAPSHOT-2017-12-10.

Browse Source 
This update simplifies the build, as upstream has incorporated many of the
patches that used to be in the files directory of this port.  It also
updates the distinfo to fix the previous BROKEN line.

Approved by:	mat
Sponsored by:	DARPA, AFRL
Differential Revision:	https://reviews.freebsd.org/D13451
This commit is contained in:
Jonathan Anderson 2017-12-12 13:16:26 +00:00
parent 1b9ba1a859
commit 038af36ccf
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=456130
10 changed files with 9 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devel/llbuild/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= llbuild
DISTVERSIONPREFIX= swift-DEVELOPMENT-
DISTVERSION= SNAPSHOT-2016-11-01
DISTVERSION= SNAPSHOT-2017-12-10
DISTVERSIONSUFFIX= -a
CATEGORIES= devel
@ -13,9 +13,6 @@ LICENSE= APACHE20 BSD3CLAUSE NCSA
LICENSE_COMB= multi
LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE.txt
BROKEN= checksum and size mismatch
BUILD_DEPENDS= llvm-lit-devel:devel/llvm-devel
LIB_DEPENDS= libsqlite3.so:databases/sqlite3
USES= cmake:outsource

6
devel/llbuild/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1478217141
SHA256 (apple-swift-llbuild-swift-DEVELOPMENT-SNAPSHOT-2016-11-01-a_GH0.tar.gz) = 567ae284e388ba399bbe3a0fa129edd06d803b6ab90c3a1ace4549d686f4a9b2
SIZE (apple-swift-llbuild-swift-DEVELOPMENT-SNAPSHOT-2016-11-01-a_GH0.tar.gz) = 4718056
TIMESTAMP = 1513014351
SHA256 (apple-swift-llbuild-swift-DEVELOPMENT-SNAPSHOT-2017-12-10-a_GH0.tar.gz) = a78261619230f76a2e9a8d6d4e3713f51378ac6c957f698bb69040b9700b79e6
SIZE (apple-swift-llbuild-swift-DEVELOPMENT-SNAPSHOT-2017-12-10-a_GH0.tar.gz) = 4833910

27
devel/llbuild/files/patch-CMakeLists.txt
View File

@ -1,27 +0,0 @@
--- CMakeLists.txt.orig 2016-10-20 04:49:37 UTC
+++ CMakeLists.txt
@@ -112,6 +112,13 @@ endif()
include_directories(BEFORE
${CMAKE_SOURCE_DIR}/include)
+# On FreeBSD, /usr/local/* is not used by default. In order to build LLVM
+# with sqlite3, etc., we must add /usr/local paths.
+if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)")
+ include_directories("/usr/local/include")
+ link_directories("/usr/local/lib")
+endif(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)")
+
# Xcode: Use libc++ and c++14 using proper build settings.
if (XCODE)
# Force usage of Clang.
@@ -170,8 +177,8 @@ else ()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor")
endif ()
-# On Linux, always build with PIC.
-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+# On BSD and Linux, always build with PIC.
+if(${CMAKE_SYSTEM_NAME} MATCHES ".*BSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
endif ()

17
devel/llbuild/files/patch-cmake_modules_FindFileCheck.cmake
View File

@ -1,17 +0,0 @@
--- cmake/modules/FindFileCheck.cmake.orig 2016-11-04 00:07:45 UTC
+++ cmake/modules/FindFileCheck.cmake
@@ -5,12 +5,12 @@
# FILECHECK_EXECUTABLE
find_program(FILECHECK_EXECUTABLE
- NAMES FileCheck
+ NAMES FileCheck FileCheck39
DOC "Path to 'FileCheck' executable")
# Handle REQUIRED and QUIET arguments, this will also set FILECHECK_FOUND to true
# if FILECHECK_EXECUTABLE exists.
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(FileCheck
+find_package_handle_standard_args(FileCheck39
"Failed to locate 'FileCheck' executable"
FILECHECK_EXECUTABLE)

11
devel/llbuild/files/patch-cmake_modules_FindLit.cmake
View File

@ -1,11 +0,0 @@
--- cmake/modules/FindLit.cmake.orig 2016-10-20 04:49:37 UTC
+++ cmake/modules/FindLit.cmake
@@ -5,7 +5,7 @@
# LIT_EXECUTABLE
find_program(LIT_EXECUTABLE
- NAMES lit
+ NAMES lit llvm-lit llvm-lit-devel
DOC "Path to 'lit' executable")
# Handle REQUIRED and QUIET arguments, this will also set LIT_FOUND to true

10
devel/llbuild/files/patch-lib_Basic_CMakeLists.txt
View File

@ -1,10 +0,0 @@
--- lib/Basic/CMakeLists.txt.orig 2016-10-20 04:49:37 UTC
+++ lib/Basic/CMakeLists.txt
@@ -7,6 +7,6 @@ add_llbuild_library(llbuildBasic
ShellUtility.cpp
)
-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+if(${CMAKE_SYSTEM_NAME} MATCHES ".*BSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
target_link_libraries(llbuildBasic pthread)
endif()

8
devel/llbuild/files/patch-lib_Ninja_CMakeLists.txt
View File

@ -1,8 +0,0 @@
--- lib/Ninja/CMakeLists.txt.orig 2016-10-20 04:49:37 UTC
+++ lib/Ninja/CMakeLists.txt
@@ -4,3 +4,5 @@ add_llbuild_library(llbuildNinja
ManifestLoader.cpp
Parser.cpp
)
+
+target_link_libraries(llbuildNinja llvmSupport curses)

13
devel/llbuild/files/patch-lib_llvm_Support_CMakeLists.txt
View File

@ -1,13 +0,0 @@
--- lib/llvm/Support/CMakeLists.txt.orig 2016-10-20 04:49:37 UTC
+++ lib/llvm/Support/CMakeLists.txt
@@ -38,6 +38,10 @@ circular_raw_ostream.cpp
raw_ostream.cpp
)
+if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+ target_link_libraries(llvmSupport execinfo pthread)
+endif()
+
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
target_link_libraries(llvmSupport pthread dl)
endif()

15
devel/llbuild/files/patch-lib_llvm_Support_Unix_Process.inc
View File

@ -1,15 +0,0 @@
--- lib/llvm/Support/Unix/Process.inc.orig 2016-10-20 04:49:37 UTC
+++ lib/llvm/Support/Unix/Process.inc
@@ -33,10 +33,10 @@
#if HAVE_SIGNAL_H
#include <signal.h>
#endif
-// DragonFlyBSD, OpenBSD, and Bitrig have deprecated <malloc.h> for
+// DragonFlyBSD, FreeBSD, OpenBSD, and Bitrig have deprecated <malloc.h> for
// <stdlib.h> instead. Unix.h includes this for us already.
#if defined(HAVE_MALLOC_H) && !defined(__DragonFly__) && \
- !defined(__OpenBSD__) && !defined(__Bitrig__)
+ !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__Bitrig__)
#include <malloc.h>
#endif
#if defined(HAVE_MALLCTL)

10
devel/llbuild/files/patch-products_llbuild_CMakeLists.txt
View File

@ -1,9 +1,9 @@
--- products/llbuild/CMakeLists.txt.orig 2016-10-20 04:49:37 UTC
--- products/llbuild/CMakeLists.txt.orig 2017-12-05 12:40:29 UTC
+++ products/llbuild/CMakeLists.txt
@@ -11,3 +11,14 @@ target_link_libraries(llbuild
sqlite3
curses
)
@@ -13,3 +13,14 @@ target_link_libraries(llbuild
if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
target_link_libraries(llbuild curses)
endif()
+
+install(TARGETS llbuild
+ COMPONENT llbuild