Skip to content

Commit 835f05b

Browse files
committed
CMake: use our zlib, bzip2 and curl
This way CMake does not build its own versions, but rather uses Hashstack versions. We also made sure the proper RPATH will be used in the `cmake` executable via the CMAKE_PREFIX_PATH option. Only three other libraries are still build as part of CMake: expat, jsoncpp, libarchive, so we commented out options that disable them for now. As a bonus, this patch also fixes a problem on OSX 10.10 where the curl component of CMake fails to build with gcc (we now use Hashstack's version that builds).
1 parent 09ab7bc commit 835f05b

1 file changed

Lines changed: 13 additions & 1 deletion

File tree

pkgs/cmake.yaml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,24 @@
11
extends: [autotools_package]
22

3+
dependencies:
4+
build: [zlib, bzip2, curl]
5+
36
sources:
47
- key: tar.gz:vxuu43rwaodxivs7flwyqzsbkrbuit5x
58
url: http://www.cmake.org/files/v3.2/cmake-3.2.2.tar.gz
69

710
build_stages:
811
- name: configure
9-
extra: ['--parallel=${HASHDIST_CPU_COUNT}']
12+
extra: ['--parallel=${HASHDIST_CPU_COUNT}',
13+
'--system-bzip2',
14+
'--system-curl',
15+
#'--system-expat',
16+
#'--system-jsoncpp',
17+
#'--system-libarchive',
18+
'--system-zlib',
19+
'--',
20+
'-DCMAKE_PREFIX_PATH=${CURL_DIR}/lib;${ZLIB_DIR}/lib;${BZIP2_DIR}/lib',
21+
]
1022

1123
when_build_dependency:
1224
- set: CMAKE

0 commit comments

Comments
 (0)