Skip to content

Commit cf7b87c

Browse files
authored
Merge pull request #212664 from Homebrew/makensis-3.11
makensis 3.11
2 parents a9b0c88 + cbad737 commit cf7b87c

File tree

1 file changed

+22
-13
lines changed

1 file changed

+22
-13
lines changed

Formula/m/makensis.rb

+22-13
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
class Makensis < Formula
22
desc "System to create Windows installers"
33
homepage "https://nsis.sourceforge.net/"
4-
url "https://downloads.sourceforge.net/project/nsis/NSIS%203/3.10/nsis-3.10-src.tar.bz2"
5-
sha256 "11b54a6307ab46fef505b2700aaf6f62847c25aa6eebaf2ae0aab2f17f0cb297"
4+
url "https://downloads.sourceforge.net/project/nsis/NSIS%203/3.11/nsis-3.11-src.tar.bz2"
5+
sha256 "19e72062676ebdc67c11dc032ba80b979cdbffd3886c60b04bb442cdd401ff4b"
66
license "Zlib"
77

88
bottle do
9-
sha256 cellar: :any_skip_relocation, arm64_sequoia: "d5198ddb8f17e70b6804b1622d67d2c754b836b7e16f8cd44b0a22a639e3e82e"
10-
sha256 cellar: :any_skip_relocation, arm64_sonoma: "c74338c424627cfab6d21fa5d3ce53bc39d641f10b0a3150322943e32c422b35"
11-
sha256 cellar: :any_skip_relocation, arm64_ventura: "fe5df7005bbb4cf75e23485a9810b3c8e5139441db9442dc2022216a0b019d4f"
12-
sha256 cellar: :any_skip_relocation, arm64_monterey: "ccbda3098670472ecc0c5fa2d1e364b49ce361fb642d3ec13b88f31a23ee8740"
13-
sha256 cellar: :any_skip_relocation, sonoma: "fc8db0474581a68a3393de4494c79f738cfcf7fdbd293e7be373196139b21656"
14-
sha256 cellar: :any_skip_relocation, ventura: "241bfaef69832fed9d6200be45bb05608750180702697c261a1eea6db3606a7f"
15-
sha256 cellar: :any_skip_relocation, monterey: "087967b7c39a1e0c6ddb70c197bc9ccc0bcce13fa52190e0f7ec87ca8511dafd"
16-
sha256 cellar: :any_skip_relocation, x86_64_linux: "5fd35ae601106c7530eb53aaf72dcb3bf3553ec52b19e33e2f6944aec8481b3f"
9+
sha256 cellar: :any_skip_relocation, arm64_sequoia: "edd2d0dcc5ca368334522b123210e7d9d3336efc5e0091f12500fa02a8e304d8"
10+
sha256 cellar: :any_skip_relocation, arm64_sonoma: "065f088b4c9681f571c8e73b76bcd730ac34b5ab86ac011707d31b28479b8533"
11+
sha256 cellar: :any_skip_relocation, arm64_ventura: "71dd1af5b0c2c9a040bac2d58965ba3141dbb2c23a95f36d7ad7fb2b2e1b40fa"
12+
sha256 cellar: :any_skip_relocation, sonoma: "985171f35c2c617499f333b4926367ee656660b85e9a83c045a691633e1af9d1"
13+
sha256 cellar: :any_skip_relocation, ventura: "b41b708bb2a20b5f006d3123070d7a9d16c02796201a86fa5456b7673a299994"
14+
sha256 cellar: :any_skip_relocation, x86_64_linux: "2c8e1672901d8376fcbcc0579302f0338629852fde0a262cdab694613fe89785"
1715
end
1816

1917
depends_on "mingw-w64" => :build
@@ -22,11 +20,20 @@ class Makensis < Formula
2220
uses_from_macos "zlib"
2321

2422
resource "nsis" do
25-
url "https://downloads.sourceforge.net/project/nsis/NSIS%203/3.09/nsis-3.09.zip"
26-
sha256 "f5dc52eef1f3884230520199bac6f36b82d643d86b003ce51bd24b05c6ba7c91"
23+
url "https://downloads.sourceforge.net/project/nsis/NSIS%203/3.11/nsis-3.11.zip"
24+
sha256 "c7d27f780ddb6cffb4730138cd1591e841f4b7edb155856901cdf5f214394fa1"
25+
26+
livecheck do
27+
formula :parent
28+
end
2729
end
2830

2931
def install
32+
if OS.linux?
33+
ENV.append_to_cflags "-I#{Formula["zlib"].opt_include}"
34+
ENV.append "LDFLAGS", "-Wl,-rpath,#{rpath}"
35+
end
36+
3037
args = [
3138
"CC=#{ENV.cc}",
3239
"CXX=#{ENV.cxx}",
@@ -36,8 +43,10 @@ def install
3643
# Don't strip, see https://github.com/Homebrew/homebrew/issues/28718
3744
"STRIP=0",
3845
"VERSION=#{version}",
46+
# Scons dependency disables superenv in brew
47+
"APPEND_CCFLAGS=#{ENV.cflags}",
48+
"APPEND_LINKFLAGS=#{ENV.ldflags}",
3949
]
40-
args << "APPEND_LINKFLAGS=-Wl,-rpath,#{rpath}" if OS.linux?
4150

4251
system "scons", "makensis", *args
4352
bin.install "build/urelease/makensis/makensis"

0 commit comments

Comments
 (0)