diff options
| -rw-r--r-- | mesonbuild/dependencies/dev.py | 16 | ||||
| -rwxr-xr-x | tools/ac_converter.py | 4 |
2 files changed, 14 insertions, 6 deletions
diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index 10f7ad3..76d6691 100644 --- a/mesonbuild/dependencies/dev.py +++ b/mesonbuild/dependencies/dev.py @@ -162,11 +162,19 @@ class LLVMDependency(Dependency): # Ordered list of llvm-config binaries to try. Start with base, then try # newest back to oldest (3.5 is abitrary), and finally the devel version. + # Please note that llvm-config-5.0 is a development snapshot and it should + # not be moved to the beginning of the list. The only difference between + # llvm-config-5.0 and llvm-config-devel is that the former is used by + # Debian and the latter is used by FreeBSD. llvm_config_bins = [ - 'llvm-config', 'llvm-config-4.0', 'llvm-config-3.9', 'llvm-config39', - 'llvm-config-3.8', 'llvm-config38', 'llvm-config-3.7', 'llvm-config37', - 'llvm-config-3.6', 'llvm-config36', 'llvm-config-3.5', 'llvm-config35', - 'llvm-config-devel', + 'llvm-config', # base + 'llvm-config-4.0', 'llvm-config40', # latest stable release + 'llvm-config-3.9', 'llvm-config39', # old stable releases + 'llvm-config-3.8', 'llvm-config38', + 'llvm-config-3.7', 'llvm-config37', + 'llvm-config-3.6', 'llvm-config36', + 'llvm-config-3.5', 'llvm-config35', + 'llvm-config-5.0', 'llvm-config-devel', # development snapshot ] llvmconfig = None _llvmconfig_found = False diff --git a/tools/ac_converter.py b/tools/ac_converter.py index 546d318..cf00fd0 100755 --- a/tools/ac_converter.py +++ b/tools/ac_converter.py @@ -202,7 +202,7 @@ function_data = \ 'HAVE_DIRFD': ('dirfd', 'dirent.h'), 'HAVE_DLOPEN': ('dlopen', 'dlfcn.h'), 'HAVE_DUP2': ('dup2', 'unistd.h'), - 'HAVE_DUP3': ('dup2', 'unistd.h'), + 'HAVE_DUP3': ('dup3', 'unistd.h'), 'HAVE_EPOLL_CREATE1': ('epoll_create1', 'sys/epoll.h'), 'HAVE_ERF': ('erf', 'math.h'), 'HAVE_ERFC': ('erfc', 'math.h'), @@ -222,7 +222,7 @@ function_data = \ 'HAVE_FTIME': ('ftime', 'sys/timeb.h'), 'HAVE_FTRUNCATE': ('ftruncate', 'unistd.h'), 'HAVE_FUTIMENS': ('futimens', 'sys/stat.h'), - 'HAVE_FUTIMES': ('futimes', 'sys/stat.h'), + 'HAVE_FUTIMES': ('futimes', 'sys/time.h'), 'HAVE_GAI_STRERROR': ('gai_strerror', 'netdb.h'), 'HAVE_GETGROUPLIST': ('getgrouplist', 'grp.h'), 'HAVE_GETHOSTBYNAME': ('gethostbyname', 'netdb.h'), |