gettext: always use bundled libraries

We have been explicitly passing "--without-included-glib", etc. to the
but this doesn't make sense: the flag does not mean "don't use glib at
all", it means "don't use the bundled glib", which means "use an
external copy of glib if one exists, but otherwise fall back to the
included version anyway".

This can lead to subtle breakage: if a user has installed glib, and then
gettext is built from source, gettext will link to the external glib.
When the user goes to upgrade glib the next time around, the build will
fail when it tries to use the now broken gettext binaries.

So in most cases, our gettext formula has been using these bundled
libraries anyway. The most obvious case is the bottles, which do not
have external linkage to glib, libunistring, etc.

In order to cover all cases, _always_ build with the included libraries.

There is no need to rebuild the bottles for these changes, as they are
correct already.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
master
Jack Nagel 2012-10-20 16:53:17 -05:00
parent fb8a113bcd
commit 8d72b8ddcc
1 changed files with 6 additions and 5 deletions

View File

@ -34,12 +34,13 @@ class Gettext < Formula
ENV.libxml2
ENV.universal_binary if build.universal?
system "./configure", "--disable-dependency-tracking", "--disable-debug",
system "./configure", "--disable-dependency-tracking",
"--disable-debug",
"--prefix=#{prefix}",
"--without-included-gettext",
"--without-included-glib",
"--without-included-libcroco",
"--without-included-libxml",
"--with-included-gettext",
"--with-included-glib",
"--with-included-libcroco",
"--with-included-libunistring",
"--without-emacs",
# Don't use VCS systems to create these archives
"--without-git",