diff --git a/base/cmake_package.py b/base/cmake_package.py index ad83dfbfe..853c85b95 100644 --- a/base/cmake_package.py +++ b/base/cmake_package.py @@ -34,6 +34,9 @@ def configure(ctx, stage_args): else: conf_lines.append('-DCMAKE_BUILD_TYPE:STRING=Release') + if ctx.parameters['platform'] == 'Darwin': + conf_lines.append('-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=""') + #cmake needs to be given all the dependency dirs as prefix paths #so that we search the hashdist directories before the system directories #CMake doesn't use the CPPFLAGS implicitly to find libraries diff --git a/pkgs/cmake.yaml b/pkgs/cmake.yaml index 4da397372..92d0a0620 100644 --- a/pkgs/cmake.yaml +++ b/pkgs/cmake.yaml @@ -1,12 +1,30 @@ extends: [autotools_package] +dependencies: + build: [curl] + sources: -- key: tar.gz:kcrzjtzo7wnjfxkbctv6fgmurgmezzxg - url: http://www.cmake.org/files/v3.2/cmake-3.2.0-rc1.tar.gz +- key: tar.gz:vxuu43rwaodxivs7flwyqzsbkrbuit5x + url: http://www.cmake.org/files/v3.2/cmake-3.2.2.tar.gz build_stages: +- when: platform == 'Darwin' + name: fix_deployment_target + after: prologue + before: configure + handler: bash + bash: | + unset MACOSX_DEPLOYMENT_TARGET + - name: configure - extra: ['--parallel=${HASHDIST_CPU_COUNT}'] + extra: ['--parallel=${HASHDIST_CPU_COUNT}', + #'--system-bzip2', + '--system-curl', + #'--system-expat', + #'--system-jsoncpp', + #'--system-libarchive', + #'--system-zlib', + ] when_build_dependency: - set: CMAKE diff --git a/pkgs/csympy.yaml b/pkgs/csympy.yaml index 5caa5577f..d12c127c1 100644 --- a/pkgs/csympy.yaml +++ b/pkgs/csympy.yaml @@ -12,6 +12,12 @@ defaults: relocatable: false build_stages: +- name: cxx_flags + before: configure + handler: bash + bash: | + export CXXFLAGS="-Wa,-q" + - name: configure extra: ['-D WITH_PYTHON:BOOL=ON', '-D PYTHON_INSTALL_PATH:PATH=$ARTIFACT/{{python_site_packages_rel}}'] diff --git a/pkgs/gcc/gcc.yaml b/pkgs/gcc/gcc.yaml index 8710ab881..dd87891a9 100644 --- a/pkgs/gcc/gcc.yaml +++ b/pkgs/gcc/gcc.yaml @@ -22,6 +22,14 @@ build_stages: patch -up1 < _hashdist/rpath.patch sed -i "s|@@ARTIFACT@@|${ARTIFACT}|g" gcc/config/i386/gnu-user.h gcc/config/i386/gnu-user64.h + - when: platform == 'Darwin' + name: fix_object_h + before: configure + handler: bash + bash: | + mkdir -p "$ARTIFACT/include/dispatch" + sed 's+typedef void (\^dispatch_block_t)(void)+typedef void* dispatch_block_t+' /usr/include/dispatch/object.h > "$ARTIFACT/include/dispatch/object.h" + - name: link_lib64_to_lib after: install handler: bash diff --git a/pkgs/git.yaml b/pkgs/git.yaml index 4e7be7d35..eb74dc449 100644 --- a/pkgs/git.yaml +++ b/pkgs/git.yaml @@ -4,12 +4,13 @@ dependencies: build: [curl, pcre, openssl, libiconv, gettext, expat, zlib, perl] sources: -- key: tar.gz:xix6qfhhbgs5b4bu5pucba74477o2cez - url: http://www.kernel.org/pub/software/scm/git/git-2.3.0.tar.gz +- key: tar.gz:2wghm2ua3bvf4gcgybghiymotc76yfmh + url: https://www.kernel.org/pub/software/scm/git/git-2.4.0.tar.gz defaults: # /bin/git contains hard-coded path relocatable: false + disable_crypto: false build_stages: @@ -19,6 +20,13 @@ build_stages: bash: | export PERL_PATH="/usr/bin/env perl" +- when: platform == 'Darwin' and disable_crypto + name: fix_crypto_compile_failure + before: configure + handler: bash + bash: | + export NO_APPLE_COMMON_CRYPTO=1 + - name: configure mode: override extra: ['--with-libpcre=${PCRE_DIR}', '--with-zlib=${ZLIB_DIR}', '--with-iconv=${LIBICONV_DIR}', '--with-expat=${EXPAT_DIR}', '--with-curl=${CURL_DIR}'] diff --git a/pkgs/ncurses/ncurses.yaml b/pkgs/ncurses/ncurses.yaml index f1ad68afd..f12240d83 100644 --- a/pkgs/ncurses/ncurses.yaml +++ b/pkgs/ncurses/ncurses.yaml @@ -1,8 +1,8 @@ extends: [autotools_package] sources: - - url: http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.9.tar.gz - key: tar.gz:sbdctd5uiazezhkbgxwou6dz77wykrw5 + - key: git:690232d93fc4ac57f0c9a484cc5781e8d1fe1fae + url: https://github.com/certik/ncurses defaults: relocatable: false