Skip to content

Commit

Permalink
Replace libz link dependency with a reference to an external source p…
Browse files Browse the repository at this point in the history
…ackage.
  • Loading branch information
timburks committed Jun 7, 2017
1 parent fb0053a commit b75af16
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Examples/Datastore/PackageManager/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import PackageDescription
let package = Package (
name: "Datastore",
dependencies: [
.Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,1,10)),
.Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,1,12)),
.Package(url: "https://github.com/apple/swift-protobuf.git", Version(0,9,901)),
]
)
4 changes: 1 addition & 3 deletions Examples/Echo/PackageManager/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@

LDFLAGS = -Xlinker -lz

all:
swift build -v $(LDFLAGS)
swift build

clean :
rm -rf Packages
Expand Down
2 changes: 1 addition & 1 deletion Examples/Echo/PackageManager/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import PackageDescription
let package = Package (
name: "Echo",
dependencies: [
.Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,1,10)),
.Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,1,12)),
.Package(url: "https://github.com/apple/swift-protobuf.git", Version(0,9,903)),
]
)
2 changes: 1 addition & 1 deletion Examples/Simple/PackageManager/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ import PackageDescription
let package = Package (
name: "Simple",
dependencies: [
.Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,1,10)),
.Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,1,12)),
]
)
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

CFLAGS = -Xcc -ISources/BoringSSL/include

LDFLAGS = -Xlinker -lz
#LDFLAGS = -Xlinker -lz

all:
swift package generate-xcodeproj
Expand Down
3 changes: 3 additions & 0 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,8 @@ let package = Package(
dependencies: ["CgRPC"]),
Target(name: "CgRPC",
dependencies: ["BoringSSL"]),
],
dependencies: [
.Package(url: "https://github.com/Zewo/zlib.git", majorVersion: 0, minor: 4),
]
)

0 comments on commit b75af16

Please sign in to comment.