diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-03-09 21:37:09 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-03-09 22:11:54 +0530 |
| commit | 9de66c6fb6d52e79329261ebce86b3d2db3708da (patch) | |
| tree | 49867f3d9317b4afa23bf1f1ad95ff414128beb0 /recipes/openssl | |
| parent | 6c7cb6fc63e728543e3392cedfe3b45b4a6ba1e9 (diff) | |
openssl.recipe: Fix build on macos and ios
CFLAGS cannot be passed to Configure because it detects -arch x86_64
as a target directive and errors out. We also can't rely on CFLAG
passing it everywhere, so we have to set it with CC.
This also means we don't need the patch that adds support for
detecting -isysroot, etc, since those should always be passed
correctly now.
Diffstat (limited to 'recipes/openssl')
| -rw-r--r-- | recipes/openssl/0001-Configure-add-support-for-sysroot-isysroot-isystem.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/recipes/openssl/0001-Configure-add-support-for-sysroot-isysroot-isystem.patch b/recipes/openssl/0001-Configure-add-support-for-sysroot-isysroot-isystem.patch deleted file mode 100644 index 4e791e89..00000000 --- a/recipes/openssl/0001-Configure-add-support-for-sysroot-isysroot-isystem.patch +++ /dev/null @@ -1,51 +0,0 @@ -From fe6af0f9c448ad7c1e2c3ab777079e38b4a8e34c Mon Sep 17 00:00:00 2001 -From: Matthew Waters <matthew@centricular.com> -Date: Thu, 22 Feb 2018 21:59:33 +1100 -Subject: [PATCH] Configure: add support for --sysroot/-isysroot/-isystem - ---- - Configure | 28 ++++++++++++++++++++++++++++ - 1 file changed, 28 insertions(+) - -diff --git a/Configure b/Configure -index d644963..933dd91 100755 ---- a/Configure -+++ b/Configure -@@ -678,6 +678,34 @@ while (@argvcopy) - $config{fips} = 1; - $nofipscanistercheck = 1; - } -+ elsif (/^--sysroot=(.*)$/) -+ { -+ $_ =~ s/%([0-9a-f]{1,2})/chr(hex($1))/gei; -+ $user_cflags.=" --sysroot=".$1; -+ } -+ elsif (/^--sysroot$/) -+ { -+ my $sysroot = shift(@argvcopy) || ""; -+ $user_cflags.=" --sysroot ".$sysroot; -+ } -+ elsif (/^-isysroot=(.*)$/) -+ { -+ $user_cflags.=" -isysroot=".$1; -+ } -+ elsif (/^-isysroot$/) -+ { -+ my $isysroot = shift(@argvcopy) || ""; -+ $user_cflags.=" -isysroot ".$isysroot; -+ } -+ elsif (/^-isystem=(.*)$/) -+ { -+ $user_cflags.=" -isystem=".$1; -+ } -+ elsif (/^-isystem$/) -+ { -+ my $isystem = shift(@argvcopy) || ""; -+ $user_cflags.=" -isystem ".$isystem; -+ } - elsif (/^[-+]/) - { - if (/^--prefix=(.*)$/) --- -2.16.1 - |