Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Grpc
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tci-gateway-module
Grpc
Commits
db327704
Commit
db327704
authored
Apr 13, 2017
by
Muxi Yan
Browse files
Options
Downloads
Patches
Plain Diff
Fix modulemap redefinition
parent
7f2a15a6
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/objective-c/BoringSSL.podspec
+3
-3
3 additions, 3 deletions
src/objective-c/BoringSSL.podspec
with
3 additions
and
3 deletions
src/objective-c/BoringSSL.podspec
+
3
−
3
View file @
db327704
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
Pod
::
Spec
.
new
do
|
s
|
Pod
::
Spec
.
new
do
|
s
|
s
.
name
=
'BoringSSL'
s
.
name
=
'BoringSSL'
version
=
'8.
0
'
version
=
'8.
1
'
s
.
version
=
version
s
.
version
=
version
s
.
summary
=
'BoringSSL is a fork of OpenSSL that is designed to meet Google’s needs.'
s
.
summary
=
'BoringSSL is a fork of OpenSSL that is designed to meet Google’s needs.'
# Adapted from the homepage:
# Adapted from the homepage:
...
@@ -95,7 +95,7 @@ Pod::Spec.new do |s|
...
@@ -95,7 +95,7 @@ Pod::Spec.new do |s|
# The module map and umbrella header created automatically by Cocoapods don't work for C libraries
# The module map and umbrella header created automatically by Cocoapods don't work for C libraries
# like this one. The following file, and a correct umbrella header, are created on the fly by the
# like this one. The following file, and a correct umbrella header, are created on the fly by the
# `prepare_command` of this pod.
# `prepare_command` of this pod.
s
.
module_map
=
'include/openssl/
module
.modulemap'
s
.
module_map
=
'include/openssl/
BoringSSL
.modulemap'
# We don't need to inhibit all warnings; only -Wno-shorten-64-to-32. But Cocoapods' linter doesn't
# We don't need to inhibit all warnings; only -Wno-shorten-64-to-32. But Cocoapods' linter doesn't
# want that for some reason.
# want that for some reason.
...
@@ -186,7 +186,7 @@ Pod::Spec.new do |s|
...
@@ -186,7 +186,7 @@ Pod::Spec.new do |s|
#include "x509.h"
#include "x509.h"
#include "x509v3.h"
#include "x509v3.h"
EOF
EOF
cat > include/openssl/
module
.modulemap <<EOF
cat > include/openssl/
BoringSSL
.modulemap <<EOF
framework module openssl {
framework module openssl {
umbrella header "umbrella.h"
umbrella header "umbrella.h"
export *
export *
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment