Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions libexec/package.rb
Original file line number Diff line number Diff line change
Expand Up @@ -211,15 +211,17 @@ def build_zlib
def build_ncurses_and_libedit
ncurses_source = extract_source("ncurses", @deps.fetch("ncurses"))
ncurses = dep_prefix("ncurses")
ncurses_env = dependency_build_env
ncurses_pkgconfig = File.join(ncurses, "lib", "pkgconfig")
FileUtils.mkdir_p(ncurses_pkgconfig)
ncurses_env = dependency_build_env("PKG_CONFIG_LIBDIR" => ncurses_pkgconfig)
run "./configure",
"--disable-dependency-tracking",
"--prefix=#{ncurses}",
"--enable-static",
"--disable-shared",
"--without-cxx-binding",
"--enable-pc-files",
"--with-pkg-config-libdir=#{File.join(ncurses, "lib", "pkgconfig")}",
"--with-pkg-config-libdir=#{ncurses_pkgconfig}",
"--enable-sigwinch",
"--enable-symlinks",
"--enable-widec",
Expand Down Expand Up @@ -391,14 +393,24 @@ def build_matching_baseruby!

source = extract_source("baseruby", @ruby_recipe)
prefix = File.join(@build_root, "baseruby")
env = build_env("BASERUBY" => bootstrap, "LC_ALL" => "C.UTF-8", "LANG" => "C.UTF-8")
env = dependency_build_env(
"BASERUBY" => bootstrap,
"LC_ALL" => "C.UTF-8",
"LANG" => "C.UTF-8",
"PKG_CONFIG_PATH" => [
File.join(dep_prefix("libyaml"), "lib", "pkgconfig"),
File.join(dep_prefix("zlib"), "lib", "pkgconfig")
].join(File::PATH_SEPARATOR)
)
args = [
"--prefix=#{prefix}",
"--disable-install-doc",
"--disable-dependency-tracking",
"--with-baseruby=#{bootstrap}",
"--with-libyaml-dir=#{dep_prefix("libyaml")}",
"--with-zlib-dir=#{dep_prefix("zlib")}",
"--without-gmp",
"--with-out-ext=win32,win32ole,openssl,psych,zlib,readline,fiddle"
"--with-out-ext=win32,win32ole,openssl,readline,fiddle"
]
args << "MKDIR_P=/bin/mkdir -p" if linux?

Expand Down