commit: 20774530336fbb97508d3b8bfb788bb9f079e2d5 Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org> AuthorDate: Tue Jan 5 13:27:23 2016 +0000 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> CommitDate: Tue Jan 5 13:28:01 2016 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=20774530
sys-fs/udisks - add musl support sys-fs/udisks/Manifest | 4 + sys-fs/udisks/files/udisks-2.1.6-musl-fixup.patch | 42 ++++++++ sys-fs/udisks/files/udisks-2.1.6-musl-fixup1.patch | 11 +++ sys-fs/udisks/udisks-2.1.6.ebuild | 109 +++++++++++++++++++++ 4 files changed, 166 insertions(+) diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest new file mode 100644 index 0000000..174dca6 --- /dev/null +++ b/sys-fs/udisks/Manifest @@ -0,0 +1,4 @@ +AUX udisks-2.1.6-musl-fixup.patch 1114 SHA256 aa1e5f0f798806e3136940cb8f11cddfb00c9891606e75a1fe9520a993be889b SHA512 224682d21c1885911738a4f200b1c7e597143ca2fa60999f48c786eb4390e1652048d9f996973f72dd72c3837f9930abe4ae82e52baefd96b0d7100fba9b7750 WHIRLPOOL 805a317ceaf02e85dfc998404760606d8923a1c7a604023a78dfaba3f848ac7d3e6003d14938e816c5b87be0ecbc085401bd040b7cee3c76d8aba6eaf447f93a +AUX udisks-2.1.6-musl-fixup1.patch 223 SHA256 97a86c44ac43c12de4080e3c47dc597f9aff61470dea42dea80baebc6724e6b6 SHA512 b7b515e70e5f3770133de934875d039810a8232d1212279902016ee77ad03837f50a98a588ec53ed1907ff3689dd92b0a4c0f0c7d1b772a1766d2b255c101aa8 WHIRLPOOL 681bea6bdae4f59ff350669859a78c40bc65d92b30fc3e2eeb4de2af299db42dc370320de29e64679e775cd8d18d650f75447bf2b0998de377f265c0aa10c9c5 +DIST udisks-2.1.6.tar.bz2 908987 SHA256 dec5f5c85fa0f74f39336acbfba1770f9988c096be23873714543c304b09f46a SHA512 33badcf87986504cf13926f23f1ac0386d732920918871e5bdbcbd704bfcee17d9d3c5002bbdd497bf88a47f844595ad06fc2049bc805099c052943ba3750770 WHIRLPOOL 798cfae910b4cc85ebbd0b60aa987fda6bc6009fb37bba8ad3644bca497f1bb5dde04d574aab97f323dd4c4ae8dcbbc3de9fa09cbdbee45ff19a0b1fbf22b797 +EBUILD udisks-2.1.6.ebuild 3013 SHA256 e606496b78e25828a0d52040a9560b5e4b7dfa0c08a8ef86b1b6032280372574 SHA512 da895c35c505c716fed5956b4a81660985224492aa80e0ee711bd1b22db72ab0b76f993541d9879df4a20ee0cae67d4efb2648150bc64d0ac61914d21113d256 WHIRLPOOL 64c67cedef55cc6b3e5aa225f22c1839969b9e35163a4794d67f907e3b11e68beb2caca8bcf3107649d7fbb4c3a35c77b643c89348600a70a5ffb2947ef575e0 diff --git a/sys-fs/udisks/files/udisks-2.1.6-musl-fixup.patch b/sys-fs/udisks/files/udisks-2.1.6-musl-fixup.patch new file mode 100644 index 0000000..6e2277b --- /dev/null +++ b/sys-fs/udisks/files/udisks-2.1.6-musl-fixup.patch @@ -0,0 +1,42 @@ +From 725384004aef55e6f7cfb132ae07afc1a14b429d Mon Sep 17 00:00:00 2001 +From: Kylie McClain <[email protected]> +Date: Wed, 25 Nov 2015 21:43:03 -0500 +Subject: [PATCH] Fix building on musl-libc + +Original patches are from https://github.com/voidlinux/void-packages/tree/master/srcpkgs/udisks2/patches +--- + src/udiskslinuxfilesystem.c | 1 + + tools/udisksctl.c | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/udiskslinuxfilesystem.c b/src/udiskslinuxfilesystem.c +index 4db3745..971c5e1 100644 +--- a/src/udiskslinuxfilesystem.c ++++ b/src/udiskslinuxfilesystem.c +@@ -31,6 +31,7 @@ + #include <mntent.h> + #include <sys/types.h> + #include <sys/acl.h> ++#include <sys/wait.h> + #include <errno.h> + + #include <glib/gstdio.h> +diff --git a/tools/udisksctl.c b/tools/udisksctl.c +index 2456a96..3e85e15 100644 +--- a/tools/udisksctl.c ++++ b/tools/udisksctl.c +@@ -229,8 +229,8 @@ _color_run_pager (void) + } + else + { +- fclose (stdout); +- stdout = _color_pager_out; ++ fflush (stdout); ++ dup2 (fileno(_color_pager_out), fileno(stdout)); + } + + out: +-- +2.6.3 + + diff --git a/sys-fs/udisks/files/udisks-2.1.6-musl-fixup1.patch b/sys-fs/udisks/files/udisks-2.1.6-musl-fixup1.patch new file mode 100644 index 0000000..fa3507f --- /dev/null +++ b/sys-fs/udisks/files/udisks-2.1.6-musl-fixup1.patch @@ -0,0 +1,11 @@ +--- a/src/udiskslinuxblock.c ++++ b/src/udiskslinuxblock.c +@@ -24,6 +24,7 @@ + #include <sys/types.h> + #include <sys/mount.h> + #include <sys/stat.h> ++#define __USE_GNU + #include <fcntl.h> + #include <pwd.h> + #include <grp.h> + diff --git a/sys-fs/udisks/udisks-2.1.6.ebuild b/sys-fs/udisks/udisks-2.1.6.ebuild new file mode 100644 index 0000000..7316a6e --- /dev/null +++ b/sys-fs/udisks/udisks-2.1.6.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit bash-completion-r1 eutils linux-info systemd udev + +DESCRIPTION="Daemon providing interfaces to work with storage devices" +HOMEPAGE="http://www.freedesktop.org/wiki/Software/udisks"; +SRC_URI="http://udisks.freedesktop.org/releases/${P}.tar.bz2"; + +LICENSE="GPL-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" +IUSE="debug cryptsetup +gptfdisk +introspection selinux systemd" + +COMMON_DEPEND=" + >=dev-libs/glib-2.36:2 + >=dev-libs/libatasmart-0.19 + >=sys-auth/polkit-0.110 + virtual/acl + virtual/libgudev:= + virtual/udev + introspection? ( >=dev-libs/gobject-introspection-1.30:= ) + systemd? ( sys-apps/systemd ) +" +# gptfdisk -> src/udiskslinuxpartition.c -> sgdisk (see also #412801#c1) +# util-linux -> mount, umount, swapon, swapoff (see also #403073) +RDEPEND="${COMMON_DEPEND} + >=sys-apps/util-linux-2.20.1-r2 + >=sys-block/parted-3 + virtual/eject + cryptsetup? ( + sys-fs/cryptsetup[udev(+)] + sys-fs/lvm2[udev(+)] + ) + gptfdisk? ( >=sys-apps/gptfdisk-0.8 ) + selinux? ( sec-policy/selinux-devicekit ) +" +DEPEND="${COMMON_DEPEND} + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + >=dev-util/gdbus-codegen-2.32 + dev-util/intltool + >=sys-kernel/linux-headers-3.1 + virtual/pkgconfig +" + +QA_MULTILIB_PATHS="usr/lib/udisks2/udisksd" + +DOCS="AUTHORS HACKING NEWS README" + +pkg_setup() { + # Listing only major arch's here to avoid tracking kernel's defconfig + if use amd64 || use arm || use ppc || use ppc64 || use x86; then + CONFIG_CHECK="~!IDE" #319829 + CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377 + CONFIG_CHECK+=" ~SWAP" # https://forums.gentoo.org/viewtopic-t-923640.html + CONFIG_CHECK+=" ~NLS_UTF8" #425562 + kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278 + linux-info_pkg_setup + fi +} + +src_prepare() { + use systemd || { sed -i -e 's:libsystemd-login:&disable:' configure || die; } + + epatch "${FILESDIR}"/${PN}-2.1.6-musl-fixup.patch + epatch "${FILESDIR}"/${PN}-2.1.6-musl-fixup1.patch + + epatch_user +} + +src_configure() { + econf \ + --localstatedir="${EPREFIX}"/var \ + --disable-static \ + $(use_enable debug) \ + --disable-gtk-doc \ + $(use_enable introspection) \ + --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \ + --with-udevdir="$(get_udevdir)" \ + --enable-compile-warnings=minimum \ + "$(systemd_with_unitdir)" +} + +src_install() { + default + prune_libtool_files + keepdir /var/lib/udisks2 #383091 + + rm -rf "${ED}"/usr/share/bash-completion + dobashcomp data/completions/udisksctl + + local htmldir=udisks2 + if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then + dosym /usr/share/doc/${PF}/html/${htmldir} /usr/share/gtk-doc/html/${htmldir} + fi +} + +pkg_postinst() { + mkdir -p "${EROOT}"/run #415987 + + # See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync? + if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then + echo + ewarn "You should reboot the system now to get /run mounted with tmpfs!" + fi +}
