Skip to content

[WIP] Fixes for OS X #743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
certik wants to merge 9 commits into from
Closed

[WIP] Fixes for OS X #743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a9252ff
Update ncurses
certik May 1, 2015
aa41e3b
gcc: install fixed dispatch/object.h header file
certik May 1, 2015
e11ea81
Update git to 2.4.0
certik May 1, 2015
ed99ffd
git: allow to set NO_APPLE_COMMON_CRYPTO=1
certik May 1, 2015
61297ca
CMake: fix the CMAKE_OSX_DEPLOYMENT_TARGET issue
certik May 1, 2015
d2e980d
Update CMake to 3.2.2
certik May 1, 2015
b9aa6d7
CMake: use our curl
certik May 1, 2015
97bf823
Fix cmake_package on Darwin
certik May 1, 2015
a407758
Use Clang's linker to make AVX instructions work
certik May 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions base/cmake_package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 21 additions & 3 deletions pkgs/cmake.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 6 additions & 0 deletions pkgs/csympy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}']
8 changes: 8 additions & 0 deletions pkgs/gcc/gcc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Member Author

@certik certik May 1, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I should add a check that /usr/include/dispatch/object.h exists in the first place, and then also do this fix for OS X 10.10 only.


- name: link_lib64_to_lib
after: install
handler: bash
Expand Down
12 changes: 10 additions & 2 deletions pkgs/git.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand All @@ -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
Copy link
Member Author

@certik certik May 1, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This disables https support, so it is not a solution. It makes git build with our gcc at least, so that's why I did it, but we need to find a real solution.


- 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}']
Expand Down
4 changes: 2 additions & 2 deletions pkgs/ncurses/ncurses.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down