From: Emanuele Giaquinta Date: Mon, 9 Oct 2006 17:50:05 +0000 (+0000) Subject: Add support for expat-2 to xgettext by linking it at build time rather than X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8e3444ab9ad9f577990d011b98763b103fd44582;p=gentoo.git Add support for expat-2 to xgettext by linking it at build time rather than at runtime using dlopen, bug #146211. Package-Manager: portage-2.1.2_pre2-r7 --- diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog index ceee853516da..06ad9248282a 100644 --- a/sys-devel/gettext/ChangeLog +++ b/sys-devel/gettext/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-devel/gettext # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.127 2006/09/30 17:40:17 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.128 2006/10/09 17:50:05 exg Exp $ + +*gettext-0.15-r1 (09 Oct 2006) + + 09 Oct 2006; Emanuele Giaquinta + +files/gettext-0.15-expat-no-dlopen.patch, +gettext-0.15-r1.ebuild: + Add support for expat-2 to xgettext by linking it at build time rather than + at runtime using dlopen, bug #146211. 30 Sep 2006; Fabian Groffen gettext-0.15.ebuild: Backport fix from prefix. On Darwin don't do library moving, it breaks the diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest index d5675b4a88a4..e1a571bf92f6 100644 --- a/sys-devel/gettext/Manifest +++ b/sys-devel/gettext/Manifest @@ -34,6 +34,10 @@ AUX gettext-0.14.2-no-java-tests.patch 2524 RMD160 447a61b261c08fae6f30ae3f2026e MD5 b56837fdd725fc00c173b57b951b90cc files/gettext-0.14.2-no-java-tests.patch 2524 RMD160 447a61b261c08fae6f30ae3f2026e73f2891d73a files/gettext-0.14.2-no-java-tests.patch 2524 SHA256 3fc3ea40a777e294637f4875f7bd135640c93b25e2f07cbf86c6b4faca19c7e0 files/gettext-0.14.2-no-java-tests.patch 2524 +AUX gettext-0.15-expat-no-dlopen.patch 530 RMD160 bc264c370e29b0176bc6830fe4b489b1ad6d7544 SHA1 8e73314aa18fa70b8452bc995e6d605b42dfb64f SHA256 17cadfe8caedd68d80df4059f64fa1117e27ab111531917b5d4300081cc85e66 +MD5 a295ba7537f41104f82ca57b78546814 files/gettext-0.15-expat-no-dlopen.patch 530 +RMD160 bc264c370e29b0176bc6830fe4b489b1ad6d7544 files/gettext-0.15-expat-no-dlopen.patch 530 +SHA256 17cadfe8caedd68d80df4059f64fa1117e27ab111531917b5d4300081cc85e66 files/gettext-0.15-expat-no-dlopen.patch 530 DIST gettext-0.12.1.tar.gz 5727037 RMD160 6c1736308617e62b265a40cbd1f7f038b9a6bee8 SHA256 95a05acbaaa9c13eb449d438e65e2d75ec78bacffd6f6cd720536465ca3c1583 DIST gettext-0.14.1.tar.gz 6550874 RMD160 7da98c6effeab12c09eaa8f2b2a14ab1571331ee SHA256 41f20c469c7759acb34cfa7e0b3cac9096d59a58ad800e471f07424a8e7adbb7 DIST gettext-0.14.2.tar.gz 6977309 RMD160 1f2f3a8f02fbbec9060bda93628c66b31cefa6c1 SHA256 b9dac74fec09a594be52022547c390a1420fd4d03285aff648680fbfb41e9512 @@ -65,14 +69,18 @@ EBUILD gettext-0.14.6.ebuild 4027 RMD160 51d1d96a5b31fa73a1b8391a87617c2607a58de MD5 ceaf0fc1da75a74c7779f1981158dc48 gettext-0.14.6.ebuild 4027 RMD160 51d1d96a5b31fa73a1b8391a87617c2607a58deb gettext-0.14.6.ebuild 4027 SHA256 53df3dbe7d1777f44f451ab3452e9d53b15e103f8bf9d9292b6826c61404406f gettext-0.14.6.ebuild 4027 +EBUILD gettext-0.15-r1.ebuild 3916 RMD160 2fd8dfae98ac71a62c8eba55e64c0a1ede58c8d6 SHA1 36bfb5b848c9ce9c98a1b140d4e5d29569306d83 SHA256 78ab70e6b28696e430afc02f77fe141086a0dbe1425f6e17b27ac60e6fa6640f +MD5 7dc7c477b5aaa15c14195f8a3673d1b5 gettext-0.15-r1.ebuild 3916 +RMD160 2fd8dfae98ac71a62c8eba55e64c0a1ede58c8d6 gettext-0.15-r1.ebuild 3916 +SHA256 78ab70e6b28696e430afc02f77fe141086a0dbe1425f6e17b27ac60e6fa6640f gettext-0.15-r1.ebuild 3916 EBUILD gettext-0.15.ebuild 3841 RMD160 1e5b7a6e0481f1022afd30705aacfd0408bb6c02 SHA1 2ff5f7af2ff9d1b06f6deba0a5408f623db0f606 SHA256 39208e0656c73266753046b1d6baa28bc18b25cadffd9be6d819f47cf2f091b5 MD5 b9bcbe087a8813e60a368c1924b86335 gettext-0.15.ebuild 3841 RMD160 1e5b7a6e0481f1022afd30705aacfd0408bb6c02 gettext-0.15.ebuild 3841 SHA256 39208e0656c73266753046b1d6baa28bc18b25cadffd9be6d819f47cf2f091b5 gettext-0.15.ebuild 3841 -MISC ChangeLog 15989 RMD160 8d8e6888acb2306eeee09045ea043ee2e6e7cc7e SHA1 d934378168ce373e6dab679ac50a200b4fa5f351 SHA256 567dbb00cc0b315d0e3874534bb2e782eb62484acdb80256ac44a94808a95d79 -MD5 8446152977d89dc176b22a04fd16b5a4 ChangeLog 15989 -RMD160 8d8e6888acb2306eeee09045ea043ee2e6e7cc7e ChangeLog 15989 -SHA256 567dbb00cc0b315d0e3874534bb2e782eb62484acdb80256ac44a94808a95d79 ChangeLog 15989 +MISC ChangeLog 16257 RMD160 fbbfbd257795bb2e6c933eece12c3b374cde23c2 SHA1 9cac698e6561654ec9077bdfc5f968bd13ad7a54 SHA256 e060b7431c678a610d84432ae0b9d169f82128ffc56cbfb1f1557f6295c899d4 +MD5 5974f511befa3c6e942e260b35a27d88 ChangeLog 16257 +RMD160 fbbfbd257795bb2e6c933eece12c3b374cde23c2 ChangeLog 16257 +SHA256 e060b7431c678a610d84432ae0b9d169f82128ffc56cbfb1f1557f6295c899d4 ChangeLog 16257 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 @@ -98,3 +106,6 @@ SHA256 9a79ad652aaf3dd5fa80aa5c25e60304c7ecc28e81a63359f660e474f66e0efc files/di MD5 17d746c8efa5e4286c26bf52fddc47d7 files/digest-gettext-0.15 241 RMD160 a0eac6fb612cbd682123137994a7183beea6aab0 files/digest-gettext-0.15 241 SHA256 1a7a8875b3b7d8011871a3b8a0aeb1ec0a1664e33547b816fe4927865fb47abd files/digest-gettext-0.15 241 +MD5 17d746c8efa5e4286c26bf52fddc47d7 files/digest-gettext-0.15-r1 241 +RMD160 a0eac6fb612cbd682123137994a7183beea6aab0 files/digest-gettext-0.15-r1 241 +SHA256 1a7a8875b3b7d8011871a3b8a0aeb1ec0a1664e33547b816fe4927865fb47abd files/digest-gettext-0.15-r1 241 diff --git a/sys-devel/gettext/files/digest-gettext-0.15-r1 b/sys-devel/gettext/files/digest-gettext-0.15-r1 new file mode 100644 index 000000000000..ab028c6c56a0 --- /dev/null +++ b/sys-devel/gettext/files/digest-gettext-0.15-r1 @@ -0,0 +1,3 @@ +MD5 16bc6e4d37ac3d07495f737a2349a22b gettext-0.15.tar.gz 8081941 +RMD160 e485b60965cf74808801e674c570c7ccd63bd61e gettext-0.15.tar.gz 8081941 +SHA256 178100e9375df74e6569e8ac89790b713476204e27283287e2637d07a5760e08 gettext-0.15.tar.gz 8081941 diff --git a/sys-devel/gettext/files/gettext-0.15-expat-no-dlopen.patch b/sys-devel/gettext/files/gettext-0.15-expat-no-dlopen.patch new file mode 100644 index 000000000000..d2088978eca5 --- /dev/null +++ b/sys-devel/gettext/files/gettext-0.15-expat-no-dlopen.patch @@ -0,0 +1,31 @@ +--- gettext-0.15/gettext-tools/configure.orig 2006-07-21 15:38:28.000000000 +0200 ++++ gettext-0.15/gettext-tools/configure 2006-10-07 01:19:15.295758370 +0200 +@@ -44267,19 +44266,6 @@ + + + +-case "$host_os" in +- linux*) +- +-cat >>confdefs.h <<\_ACEOF +-#define DYNLOAD_LIBEXPAT 1 +-_ACEOF +- +- LIBEXPAT="-ldl" +- LTLIBEXPAT="-ldl" +- +- +- ;; +- *) + + + +@@ -44786,8 +44772,6 @@ + + + +- ;; +-esac + + # If set to t, that means we are running in a shell under Emacs. + # If you have an Emacs named "t", then use the full path. diff --git a/sys-devel/gettext/gettext-0.15-r1.ebuild b/sys-devel/gettext/gettext-0.15-r1.ebuild new file mode 100644 index 000000000000..582454607e75 --- /dev/null +++ b/sys-devel/gettext/gettext-0.15-r1.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.15-r1.ebuild,v 1.1 2006/10/09 17:50:05 exg Exp $ + +inherit flag-o-matic eutils multilib toolchain-funcs mono libtool elisp-common + +DESCRIPTION="GNU locale utilities" +HOMEPAGE="http://www.gnu.org/software/gettext/gettext.html" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="emacs nls doc nocxx" + +DEPEND="virtual/libiconv + dev-libs/expat" + +src_unpack() { + unpack ${A} + cd "${S}" + + epunt_cxx + + epatch "${FILESDIR}"/${PN}-0.14.1-lib-path-tests.patch #81628 + # Fix race, bug #85054 + epatch "${FILESDIR}"/${PN}-0.14.2-fix-race.patch + epatch "${FILESDIR}"/${P}-expat-no-dlopen.patch + + # bundled libtool seems to be broken so skip certain rpath tests + # http://lists.gnu.org/archive/html/bug-libtool/2005-03/msg00070.html + sed -i \ + -e '2iexit 77' \ + autoconf-lib-link/tests/rpath-3*[ef] || die "sed tests" + + # use Gentoo std docdir + sed -i \ + -e "/^docdir=/s:=.*:=/usr/share/doc/${PF}:" \ + gettext-runtime/configure \ + gettext-tools/configure \ + gettext-tools/examples/installpaths.in \ + || die "sed docdir" + + # sanity check for Bug 105304 + if [[ -z ${USERLAND} ]] ; then + eerror "You just hit Bug 105304, please post your 'emerge info' here:" + eerror "http://bugs.gentoo.org/105304" + die "Aborting to prevent screwing your system" + fi +} + +src_compile() { + local myconf="" + # Build with --without-included-gettext (on glibc systems) + if use elibc_glibc ; then + myconf="${myconf} --without-included-gettext $(use_enable nls)" + else + myconf="${myconf} --with-included-gettext --enable-nls" + fi + use nocxx && export CXX=$(tc-getCC) + econf \ + $(use_with emacs) \ + --disable-java \ + ${myconf} \ + || die + emake || die +} + +src_install() { + make install DESTDIR="${D}" || die "install failed" + use nls || rm -r "${D}"/usr/share/locale + dosym msgfmt /usr/bin/gmsgfmt #43435 + dobin gettext-tools/misc/gettextize || die "gettextize" + + # remove stuff that glibc handles + if use elibc_glibc ; then + rm -f "${D}"/usr/include/libintl.h + rm -f "${D}"/usr/$(get_libdir)/libintl.* + fi + rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias + + # older gettext's sometimes installed libintl ... + # need to keep the linked version or the system + # could die (things like sed link against it :/) + local libname="libintl$(get_libname 7)" + if [[ -e ${ROOT}/usr/$(get_libdir)/${libname} ]] ; then + cp -pPR ${ROOT}/usr/$(get_libdir)/${libname}* "${D}"/usr/$(get_libdir)/ + touch "${D}"/usr/$(get_libdir)/${libname}* + fi + if [[ -e ${ROOT}/$(get_libdir)/${libname} ]] ; then + dodir /$(get_libdir) + cp -pPR ${ROOT}/$(get_libdir)/${libname}* "${D}"/$(get_libdir)/ + touch "${D}"/$(get_libdir)/${libname}* + fi + + if [[ $USERLAND == "BSD" ]] ; then + libname="libintl$(get_libname 8)" + # Move dynamic libs and creates ldscripts into /usr/lib + dodir /$(get_libdir) + mv "${D}"/usr/$(get_libdir)/${libname}* "${D}"/$(get_libdir)/ + gen_usr_ldscript ${libname} + fi + + if ! use doc ; then + rm -rf "${D}"/usr/share/doc/${PF}/html + rm -rf "${D}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1} + fi + dohtml "${D}"/usr/share/doc/${PF}/*.html + rm -f "${D}"/usr/share/doc/${PF}/*.html + + # Remove emacs site-lisp stuff if 'emacs' is not in USE + if use emacs ; then + elisp-site-file-install "${FILESDIR}"/50po-mode-gentoo.el + else + rm -rf "${D}"/usr/share/emacs + fi + + dodoc AUTHORS ChangeLog NEWS README THANKS +} + +pkg_postinst() { + use emacs && elisp-site-regen + ewarn "Any package that linked against the previous version" + ewarn "of gettext will have to be rebuilt." + ewarn "Please 'emerge gentoolkit' and run:" + ewarn "revdep-rebuild --library libintl.so.7" +} + +pkg_postrm() { + use emacs && elisp-site-regen +}