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
+50 −7
Closed

[WIP] Fixes for OS X #743

Show file tree
Hide file tree
Changes from 2 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
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
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