From: Tiziano Müller Date: Mon, 4 Dec 2006 22:31:12 +0000 (+0000) Subject: Always linking statically against glib to solve problems when /usr is not yet mounted... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=82f1e5a7e68dbb6bda16ece9e5b66ccd238b21ec;p=gentoo.git Always linking statically against glib to solve problems when /usr is not yet mounted. Added glib-1 dep if the user wants the gui. Added debug USE-flag. Package-Manager: portage-2.1.2_rc2 --- diff --git a/sys-fs/evms/ChangeLog b/sys-fs/evms/ChangeLog index bddea30c997f..5416c3d041f0 100644 --- a/sys-fs/evms/ChangeLog +++ b/sys-fs/evms/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-fs/evms # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/ChangeLog,v 1.55 2006/12/02 11:55:45 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/ChangeLog,v 1.56 2006/12/04 22:31:12 dev-zero Exp $ + +*evms-2.5.5-r4 (04 Dec 2006) + + 04 Dec 2006; Tiziano Müller +evms-2.5.5-r4.ebuild: + Always linking statically against glib to solve problems when /usr is not + yet mounted. Added glib-1 dep if the user wants the gui. Added debug + USE-flag. *evms-2.5.5-r3 (02 Dec 2006) diff --git a/sys-fs/evms/Manifest b/sys-fs/evms/Manifest index 0e8a74a95f17..621e9ac93258 100644 --- a/sys-fs/evms/Manifest +++ b/sys-fs/evms/Manifest @@ -67,10 +67,14 @@ EBUILD evms-2.5.5-r3.ebuild 3145 RMD160 5abf8957778a5a655be1c2d9000786995627f795 MD5 322f3704366ac2fbf17a23ea16b94d88 evms-2.5.5-r3.ebuild 3145 RMD160 5abf8957778a5a655be1c2d9000786995627f795 evms-2.5.5-r3.ebuild 3145 SHA256 70ada1911c4b8410e137f8c54cf100da8fd67946995118284a06d41edb19ae0d evms-2.5.5-r3.ebuild 3145 -MISC ChangeLog 12120 RMD160 6d8a36a99f6672ef9358b97e1eadbd078017faf0 SHA1 1641d1e3a8f8f4a8792701c84e8358f5342004c9 SHA256 fbc93a0ae01767022db427f7e90fe5d639136bf615b720493ec9e1ddccf93c1c -MD5 7ba50d8cc94d71065f977671b006a88e ChangeLog 12120 -RMD160 6d8a36a99f6672ef9358b97e1eadbd078017faf0 ChangeLog 12120 -SHA256 fbc93a0ae01767022db427f7e90fe5d639136bf615b720493ec9e1ddccf93c1c ChangeLog 12120 +EBUILD evms-2.5.5-r4.ebuild 3282 RMD160 0ab8e46ac59042b55507dd9b17eae128b59507cc SHA1 4d38fd1376a0a63f6050f1a2690afb423a8cabc0 SHA256 0cae8b0b1e147368ead46cd211380a74c48a84f2d57f8e53a3f737dccf5e7a3d +MD5 1d7dc35b7710e61a73e00d60db719ab7 evms-2.5.5-r4.ebuild 3282 +RMD160 0ab8e46ac59042b55507dd9b17eae128b59507cc evms-2.5.5-r4.ebuild 3282 +SHA256 0cae8b0b1e147368ead46cd211380a74c48a84f2d57f8e53a3f737dccf5e7a3d evms-2.5.5-r4.ebuild 3282 +MISC ChangeLog 12386 RMD160 597ecb1265fb07bda98daf7813a2c9a5d4eb5008 SHA1 b50f67d8f728531732eaf9b60ebcba49b9cbb420 SHA256 5a2272f1e8aac3ccd1b534cc32206bd2d44dbad94d71f5c07e67cc2c53f10c3c +MD5 16196dc52cbddee8b572252489bccca8 ChangeLog 12386 +RMD160 597ecb1265fb07bda98daf7813a2c9a5d4eb5008 ChangeLog 12386 +SHA256 5a2272f1e8aac3ccd1b534cc32206bd2d44dbad94d71f5c07e67cc2c53f10c3c ChangeLog 12386 MISC metadata.xml 383 RMD160 92e091c63bb348228df89a66aa6c3fe2b65f0768 SHA1 23d81d62b6e49d0867ad90698ea3ac087b2a9d95 SHA256 6ce67f896d7a3aa021bbfbf18cbd43e096de9f64e59e7159e6efb2689f651e7b MD5 515e2b0ddb7f8c4e6fad2c72fda19768 metadata.xml 383 RMD160 92e091c63bb348228df89a66aa6c3fe2b65f0768 metadata.xml 383 @@ -84,3 +88,6 @@ SHA256 3c7b17329fb2f3fb7c0f65550c2d12c958b315af49b88160b7b43f6538b80c3d files/di MD5 83e877452227406dad19b93325f98ca2 files/digest-evms-2.5.5-r3 235 RMD160 8b33887302192148a7f141f6c96deb68ebcf31ef files/digest-evms-2.5.5-r3 235 SHA256 3c7b17329fb2f3fb7c0f65550c2d12c958b315af49b88160b7b43f6538b80c3d files/digest-evms-2.5.5-r3 235 +MD5 83e877452227406dad19b93325f98ca2 files/digest-evms-2.5.5-r4 235 +RMD160 8b33887302192148a7f141f6c96deb68ebcf31ef files/digest-evms-2.5.5-r4 235 +SHA256 3c7b17329fb2f3fb7c0f65550c2d12c958b315af49b88160b7b43f6538b80c3d files/digest-evms-2.5.5-r4 235 diff --git a/sys-fs/evms/evms-2.5.5-r4.ebuild b/sys-fs/evms/evms-2.5.5-r4.ebuild new file mode 100644 index 000000000000..7c371329709e --- /dev/null +++ b/sys-fs/evms/evms-2.5.5-r4.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.5.5-r4.ebuild,v 1.1 2006/12/04 22:31:12 dev-zero Exp $ + +WANT_AUTOMAKE="latest" +WANT_AUTOCONF="latest" + +inherit eutils flag-o-matic multilib toolchain-funcs autotools + +DESCRIPTION="Utilities for the IBM Enterprise Volume Management System" +HOMEPAGE="http://www.sourceforge.net/projects/evms" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="debug gtk ncurses nls" + +#EVMS uses libuuid from e2fsprogs +RDEPEND="virtual/libc + sys-fs/e2fsprogs + sys-fs/device-mapper + >=sys-apps/baselayout-1.9.4-r6 + gtk? ( =x11-libs/gtk+-1* + =dev-libs/glib-1* ) + ncurses? ( sys-libs/ncurses + =dev-libs/glib-2* )" +DEPEND="${RDEPEND}" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/${PV}/md_super_fix.patch" + epatch "${FILESDIR}/${PV}/ntfs_unmkfs.patch" + epatch "${FILESDIR}/${PV}/raid5_degrade_fix.patch" + epatch "${FILESDIR}/${PV}/raid5_remove_spare_fix.patch" + epatch "${FILESDIR}/${PV}/raid5_remove_spare_fix_2.patch" + epatch "${FILESDIR}/${PV}/raid5_algorithm.patch" + epatch "${FILESDIR}/${PV}/cli_reload_options.patch" + epatch "${FILESDIR}/${PV}/cli_query_segfault.patch" + epatch "${FILESDIR}/${PV}/get_geometry.patch" + epatch "${FILESDIR}/${PV}/BaseName.patch" + + epatch "${FILESDIR}/evms-2.5.5-as-needed.patch" + epatch "${FILESDIR}/evms-2.5.5-glib_dep.patch" + epatch "${FILESDIR}/evms-2.5.5-ocfs2.patch" + + eautoreconf +} + +src_compile() { + # Bug #54856 + # filter-flags "-fstack-protector" + replace-flags -O3 -O2 + replace-flags -Os -O2 + + local excluded_interfaces="" + use ncurses || excluded_interfaces="--disable-text-mode" + use gtk || excluded_interfaces="${excluded_interfaces} --disable-gui" + + # We have to link statically against glib because evmsn resides in /sbin + econf \ + --libdir=/$(get_libdir) \ + --sbindir=/sbin \ + --includedir=/usr/include \ + --with-static-glib \ + $(use_with debug) \ + $(use_enable nls) \ + ${excluded_interfaces} || die "Failed configure" + emake || die "Failed emake" +} + +src_install() { + emake DESTDIR="${D}" install || die "Make install died" + dodoc ChangeLog INSTALL* PLUGIN.IDS README TERMINOLOGY doc/linuxrc + + insinto /$(get_libdir)/rcscripts/addons + newins "${FILESDIR}/evms2-start.sh" evms-start.sh || die "rcscript addon failed" + + # install the sample configuration into the doc dir + dodoc "${D}/etc/evms.conf.sample" + rm -f "${D}/etc/evms.conf.sample" + + # the kernel patches may come handy for people compiling their own kernel + docinto kernel/2.4 + dodoc kernel/2.4/* + docinto kernel/2.6 + dodoc kernel/2.6/* + + # move static libraries to /usr/lib + dodir /usr/$(get_libdir) + mv -f ${D}/$(get_libdir)/*.a "${D}/usr/$(get_libdir)" + + # Create linker scripts for dynamic libs in /lib, else gcc + # links to the static ones in /usr/lib first. Bug #4411. + for x in "${D}/usr/$(get_libdir)"/*.a ; do + if [ -f ${x} ] ; then + local lib="${x##*/}" + gen_usr_ldscript ${lib/\.a/\.so} + fi + done + + # the gtk+ frontend should live in /usr/sbin + if use gtk ; then + dodir /usr/sbin + mv -f ${D}/sbin/evmsgui ${D}/usr/sbin + fi + + # Needed for bug #51252 + dosym libevms-2.5.so.0.0 /$(get_libdir)/libevms-2.5.so.0 +} diff --git a/sys-fs/evms/files/digest-evms-2.5.5-r4 b/sys-fs/evms/files/digest-evms-2.5.5-r4 new file mode 100644 index 000000000000..33b12c6760ce --- /dev/null +++ b/sys-fs/evms/files/digest-evms-2.5.5-r4 @@ -0,0 +1,3 @@ +MD5 45b463f0cbade194dc0a08be432b572e evms-2.5.5.tar.gz 2286321 +RMD160 716d6b34f48f6f7a3f5f4627bc4a2c34957607f7 evms-2.5.5.tar.gz 2286321 +SHA256 9dbfaac148d822068ba883f6533935e03ae5cfc9fdf8836dea6aee99c859307c evms-2.5.5.tar.gz 2286321