diff options
| author | Howard Chu <hyc@symas.com> | 2020-12-09 02:03:46 +0000 |
|---|---|---|
| committer | Howard Chu <hyc@symas.com> | 2020-12-09 19:21:56 +0000 |
| commit | 5b30203fe956990e9cf0fa7ad5a280b88b7683e8 (patch) | |
| tree | aee38547bcab9612e9a8eda24af9919eef5c40e8 /contrib/depends/patches/openssl/fix_arflags.patch | |
| parent | Merge pull request #7072 (diff) | |
| download | monero-5b30203fe956990e9cf0fa7ad5a280b88b7683e8.tar.xz | |
depends: Update OpenSSL to 1.1.1i
Remove some obsolete patches (they were integrated upstream).
Tweak to work with Android support (they second-guess our CC definition, etc).
Diffstat (limited to '')
| -rw-r--r-- | contrib/depends/patches/openssl/fix_arflags.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/contrib/depends/patches/openssl/fix_arflags.patch b/contrib/depends/patches/openssl/fix_arflags.patch deleted file mode 100644 index 2d2900d80..000000000 --- a/contrib/depends/patches/openssl/fix_arflags.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- Makefile.org.O 2019-02-26 14:20:20.000000000 +0000 -+++ Makefile.org 2019-11-15 13:05:54.370086856 +0000 -@@ -63,8 +63,8 @@ - PEX_LIBS= - EX_LIBS= - EXE_EXT= --ARFLAGS= --AR=ar $(ARFLAGS) r -+ARFLAGS= r -+AR=ar $(ARFLAGS) - RANLIB= ranlib - RC= windres - NM= nm ---- Configure.O 2019-02-26 14:20:20.000000000 +0000 -+++ Configure 2019-11-16 07:43:14.933990774 +0000 -@@ -1251,7 +1251,7 @@ - my $shared_extension = $fields[$idx_shared_extension]; - my $ranlib = $ENV{'RANLIB'} || $fields[$idx_ranlib]; - my $ar = $ENV{'AR'} || "ar"; --my $arflags = $fields[$idx_arflags]; -+my $arflags = $ENV{'ARFLAGS'} || $fields[$idx_arflags]; - my $windres = $ENV{'RC'} || $ENV{'WINDRES'} || "windres"; - my $multilib = $fields[$idx_multilib]; - |