commit a4ad1dabbc02ade3290fbaeddee8b67d47803126 Author: Arlo Breault arlolra@gmail.com Date: Tue Aug 29 21:08:55 2017 -0400

Revert "libgpg-error: fix OSX lock-obj-pub headers"

* Fixes crash when exiting on macOS.

This reverts commit 759530f06f060934ef8917745eeddd31ef8155cc. --- projects/libgpg-error/build | 2 +- projects/libgpg-error/config | 2 +- .../lock-obj-pub.x86_64-apple-darwin10.h | 17 ------------- .../lock-obj-pub.x86_64-apple-darwin14.0.0.h | 28 ++++++++++++++++++++++ 4 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/projects/libgpg-error/build b/projects/libgpg-error/build index 9e2efe0..1319786 100644 --- a/projects/libgpg-error/build +++ b/projects/libgpg-error/build @@ -8,7 +8,7 @@ mkdir -p /var/tmp/build tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.bz2 cd /var/tmp/build/[% project %]-[% c('version') %] [% IF c("var/osx") -%] -cp $rootdir/lock-obj-pub.x86_64-apple-darwin10.h src/syscfg/lock-obj-pub.darwin10.h +cp $rootdir/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 -%] export SOURCE_DATE_EPOCH=$(stat -c %Y ChangeLog) diff --git a/projects/libgpg-error/config b/projects/libgpg-error/config index bd00a4f..07d5d22 100644 --- a/projects/libgpg-error/config +++ b/projects/libgpg-error/config @@ -18,7 +18,7 @@ input_files: sig_ext: sig file_gpg_id: 1 gpg_keyring: libgcrypt.gpg - - filename: lock-obj-pub.x86_64-apple-darwin10.h + - filename: lock-obj-pub.x86_64-apple-darwin14.0.0.h enable: '[% c("var/osx") %]' - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' diff --git a/projects/libgpg-error/lock-obj-pub.x86_64-apple-darwin10.h b/projects/libgpg-error/lock-obj-pub.x86_64-apple-darwin10.h deleted file mode 100644 index 4d3c5fe..0000000 --- a/projects/libgpg-error/lock-obj-pub.x86_64-apple-darwin10.h +++ /dev/null @@ -1,17 +0,0 @@ -## lock-obj-pub.x86_64-apple-darwin10.h - NO LOCK SUPPORT -## File created by gen-posix-lock-obj - DO NOT EDIT -## To be included by mkheader into gpg-error.h - -/* Dummy object - no locking available. */ -typedef struct -{ - long _vers; -} gpgrt_lock_t; - -#define GPGRT_LOCK_INITIALIZER {-1} -## -## Local Variables: -## mode: c -## buffer-read-only: t -## End: -## 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: +##