From 6fff3ace320030c0fa8819cb81b537bb11e2df97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Fri, 1 May 2015 11:30:45 -0600 Subject: [PATCH 1/2] gcc: install fixed dispatch/object.h header file Fixes #742. --- pkgs/gcc/gcc.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) 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 From bf2217371d561578861b5b8218c9cba8dfc65dd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Fri, 15 May 2015 14:16:03 -0600 Subject: [PATCH 2/2] gcc: check that the file exists before patching it --- pkgs/gcc/gcc.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/gcc/gcc.yaml b/pkgs/gcc/gcc.yaml index dd87891a9..d6e103935 100644 --- a/pkgs/gcc/gcc.yaml +++ b/pkgs/gcc/gcc.yaml @@ -27,8 +27,10 @@ build_stages: 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" + if [ -f /usr/include/dispatch/object.h ]; then + 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" + fi - name: link_lib64_to_lib after: install