From f95579d268719b701d2150fea025cdbbe21a0e45 Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Fri, 17 Aug 2012 08:12:49 -0700 Subject: [PATCH] glib: Ensure only static build is performed Since we're going to use glib as a convenience library, we need to make sure it builds as if --enable-static was passed. This only matters on Windows where a couple extra macros are defined and the DLL machinery is disabled. --- glib-patches/patchlist | 1 + glib-patches/static-only.patch | 13 +++++++++++++ glib/configure.ac | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 glib-patches/static-only.patch diff --git a/glib-patches/patchlist b/glib-patches/patchlist index e324cbb..e539292 100644 --- a/glib-patches/patchlist +++ b/glib-patches/patchlist @@ -4,3 +4,4 @@ foreign-automake.patch no-gregex.patch no-pkg-config.patch cross-compiling.patch +static-only.patch diff --git a/glib-patches/static-only.patch b/glib-patches/static-only.patch new file mode 100644 index 0000000..6148bd2 --- /dev/null +++ b/glib-patches/static-only.patch @@ -0,0 +1,13 @@ +diff --git a/glib/configure.ac b/glib/configure.ac +index 160f57d..a78d516 100644 +--- a/glib/configure.ac ++++ b/glib/configure.ac +@@ -498,7 +498,7 @@ esac + + dnl Initialize libtool + LT_PREREQ([2.2]) +-LT_INIT([disable-static win32-dll]) ++LT_INIT([disable-shared win32-dll]) + dnl when using libtool 2.x create libtool early, because it's used in configure + m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) + diff --git a/glib/configure.ac b/glib/configure.ac index 160f57d..a78d516 100644 --- a/glib/configure.ac +++ b/glib/configure.ac @@ -498,7 +498,7 @@ esac dnl Initialize libtool LT_PREREQ([2.2]) -LT_INIT([disable-static win32-dll]) +LT_INIT([disable-shared win32-dll]) dnl when using libtool 2.x create libtool early, because it's used in configure m4_ifdef([LT_OUTPUT], [LT_OUTPUT])