Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 511414 | Differences between
and this patch

Collapse All | Expand All

(-)portage/sys-apps/util-linux/util-linux-2.24.1-r3.ebuild (-40 / +65 lines)
Lines 1-19 Link Here
1
# Copyright 1999-2014 Gentoo Foundation
1
# Copyright 1999-2014 Gentoo Foundation
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
# $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 $
3
# $Header: $
4
4
5
EAPI="4"
5
EAPI="4"
6
6
7
PYTHON_COMPAT=( python2_7 python3_{2,3,4} )
7
PYTHON_COMPAT=( python2_7 python3_{2,3,4} )
8
8
9
inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \
9
inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \
10
	python-single-r1 multilib-minimal
10
	prefix autotools python-single-r1 multilib-minimal
11
11
12
MY_PV=${PV/_/-}
12
MY_PV=${PV/_/-}
13
MY_P=${PN}-${MY_PV}
13
MY_P=${PN}-${MY_PV}
14
14
15
if [[ ${PV} == 9999 ]] ; then
15
if [[ ${PV} == 9999 ]] ; then
16
	inherit git-2 autotools
16
	inherit git-2
17
	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
17
	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
18
else
18
else
19
	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
19
	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
Lines 63-74 pkg_setup() { Link Here
63
src_prepare() {
63
src_prepare() {
64
	if [[ ${PV} == 9999 ]] ; then
64
	if [[ ${PV} == 9999 ]] ; then
65
		po/update-potfiles
65
		po/update-potfiles
66
		eautoreconf
67
	fi
66
	fi
68
	epatch "${FILESDIR}"/${PN}-2.24-skip-last-tests.patch #491742
67
	epatch "${FILESDIR}"/${PN}-2.24-skip-last-tests.patch #491742
69
	epatch "${FILESDIR}"/${PN}-2.24-last-tests.patch #501408
68
	epatch "${FILESDIR}"/${PN}-2.24-last-tests.patch #501408
69
	if use prefix; then
70
		epatch "${FILESDIR}"/${P}-eprefixify-magic-libdir.patch #DOABUG
71
		eprefixify configure.ac
72
	fi
70
	find tests/ -name bigyear -delete #489794
73
	find tests/ -name bigyear -delete #489794
71
	elibtoolize
74
	if [[ ${PV} == 9999 ]] || use prefix; then 
75
		eautoreconf
76
	else
77
		elibtoolize
78
	fi
72
}
79
}
73
80
74
lfs_fallocate_test() {
81
lfs_fallocate_test() {
Lines 84-125 lfs_fallocate_test() { Link Here
84
	rm -f "${T}"/fallocate.${ABI}.c
91
	rm -f "${T}"/fallocate.${ABI}.c
85
}
92
}
86
93
94
want_libuuid() {
95
	# bug #350841, currently only not on OS X Snow Leopard and onwards
96
	[[ ${CHOST} != *-darwin1[0123] ]]
97
}
98
87
multilib_src_configure() {
99
multilib_src_configure() {
88
	lfs_fallocate_test
89
	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
100
	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
90
	ECONF_SOURCE=${S} \
101
	local myconf=(
91
	econf \
102
		--docdir="${EPREFIX}/usr/share/doc/${PF}"
92
		--docdir="/usr/share/doc/${PF}" \
103
		--enable-fs-paths-extra="${EPREFIX}"/usr/sbin:"${EPREFIX}"/bin:"${EPREFIX}"/usr/bin
93
		--enable-fs-paths-extra=/usr/sbin:/bin:/usr/bin \
104
		$(want_libuuid && echo --enable-libuuid || echo --disable-libuuid)
94
		$(multilib_native_use_enable nls) \
105
	)
95
		--enable-agetty \
106
	if use prefix; then
96
		--with-bashcompletiondir="$(get_bashcompdir)" \
107
		myconf+=(
97
		$(multilib_native_use_enable bash-completion) \
108
			--disable-{mount,fsck,uuidd,agetty,cramfs,switch_root,pivot_root,fallocate,unshare}
98
		$(multilib_native_use_enable caps setpriv) \
109
			--disable-{kill,last,mesg,partx,raw,rename,reset,schedutils,wall,write,login-chown-vcs}
99
		$(multilib_native_use_enable cramfs) \
110
			--disable-{login-stat-mail,pg-bell,use-tty-group,makeinstall-chown,makeinstall-setuid}
100
		$(multilib_native_use_enable cytune) \
111
			--disable-schedutils
101
		$(multilib_native_use_enable fdformat) \
112
		)
102
		--with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \
113
	else
103
		--disable-kill \
114
		lfs_fallocate_test
104
		--disable-login \
115
		myconf+=(
105
		$(multilib_native_use_enable tty-helpers mesg) \
116
			$(multilib_native_use_enable nls)
106
		--disable-nologin \
117
			$(use_enable '!prefix' agetty)
107
		--enable-partx \
118
			--with-bashcompletiondir="$(get_bashcompdir)"
108
		$(multilib_native_use_with python) \
119
			$(multilib_native_use_enable bash-completion)
109
		--enable-raw \
120
			$(multilib_native_use_enable caps setpriv)
110
		--enable-rename \
121
			$(multilib_native_use_enable cramfs)
111
		--disable-reset \
122
			$(multilib_native_use_enable cytune)
112
		--enable-schedutils \
123
			$(multilib_native_use_enable fdformat)
113
		--disable-su \
124
			--with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no)
114
		$(multilib_native_use_enable tty-helpers wall) \
125
			--disable-kill
115
		$(multilib_native_use_enable tty-helpers write) \
126
			--disable-login
116
		$(multilib_native_use_enable suid makeinstall-chown) \
127
			$(multilib_native_use_enable tty-helpers mesg)
117
		$(multilib_native_use_enable suid makeinstall-setuid) \
128
			--disable-nologin
118
		$(use_with selinux) \
129
			--enable-partx
119
		$(multilib_native_use_with slang) \
130
			$(multilib_native_use_with python)
120
		$(use_enable static-libs static) \
131
			--enable-raw
121
		$(multilib_native_use_with udev) \
132
			--enable-rename
122
		$(tc-has-tls || echo --disable-tls)
133
			--disable-reset
134
			--enable-schedutils
135
			--disable-su
136
			$(multilib_native_use_enable tty-helpers wall)
137
			$(multilib_native_use_enable tty-helpers write)
138
			$(multilib_native_use_enable suid makeinstall-chown)
139
			$(multilib_native_use_enable suid makeinstall-setuid)
140
			$(use_with selinux)
141
			$(multilib_native_use_with slang)
142
			$(use_enable static-libs static)
143
			$(multilib_native_use_with udev) 
144
			$(tc-has-tls || echo --disable-tls)
145
		)
146
	fi
147
	ECONF_SOURCE=${S} econf "${myconf[@]}"
123
}
148
}
124
149
125
multilib_src_compile() {
150
multilib_src_compile() {
Lines 147-153 multilib_src_install() { Link Here
147
172
148
	if multilib_is_native_abi; then
173
	if multilib_is_native_abi; then
149
		# need the libs in /
174
		# need the libs in /
150
		gen_usr_ldscript -a blkid mount uuid
175
		use prefix || gen_usr_ldscript -a blkid mount uuid
151
176
152
		use python && python_optimize
177
		use python && python_optimize
153
	fi
178
	fi

Return to bug 511414