add --enable-static so we always build static libs. fixes #153807

(Portage version: 2.1.2_rc1-r1)

3 files changed, 98 insertions, 1 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 6cd4d19b1f6b..4e70f0a27cf1 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.219 2006/10/24 08:03:24 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.220 2006/11/03 03:01:48 allanonjl Exp $
+
+*glib-2.12.4-r1 (03 Nov 2006)
+
+  03 Nov 2006; John N. Laliberte <allanonjl@gentoo.org> -glib-2.12.0.ebuild,
+  -glib-2.12.1.ebuild, -glib-2.12.2.ebuild, -glib-2.12.3.ebuild,
+  -glib-2.12.4.ebuild, +glib-2.12.4-r1.ebuild:
+  add --enable-static so we always build static libs.  fixes #153807
 
   24 Oct 2006; Roy Marples <uberlord@gentoo.org> glib-2.12.4.ebuild:
   Added ~sparc-fbsd keyword.
diff --git a/dev-libs/glib/files/digest-glib-2.12.4-r1 b/dev-libs/glib/files/digest-glib-2.12.4-r1
new file mode 100644
index 000000000000..9aa38dd02ea3
--- /dev/null
+++ b/dev-libs/glib/files/digest-glib-2.12.4-r1
@@ -0,0 +1,3 @@
+MD5 ef7b9595fa788e245a0f883bddba8a25 glib-2.12.4.tar.bz2 2868828
+RMD160 3aac5f23cedcef25f7fd7acb6d4ebfa744e38edc glib-2.12.4.tar.bz2 2868828
+SHA256 1b1a0dc746a07c67aad15e22e3d751c3e7068c889d171efb1ab45efbab87c75d glib-2.12.4.tar.bz2 2868828
diff --git a/dev-libs/glib/glib-2.12.4-r1.ebuild b/dev-libs/glib/glib-2.12.4-r1.ebuild
new file mode 100644
index 000000000000..074c69e81af6
--- /dev/null
+++ b/dev-libs/glib/glib-2.12.4-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.12.4-r1.ebuild,v 1.1 2006/11/03 03:01:48 allanonjl Exp $
+
+inherit gnome.org libtool eutils flag-o-matic debug
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="debug doc hardened"
+
+RDEPEND="virtual/libc
+	virtual/libiconv"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.14
+	>=sys-devel/gettext-0.11
+	doc?	(
+				>=dev-util/gtk-doc-1.4
+				~app-text/docbook-xml-dtd-4.1.2
+			)"
+
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	if use ppc64 && use hardened ; then
+		replace-flags -O[2-3] -O1
+		epatch "${FILESDIR}"/glib-2.6.3-testglib-ssp.patch
+	fi
+
+	if use ia64; then
+		# Only apply for < 4.1
+		local major=$(gcc-major-version)
+		local minor=$(gcc-minor-version)
+		if (( major < 4 || ( major == 4 && minor == 0 ) )); then
+			epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
+		fi
+	fi
+
+	epatch "${FILESDIR}/${PN}-2.8.3-macos.patch"
+
+	# Fix build for FreeBSD. These will be included in 2.12.5
+	epatch "${FILESDIR}/${P}-gtimer-fix.patch"
+	epatch "${FILESDIR}/${P}-tests_pthread.patch"
+}
+
+src_compile() {
+	epunt_cxx
+	elibtoolize
+
+	local myconf
+
+	# Building with --disable-debug highly unrecommended.  It will build glib in
+	# an unusable form as it disables some commonly used API.  Please do not
+	# convert this to the use_enable form, as it results in a broken build.
+	# -- compnerd (3/27/06)
+	use debug && myconf="--enable-debug"
+
+	# always build static libs, see #153807
+	econf \
+		$(use_enable doc gtk-doc) \
+		${myconf} \
+		--with-threads=posix \
+		--enable-static || die "configure failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Installation failed"
+
+	# Do not install charset.alias even if generated, leave it tol libiconv
+	rm -f ${D}/usr/lib/charset.alias
+
+	# Consider invalid UTF-8 filenames as locale-specific.
+	# TODO :: Eventually get rid of G_BROKEN_FILENAMES
+	dodir /etc/env.d
+	echo "G_BROKEN_FILENAMES=1" > ${D}/etc/env.d/50glib2
+	echo "G_FILENAME_ENCODING=UTF-8" >> ${D}/etc/env.d/50glib2
+
+	dodoc AUTHORS ChangeLog* NEWS* README
+}