wbrawner/homebrew-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kore: El Capitan fixes

Browse source 
Currently the test (including outside Homebrew) fails because it can't find
our OpenSSL outside of the build due to not "remembering" the path, and
also doesn't respect user CFLAGS, so this is currently broken pretty nicely
for El Cap users. This should fix it.

Also fixes for Homebrew users who haven't placed their Homebrew in the
default prefix.

Closes #1182.

Signed-off-by: Dominyk Tiller <dominyktiller@gmail.com>
This commit is contained in:
Dominyk Tiller 2016-05-15 18:00:26 +01:00
parent e0e0672e38
commit 37e2f71191
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Formula/kore.rb
View file

@ -1,11 +1,25 @@
class Kore < Formula
desc "Web application framework for writing web APIs in C"
homepage "https://kore.io/"
url "https://kore.io/release/kore-1.2.3-release.tgz"
sha256 "24f1a88f4ef3199d6585f821e1ef134bb448a1c9409a76d18fcccd4af940d32f"
revision 1
head "https://github.com/jorisvink/kore.git"
stable do
url "https://kore.io/release/kore-1.2.3-release.tgz"
sha256 "24f1a88f4ef3199d6585f821e1ef134bb448a1c9409a76d18fcccd4af940d32f"
# 1.2.3 release doesn't respect user-passed CFLAGS nor does it store
# information on where the OpenSSL headers used during build reside.
# On El Capitan this results in `kore build test` failing.
# Backport of https://github.com/jorisvink/kore/commit/4dff0b57ae6ed113d15b
# https://github.com/jorisvink/kore/issues/70
patch do
url "https://raw.githubusercontent.com/Homebrew/patches/c86b133e2c137cd/kore/123findssl.diff"
sha256 "70751661705993deab7d47c5505666738477f44f5b5bc1399b0ed9f30ebad6ec"
end
end
bottle do
sha256 "acdd632ceba6698b1a52292a1f58f7b7adaefa6a677d138c3f16a1fb3ddd19e1" => :el_capitan
sha256 "cba37916c300a8c35d9dab23dabdd2de0abb7eef560fa4f8328195f5543854fa" => :yosemite
@ -17,6 +31,14 @@ class Kore < Formula
depends_on "postgresql" => :optional
def install
# Ensure make finds our OpenSSL when Homebrew isn't in /usr/local.
# Current Makefile hardcodes paths for default MacPorts/Homebrew.
ENV.prepend "CFLAGS", "-I#{Formula["openssl"].opt_include}"
ENV.prepend "LDFLAGS", "-L#{Formula["openssl"].opt_lib}"
# Also hardcoded paths in src/cli.c at compile.
inreplace "src/cli.c", "/usr/local/opt/openssl/include",
Formula["openssl"].opt_include
args = []
args << "PGSQL=1" if build.with? "postgresql"