[tor-commits] [tor-messenger-build/master] Fix libgpg-error OSX build

[boklm at torproject.org]

commit 9de42ea471545673359137e8ad397bac67f5961c
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Tue Jun 23 16:21:00 2015 +0200

    Fix libgpg-error OSX build
---
 projects/libgpg-error/build                        |    4 +++
 projects/libgpg-error/config                       |    7 +++++
 .../lock-obj-pub.x86_64-apple-darwin14.0.0.h       |   28 ++++++++++++++++++++
 3 files changed, 39 insertions(+)

diff --git a/projects/libgpg-error/build b/projects/libgpg-error/build
index de4ae5b..1ee8f52 100644
--- a/projects/libgpg-error/build
+++ b/projects/libgpg-error/build
@@ -5,6 +5,10 @@ mkdir -p "$distdir"
 [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
 tar xf [% project %]-[% c('version') %].tar.bz2
 cd [% project %]-[% c('version') %]
+[% IF c("var/osx") -%]
+cp ../lock-obj-pub.x86_64-apple-darwin14.0.0.h src/syscfg/lock-obj-pub.darwin10.h
+echo 'int main() {}' > src/gen-posix-lock-obj.c
+[% END -%]
 ./configure --prefix="$distdir" [% c("var/configure_opt") %][% IF c('var/windows') %] --enable-static --disable-shared[% END %]
 make -j4
 make prefix="$distdir" install
diff --git a/projects/libgpg-error/config b/projects/libgpg-error/config
index 2f5a1af..1ca6d02 100644
--- a/projects/libgpg-error/config
+++ b/projects/libgpg-error/config
@@ -23,11 +23,18 @@ targets:
     var:
       arch_deps:
         - libc6-dev-i386
+  osx-x86_64:
+    lsb_release:
+      id: Ubuntu
+      release: 12.04
+      codename: precise
 input_files:
   - URL: 'ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-[% c("version") %].tar.bz2'
     sig_ext: sig
     file_gpg_id: 1
     gpg_keyring: libgcrypt.gpg
+  - filename: lock-obj-pub.x86_64-apple-darwin14.0.0.h
+    enable: '[% c("var/osx") %]'
   - name: '[% c("var/compiler") %]'
     project: '[% c("var/compiler") %]'
   - project: docker-image
diff --git a/projects/libgpg-error/lock-obj-pub.x86_64-apple-darwin14.0.0.h b/projects/libgpg-error/lock-obj-pub.x86_64-apple-darwin14.0.0.h
new file mode 100644
index 0000000..3e3ccb2
--- /dev/null
+++ b/projects/libgpg-error/lock-obj-pub.x86_64-apple-darwin14.0.0.h
@@ -0,0 +1,28 @@
+## lock-obj-pub.x86_64-apple-darwin14.0.0.h
+## File created by gen-posix-lock-obj - DO NOT EDIT
+## To be included by mkheader into gpg-error.h
+
+typedef struct
+{
+  long _vers;
+  union {
+    volatile char _priv[64];
+    long _x_align;
+    long *_xp_align;
+  } u;
+} gpgrt_lock_t;
+
+#define GPGRT_LOCK_INITIALIZER {1,{{167,171,170,50,0,0,0,0, \
+                                    0,0,0,0,0,0,0,0, \
+                                    0,0,0,0,0,0,0,0, \
+                                    0,0,0,0,0,0,0,0, \
+                                    0,0,0,0,0,0,0,0, \
+                                    0,0,0,0,0,0,0,0, \
+                                    0,0,0,0,0,0,0,0, \
+                                    0,0,0,0,0,0,0,0}}}
+##
+## Local Variables:
+## mode: c
+## buffer-read-only: t
+## End:
+##