Skip to content
This repository
Browse code

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>
  • Loading branch information...
commit 27163b399471f613aaacb2d39b1d20468530671e 1 parent 9d905be
Jack Nagel authored October 20, 2012

Showing 1 changed file with 6 additions and 5 deletions. Show diff stats Hide diff stats

  1. 11  Library/Formula/gettext.rb
11  Library/Formula/gettext.rb
@@ -34,12 +34,13 @@ def install
34 34
     ENV.libxml2
35 35
     ENV.universal_binary if build.universal?
36 36
 
37  
-    system "./configure", "--disable-dependency-tracking", "--disable-debug",
  37
+    system "./configure", "--disable-dependency-tracking",
  38
+                          "--disable-debug",
38 39
                           "--prefix=#{prefix}",
39  
-                          "--without-included-gettext",
40  
-                          "--without-included-glib",
41  
-                          "--without-included-libcroco",
42  
-                          "--without-included-libxml",
  40
+                          "--with-included-gettext",
  41
+                          "--with-included-glib",
  42
+                          "--with-included-libcroco",
  43
+                          "--with-included-libunistring",
43 44
                           "--without-emacs",
44 45
                           # Don't use VCS systems to create these archives
45 46
                           "--without-git",

0 notes on commit 27163b3

Please sign in to comment.
Something went wrong with that request. Please try again.