commit 759530f06f060934ef8917745eeddd31ef8155cc Author: Nicolas Vigier boklm@torproject.org Date: Wed Oct 28 01:05:35 2015 +0100

libgpg-error: fix OSX lock-obj-pub headers --- 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, 19 insertions(+), 30 deletions(-)

diff --git a/projects/libgpg-error/build b/projects/libgpg-error/build index 5df344e..f650c2e 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-darwin14.0.0.h src/syscfg/lock-obj-pub.darwin10.h +cp $rootdir/lock-obj-pub.x86_64-apple-darwin10.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 a5ca6f6..48c10be 100644 --- a/projects/libgpg-error/config +++ b/projects/libgpg-error/config @@ -20,7 +20,7 @@ input_files: sig_ext: sig file_gpg_id: 1 gpg_keyring: libgcrypt.gpg - - filename: lock-obj-pub.x86_64-apple-darwin14.0.0.h + - filename: lock-obj-pub.x86_64-apple-darwin10.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 new file mode 100644 index 0000000..4d3c5fe --- /dev/null +++ b/projects/libgpg-error/lock-obj-pub.x86_64-apple-darwin10.h @@ -0,0 +1,17 @@ +## 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 deleted file mode 100644 index 3e3ccb2..0000000 --- a/projects/libgpg-error/lock-obj-pub.x86_64-apple-darwin14.0.0.h +++ /dev/null @@ -1,28 +0,0 @@ -## 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: -##