Fix macOS builds

keyring/cmake.gpg

@@ -0,0 +1 @@
+../tor-browser-build/keyring/cmake.gpg

keyring/llvm.gpg

@@ -0,0 +1 @@
+../tor-browser-build/keyring/llvm.gpg

projects/cctools

@@ -0,0 +1 @@
+../tor-browser-build/projects/cctools

projects/cmake

@@ -0,0 +1 @@
+../tor-browser-build/projects/cmake

projects/gopkg.in,hlandau,service.v2/config

@@ -13,16 +13,29 @@ var:
     - gopkg.in,hlandau,svcutils.v1
     - gopkg.in,hlandau,easyconfig.v1
   build_go_lib_pre: |
-    [% IF c("var/linux") %]
+    [% IF c("var/cgo") %]
       [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
 
-      tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %]
-      export PATH="/var/tmp/dist/binutils/bin:$PATH"
+      [% IF c("var/linux") %]
+        tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %]
+        export PATH="/var/tmp/dist/binutils/bin:$PATH"
+      [% END -%]
 
-      export CGO_ENABLED=1
+      [% IF c("var/osx") -%]
+        export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=10.7"
+        export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7"
+        export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7"
+        export CC="$clangdir/bin/clang"
+        export CXX="$clangdir/bin/clang++"
+      [% END -%]
     [% END -%]
 
+    export CGO_ENABLED=[% c("var/cgo") %]
+
 targets:
+  linux:
+    var:
+      cgo: 1
   linux-i686:
     var:
       arch_deps:
@@ -31,12 +44,16 @@ targets:
     var:
       arch_deps:
         - libcap-dev
+  osx-x86_64:
+    var:
+      cgo: 0
   windows:
     var:
       go_lib_deps:
         - github.com,btcsuite,winsvc
         - gopkg.in,hlandau,svcutils.v1
         - gopkg.in,hlandau,easyconfig.v1
+      cgo: 0
 
 input_files:
   - project: container-image
@@ -44,10 +61,10 @@ input_files:
     project: go
   - name: '[% c("var/compiler") %]'
     project: '[% c("var/compiler") %]'
-    enable: '[% c("var/linux") %]'
+    enable: '[% c("var/cgo") %]'
   - name: binutils
     project: binutils
-    enable: '[% c("var/linux") %]'
+    enable: '[% c("var/linux") && c("var/cgo") %]'
   - name: github.com,btcsuite,winsvc
     project: github.com,btcsuite,winsvc
     enable: '[% c("var/windows") %]'

projects/gopkg.in,hlandau,svcutils.v1/config

@@ -9,17 +9,40 @@ var:
   container:
     use_container: 1
   go_lib: gopkg.in/hlandau/svcutils.v1
+  go_lib_install:
+    - gopkg.in/hlandau/svcutils.v1
+    - gopkg.in/hlandau/svcutils.v1/caps
+    - gopkg.in/hlandau/svcutils.v1/chroot
+    - gopkg.in/hlandau/svcutils.v1/dupfd
+    - gopkg.in/hlandau/svcutils.v1/exepath
+    - gopkg.in/hlandau/svcutils.v1/passwd
+    - gopkg.in/hlandau/svcutils.v1/pidfile
+    - gopkg.in/hlandau/svcutils.v1/setuid
+    - gopkg.in/hlandau/svcutils.v1/systemd
   build_go_lib_pre: |
-    [% IF c("var/linux") %]
+    [% IF c("var/cgo") %]
       [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
 
-      tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %]
-      export PATH="/var/tmp/dist/binutils/bin:$PATH"
+      [% IF c("var/linux") %]
+        tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %]
+        export PATH="/var/tmp/dist/binutils/bin:$PATH"
+      [% END -%]
 
-      export CGO_ENABLED=1
+      [% IF c("var/osx") -%]
+        export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=10.7"
+        export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7"
+        export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7"
+        export CC="$clangdir/bin/clang"
+        export CXX="$clangdir/bin/clang++"
+      [% END -%]
     [% END -%]
 
+    export CGO_ENABLED=[% c("var/cgo") %]
+
 targets:
+  linux:
+    var:
+      cgo: 1
   linux-i686:
     var:
       arch_deps:
@@ -28,6 +51,12 @@ targets:
     var:
       arch_deps:
         - libcap-dev
+  osx-x86_64:
+    var:
+      cgo: 0
+  windows:
+    var:
+      cgo: 0
 
 input_files:
   - project: container-image
@@ -35,7 +64,7 @@ input_files:
     project: go
   - name: '[% c("var/compiler") %]'
     project: '[% c("var/compiler") %]'
-    enable: '[% c("var/linux") %]'
+    enable: '[% c("var/cgo") %]'
   - name: binutils
     project: binutils
-    enable: '[% c("var/linux") %]'
+    enable: '[% c("var/linux") && c("var/cgo") %]'

projects/llvm

@@ -0,0 +1 @@
+../tor-browser-build/projects/llvm

projects/macosx-toolchain

@@ -0,0 +1 @@
+../tor-browser-build/projects/macosx-toolchain

projects/ncdns/build

@@ -1,14 +1,23 @@
 #!/bin/bash
 [% c("var/set_default_env") -%]
 [% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %]
-[% IF c("var/linux") %]
+[% IF c("var/cgo") %]
   [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
 
-  tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %]
-  export PATH="/var/tmp/dist/binutils/bin:$PATH"
+  [% IF c("var/linux") %]
+    tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %]
+    export PATH="/var/tmp/dist/binutils/bin:$PATH"
+  [% END -%]
 
-  export CGO_ENABLED=1
+  [% IF c("var/osx") -%]
+    export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=10.7"
+    export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7"
+    export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7"
+    export CC="$clangdir/bin/clang"
+    export CXX="$clangdir/bin/clang++"
+  [% END -%]
 [% END -%]
+export CGO_ENABLED=[% c("var/cgo") %]
 distdir=/var/tmp/dist/[% project %]
 mkdir -p $distdir
 

projects/ncdns/config

@@ -20,6 +20,9 @@ var:
     - golang.org,x,net
 
 targets:
+  linux:
+    var:
+      cgo: 1
   linux-i686:
     var:
       arch_deps:
@@ -28,6 +31,9 @@ targets:
     var:
       arch_deps:
         - libcap-dev
+  osx-x86_64:
+    var:
+      cgo: 0
   windows:
     var:
       go_lib_deps:
@@ -43,6 +49,7 @@ targets:
         - gopkg.in,hlandau,service.v2
         - golang.org,x,net
         - golang.org,x,sys
+      cgo: 0
 
 input_files:
   - project: container-image
@@ -50,10 +57,10 @@ input_files:
     project: go
   - name: '[% c("var/compiler") %]'
     project: '[% c("var/compiler") %]'
-    enable: '[% c("var/linux") %]'
+    enable: '[% c("var/cgo") %]'
   - name: binutils
     project: binutils
-    enable: '[% c("var/linux") %]'
+    enable: '[% c("var/linux") && c("var/cgo") %]'
   - name: github.com,hlandau,xlog
     project: github.com,hlandau,xlog
   - name: github.com,hlandau,dexlogconfig