From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A651413832E for ; Mon, 8 Aug 2016 20:26:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 86FA2E0B56; Mon, 8 Aug 2016 20:26:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 18232E0B56 for ; Mon, 8 Aug 2016 20:26:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 559F9340CC4 for ; Mon, 8 Aug 2016 20:26:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EE7B8243E for ; Mon, 8 Aug 2016 20:26:36 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1470687982.8d3b290360cc437762d863d6f726b4e754b3582f.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/files/, sys-fs/multipath-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/multipath-tools/files/multipath-tools-0.6.2-makefile.patch sys-fs/multipath-tools/multipath-tools-0.6.2-r1.ebuild X-VCS-Directories: sys-fs/multipath-tools/files/ sys-fs/multipath-tools/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 8d3b290360cc437762d863d6f726b4e754b3582f X-VCS-Branch: master Date: Mon, 8 Aug 2016 20:26:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8af28067-8386-49dd-ba10-6192b15bd15c X-Archives-Hash: 8392d5a34a2436442301f1228f465179 commit: 8d3b290360cc437762d863d6f726b4e754b3582f Author: Robin H. Johnson gentoo org> AuthorDate: Mon Aug 8 20:26:22 2016 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Mon Aug 8 20:26:22 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d3b2903 sys-fs/multipath-tools: fix LDFLAGS on mpathpersist. Package-Manager: portage-2.2.28 .../files/multipath-tools-0.6.2-makefile.patch | 2 +- .../multipath-tools-0.6.2-r1.ebuild | 61 ++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.6.2-makefile.patch b/sys-fs/multipath-tools/files/multipath-tools-0.6.2-makefile.patch index a051473..e5e28aa 100644 --- a/sys-fs/multipath-tools/files/multipath-tools-0.6.2-makefile.patch +++ b/sys-fs/multipath-tools/files/multipath-tools-0.6.2-makefile.patch @@ -127,7 +127,7 @@ diff -Nuar --exclude '*~' multipath-tools-e165b73.orig/mpathpersist/Makefile mul $(EXEC): $(OBJS) - $(CC) -g $(OBJS) -o $(EXEC) $(LDFLAGS) $(CFLAGS) - $(GZIP) $(EXEC).8 > $(EXEC).8.gz -+ $(CC) $(CFLAGS) $(CFLAGS) -g $(OBJS) -o $(EXEC) $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -g $(OBJS) -o $(EXEC) $(LIBS) install: $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) diff --git a/sys-fs/multipath-tools/multipath-tools-0.6.2-r1.ebuild b/sys-fs/multipath-tools/multipath-tools-0.6.2-r1.ebuild new file mode 100644 index 0000000..3ec454b --- /dev/null +++ b/sys-fs/multipath-tools/multipath-tools-0.6.2-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit eutils systemd toolchain-funcs udev + +DESCRIPTION="Device mapper target autoconfig" +HOMEPAGE="http://christophe.varoqui.free.fr/" +COMMIT_ID='e165b73a16fc9027aa3306df40052038c175be1b' +SRC_URI="http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${COMMIT_ID};sf=tgz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="systemd" + +RDEPEND=">=sys-fs/lvm2-2.02.45 + >=virtual/udev-171 + dev-libs/libaio + dev-libs/userspace-rcu + sys-libs/readline + systemd? ( sys-apps/systemd )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +S="${WORKDIR}/${PN}-${COMMIT_ID:0:7}" + +PATCHES=( + "${FILESDIR}"/${PN}-0.6.2-makefile.patch +) + +src_compile() { + # LIBDM_API_FLUSH involves grepping files in /usr/include, + # so force the test to go the way we want #411337. + emake LIBDM_API_FLUSH=1 CC="$(tc-getCC)" SYSTEMD=$(usex systemd 1 "") +} + +src_install() { + local udevdir="$(get_udevdir)" + + dodir /sbin /usr/share/man/man{5,8} + emake \ + DESTDIR="${D}" \ + SYSTEMD=$(usex systemd 1 "") \ + unitdir="$(systemd_get_systemunitdir)" \ + libudevdir='${prefix}'/"${udevdir}" \ + install + + newinitd "${FILESDIR}"/rc-multipathd multipathd + newinitd "${FILESDIR}"/multipath.rc multipath + + dodoc README ChangeLog +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "If you need multipath on your system, you must" + elog "add 'multipath' into your boot runlevel!" + fi +}