Unverified Commit 3b5038d9 authored by Georg Koppen's avatar Georg Koppen Committed by boklm
Browse files

Bug 24632: Adapt tor and OpenSSL for new macOS toolchain

parent 7997d232

projects/openssl/build

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ export CC='gcc -m32' 
[% END %]

[% IF c("var/osx") -%]

  # Tricking OpenSSL into using our clang as cross-compiler

  ln -s $clangdir/bin/clang $clangdir/bin/x86_64-apple-darwin10-cc

  ln -s $clangdir/bin/clang $clangdir/bin/x86_64-apple-darwin11-cc

  export CC="cc [% c("var/FLAGS") %]"

[% END -%]

./Configure --prefix=$distdir [% c('var/configure_opts') %]

projects/openssl/config

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ targets: 
      configure_opts: '-shared --cross-compile-prefix=[% c("arch") %]-w64-mingw32- mingw[% IF c("var/windows-x86_64") %]64[% END %] "[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]"'

  osx-x86_64:

    var:

      configure_opts: --cross-compile-prefix=x86_64-apple-darwin10- darwin64-x86_64-cc enable-ec_nistp_64_gcc_128

      configure_opts: --cross-compile-prefix=x86_64-apple-darwin11- darwin64-x86_64-cc enable-ec_nistp_64_gcc_128



input_files:

  - project: container-image

projects/tor/build

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ cp $distdir/share/tor/geoip6 $TORCONFIGDIR 
  cd $distdir

  cp bin/tor $TORBINDIR/

  cd $TORBINDIR/

  x86_64-apple-darwin10-install_name_tool -change $libeventdir/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor

  x86_64-apple-darwin11-install_name_tool -change $libeventdir/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor

[% END %]



cd $distdir