[tor-commits] [tor-browser-build/master] Bug 31465: Set proper MACOSX_DEPLOYMENT_TARGET for tor and libevent

[gk at torproject.org]

commit 4c6a14cd4d4cbd539302264d9cc9228a0f2b6074
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Aug 20 08:37:38 2019 +0000

    Bug 31465: Set proper MACOSX_DEPLOYMENT_TARGET for tor and libevent
---
 projects/libevent/build | 3 +++
 projects/tor/build      | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/projects/libevent/build b/projects/libevent/build
index 00ee78c..0ec76b6 100644
--- a/projects/libevent/build
+++ b/projects/libevent/build
@@ -7,6 +7,9 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
 cd /var/tmp/build/[% project %]-[% c('version') %]
 [% IF c("var/osx") -%]
   patch -p1 < $rootdir/autotools-openssl-mac.patch
+  # Setting this after `configure` but before `make` might be enough, but let's
+  # not bet on that and just set it here.
+  export MACOSX_DEPLOYMENT_TARGET=10.9
 [% END -%]
 ./autogen.sh
 ./configure --disable-static [% c("var/configure_opt") %] --prefix=$distdir
diff --git a/projects/tor/build b/projects/tor/build
index 8c8ed45..8737716 100644
--- a/projects/tor/build
+++ b/projects/tor/build
@@ -72,6 +72,8 @@ openssldir=/var/tmp/dist/openssl
 
 [% IF c("var/osx") %]
   cp $libeventdir/lib/libevent-*.dylib $TORBINDIR/
+  # The target version needs to be set before the configure step.
+  export MACOSX_DEPLOYMENT_TARGET=10.9
 [% END %]
 
 cd /var/tmp/build/[% project %]-[% c('version') %]