[patch] util-linux-2.24.1-r4-prefix-compatibility-000.patch

util-linux-2.24.1-r4-prefix-compatibility-000.patch (text/plain), 5.00 KB, created by Greg Turner on 2014-05-25 01:35:02 UTC

--- portage/sys-apps/util-linux/util-linux-2.24.1-r3.ebuild	2014-05-02 03:04:08.000000000 -0700
+++ portage/sys-apps/util-linux/util-linux-2.24.1-r4.ebuild	2014-05-24 17:21:33.043140110 -0700
@@ -1,19 +1,19 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.24.1-r3.ebuild,v 1.1 2014/05/02 10:04:08 mgorny Exp $
+# $Header: $
 
 EAPI="4"
 
 PYTHON_COMPAT=( python2_7 python3_{2,3,4} )
 
 inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \
-	python-single-r1 multilib-minimal
+	prefix autotools python-single-r1 multilib-minimal
 
 MY_PV=${PV/_/-}
 MY_P=${PN}-${MY_PV}
 
 if [[ ${PV} == 9999 ]] ; then
-	inherit git-2 autotools
+	inherit git-2
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
@@ -63,12 +63,19 @@ pkg_setup() {
 src_prepare() {
 	if [[ ${PV} == 9999 ]] ; then
 		po/update-potfiles
-		eautoreconf
 	fi
 	epatch "${FILESDIR}"/${PN}-2.24-skip-last-tests.patch #491742
 	epatch "${FILESDIR}"/${PN}-2.24-last-tests.patch #501408
+	if use prefix; then
+		epatch "${FILESDIR}"/${P}-eprefixify-magic-libdir.patch #DOABUG
+		eprefixify configure.ac
+	fi
 	find tests/ -name bigyear -delete #489794
-	elibtoolize
+	if [[ ${PV} == 9999 ]] || use prefix; then 
+		eautoreconf
+	else
+		elibtoolize
+	fi
 }
 
 lfs_fallocate_test() {
@@ -84,42 +91,60 @@ lfs_fallocate_test() {
 	rm -f "${T}"/fallocate.${ABI}.c
 }
 
+want_libuuid() {
+	# bug #350841, currently only not on OS X Snow Leopard and onwards
+	[[ ${CHOST} != *-darwin1[0123] ]]
+}
+
 multilib_src_configure() {
-	lfs_fallocate_test
 	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
-	ECONF_SOURCE=${S} \
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--enable-fs-paths-extra=/usr/sbin:/bin:/usr/bin \
-		$(multilib_native_use_enable nls) \
-		--enable-agetty \
-		--with-bashcompletiondir="$(get_bashcompdir)" \
-		$(multilib_native_use_enable bash-completion) \
-		$(multilib_native_use_enable caps setpriv) \
-		$(multilib_native_use_enable cramfs) \
-		$(multilib_native_use_enable cytune) \
-		$(multilib_native_use_enable fdformat) \
-		--with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \
-		--disable-kill \
-		--disable-login \
-		$(multilib_native_use_enable tty-helpers mesg) \
-		--disable-nologin \
-		--enable-partx \
-		$(multilib_native_use_with python) \
-		--enable-raw \
-		--enable-rename \
-		--disable-reset \
-		--enable-schedutils \
-		--disable-su \
-		$(multilib_native_use_enable tty-helpers wall) \
-		$(multilib_native_use_enable tty-helpers write) \
-		$(multilib_native_use_enable suid makeinstall-chown) \
-		$(multilib_native_use_enable suid makeinstall-setuid) \
-		$(use_with selinux) \
-		$(multilib_native_use_with slang) \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_with udev) \
-		$(tc-has-tls || echo --disable-tls)
+	local myconf=(
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--enable-fs-paths-extra="${EPREFIX}"/usr/sbin:"${EPREFIX}"/bin:"${EPREFIX}"/usr/bin
+		$(want_libuuid && echo --enable-libuuid || echo --disable-libuuid)
+	)
+	if use prefix; then
+		myconf+=(
+			--disable-{mount,fsck,uuidd,agetty,cramfs,switch_root,pivot_root,fallocate,unshare}
+			--disable-{kill,last,mesg,partx,raw,rename,reset,schedutils,wall,write,login-chown-vcs}
+			--disable-{login-stat-mail,pg-bell,use-tty-group,makeinstall-chown,makeinstall-setuid}
+			--disable-schedutils
+		)
+	else
+		lfs_fallocate_test
+		myconf+=(
+			$(multilib_native_use_enable nls)
+			$(use_enable '!prefix' agetty)
+			--with-bashcompletiondir="$(get_bashcompdir)"
+			$(multilib_native_use_enable bash-completion)
+			$(multilib_native_use_enable caps setpriv)
+			$(multilib_native_use_enable cramfs)
+			$(multilib_native_use_enable cytune)
+			$(multilib_native_use_enable fdformat)
+			--with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no)
+			--disable-kill
+			--disable-login
+			$(multilib_native_use_enable tty-helpers mesg)
+			--disable-nologin
+			--enable-partx
+			$(multilib_native_use_with python)
+			--enable-raw
+			--enable-rename
+			--disable-reset
+			--enable-schedutils
+			--disable-su
+			$(multilib_native_use_enable tty-helpers wall)
+			$(multilib_native_use_enable tty-helpers write)
+			$(multilib_native_use_enable suid makeinstall-chown)
+			$(multilib_native_use_enable suid makeinstall-setuid)
+			$(use_with selinux)
+			$(multilib_native_use_with slang)
+			$(use_enable static-libs static)
+			$(multilib_native_use_with udev) 
+			$(tc-has-tls || echo --disable-tls)
+		)
+	fi
+	ECONF_SOURCE=${S} econf "${myconf[@]}"
 }
 
 multilib_src_compile() {
@@ -147,7 +172,7 @@ multilib_src_install() {
 
 	if multilib_is_native_abi; then
 		# need the libs in /
-		gen_usr_ldscript -a blkid mount uuid
+		use prefix || gen_usr_ldscript -a blkid mount uuid
 
 		use python && python_optimize
 	fi