Skip to content
This repository has been archived by the owner on Jul 4, 2023. It is now read-only.

ICU4C should leave the keg-only status. #15377

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
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
5 changes: 1 addition & 4 deletions Library/Formula/boost.rb
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -71,10 +71,7 @@ def install
# we specify libdir too because the script is apparently broken # we specify libdir too because the script is apparently broken
bargs = ["--prefix=#{prefix}", "--libdir=#{lib}"] bargs = ["--prefix=#{prefix}", "--libdir=#{lib}"]


if build.include? 'with-icu' unless build.include? 'with-icu'
icu4c_prefix = Formula.factory('icu4c').opt_prefix
bargs << "--with-icu=#{icu4c_prefix}"
else
bargs << '--without-icu' bargs << '--without-icu'
end end


Expand Down
5 changes: 1 addition & 4 deletions Library/Formula/boost149.rb
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -49,10 +49,7 @@ def install
# we specify libdir too because the script is apparently broken # we specify libdir too because the script is apparently broken
bargs = ["--prefix=#{prefix}", "--libdir=#{lib}"] bargs = ["--prefix=#{prefix}", "--libdir=#{lib}"]


if build.include? 'with-icu' unless build.include? 'with-icu'
icu4c_prefix = Formula.factory('icu4c').opt_prefix
bargs << "--with-icu=#{icu4c_prefix}"
else
bargs << '--without-icu' bargs << '--without-icu'
end end


Expand Down
5 changes: 2 additions & 3 deletions Library/Formula/dwdiff.rb
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ class Dwdiff < Formula


def install def install
gettext = Formula.factory('gettext') gettext = Formula.factory('gettext')
icu4c = Formula.factory('icu4c') ENV.append "CFLAGS", "-I#{gettext.include}"
ENV.append "CFLAGS", "-I#{gettext.include} -I#{icu4c.include}" ENV.append "LDFLAGS", "-L#{gettext.lib}"
ENV.append "LDFLAGS", "-L#{gettext.lib} -L#{icu4c.lib}"
system "./configure", "--prefix=#{prefix}" system "./configure", "--prefix=#{prefix}"
system "make install" system "make install"


Expand Down
3 changes: 0 additions & 3 deletions Library/Formula/mapnik.rb
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ class Mapnik < Formula
end end


def install def install
icu = Formula.factory("icu4c")
# mapnik compiles can take ~1.5 GB per job for some .cpp files # mapnik compiles can take ~1.5 GB per job for some .cpp files
# so lets be cautious by limiting to CPUS/2 # so lets be cautious by limiting to CPUS/2
jobs = ENV.make_jobs jobs = ENV.make_jobs
Expand All @@ -40,8 +39,6 @@ def install
"CXX=\"#{ENV.cxx}\"", "CXX=\"#{ENV.cxx}\"",
"JOBS=#{jobs}", "JOBS=#{jobs}",
"PREFIX=#{prefix}", "PREFIX=#{prefix}",
"ICU_INCLUDES=#{icu.include}",
"ICU_LIBS=#{icu.lib}",
"PYTHON_PREFIX=#{prefix}" # Install to Homebrew's site-packages "PYTHON_PREFIX=#{prefix}" # Install to Homebrew's site-packages
system "python", system "python",
"scons/scons.py", "scons/scons.py",
Expand Down
11 changes: 11 additions & 0 deletions Library/Formula/yaz.rb
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -8,6 +8,17 @@ class Yaz < Formula
depends_on 'pkg-config' => :build depends_on 'pkg-config' => :build


def install def install
# Both libxml2 2.7.3 and icu are defined the same data type `UChar'.
ENV.append_to_cflags "-Wno-typedef-redefinition" if ENV.compiler == :clang

if (ENV.compiler == :gcc or ENV.compiler == :llvm) and build.include? "env=std"
opoo <<-EOS.undent
GCC and LLVM-GCC can't build with icu and system's libxml together.
If you have request about this and have Clang, you can compile it with:
brew install yaz --env=std --use-clang
EOS
end

system "./configure", "--disable-dependency-tracking", system "./configure", "--disable-dependency-tracking",
"--prefix=#{prefix}", "--prefix=#{prefix}",
"--with-xml2" "--with-xml2"
Expand Down