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

Collapse All | Expand All

(-)file_not_specified_in_diff (-15 / +43 lines)
Line  Link Here
0
-- util-linux-2.24.ebuild
0
++ util-linux-2.24-r1.ebuild
Lines 6-12 EAPI=5 Link Here
6
6
7
PYTHON_COMPAT=( python2_7 python3_{2,3} )
7
PYTHON_COMPAT=( python2_7 python3_{2,3} )
8
8
9
inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 python-single-r1
9
inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 python-single-r1 multilib-minimal
10
10
11
MY_PV=${PV/_/-}
11
MY_PV=${PV/_/-}
12
MY_P=${PN}-${MY_PV}
12
MY_P=${PN}-${MY_PV}
Lines 38-44 RDEPEND="!sys-process/schedutils Link Here
38
	ncurses? ( >=sys-libs/ncurses-5.2-r2 )
38
	ncurses? ( >=sys-libs/ncurses-5.2-r2 )
39
	pam? ( sys-libs/pam )
39
	pam? ( sys-libs/pam )
40
	python? ( ${PYTHON_DEPS} )
40
	python? ( ${PYTHON_DEPS} )
41
	selinux? ( sys-libs/libselinux )
41
	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
42
	slang? ( sys-libs/slang )
42
	slang? ( sys-libs/slang )
43
	udev? ( virtual/udev )"
43
	udev? ( virtual/udev )"
44
DEPEND="${RDEPEND}
44
DEPEND="${RDEPEND}
Lines 76-102 lfs_fallocate_test() { Link Here
76
	rm -f "${T}"/fallocate.c
76
	rm -f "${T}"/fallocate.c
77
}
77
}
78
78
79
src_configure() {
79
nativex() {
80
	multilib_build_binaries && echo "$1" || echo "$2"
81
}
82
83
native_use_enable() { nativex "$(use_enable "$@")" "--disable-${2:-$1}"; }
84
native_use_with() { nativex "$(use_with "$@")" "--without-${2:-$1}"; }
85
native_enable() { echo "--$(nativex enable disable)-$1"; }
86
87
multilib_src_configure() {
88
	local CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
89
	local ac_cv_func_fallocate
90
80
	lfs_fallocate_test
91
	lfs_fallocate_test
81
	export ac_cv_header_security_pam_misc_h=$(usex pam) #485486
92
	export ac_cv_header_security_pam_misc_h=$(nativex $(usex pam) no) #485486
93
	ECONF_SOURCE="${S}" \
82
	econf \
94
	econf \
83
		--enable-fs-paths-extra=/usr/sbin:/bin:/usr/bin \
95
		--enable-fs-paths-extra=/usr/sbin:/bin:/usr/bin \
84
		$(use_enable nls) \
96
		$(use_enable nls) \
85
		--enable-agetty \
97
		--enable-agetty \
86
		--with-bashcompletiondir="$(get_bashcompdir)" \
98
		--with-bashcompletiondir="$(get_bashcompdir)" \
87
		$(use_enable bash-completion) \
99
		$(use_enable bash-completion) \
88
		$(use_enable caps setpriv) \
100
		$(native_use_enable caps setpriv) \
89
		$(use_enable cramfs) \
101
		$(native_use_enable cramfs) \
90
		$(use_enable cytune) \
102
		$(use_enable cytune) \
91
		$(use_enable fdformat) \
103
		$(use_enable fdformat) \
92
		--with-ncurses=$(usex ncurses $(usex unicode auto yes) no) \
104
		--with-ncurses=$(nativex $(usex ncurses $(usex unicode auto yes) no) no) \
93
		--disable-kill \
105
		--disable-kill \
94
		--disable-last \
106
		--disable-last \
95
		--disable-login \
107
		--disable-login \
96
		$(use_enable tty-helpers mesg) \
108
		$(use_enable tty-helpers mesg) \
97
		--disable-nologin \
109
		--disable-nologin \
98
		--enable-partx \
110
		--enable-partx \
99
		$(use_with python) \
111
		$(native_use_with python) \
100
		--enable-raw \
112
		--enable-raw \
101
		--enable-rename \
113
		--enable-rename \
102
		--disable-reset \
114
		--disable-reset \
Lines 107-123 src_configure() { Link Here
107
		$(use_enable suid makeinstall-chown) \
119
		$(use_enable suid makeinstall-chown) \
108
		$(use_enable suid makeinstall-setuid) \
120
		$(use_enable suid makeinstall-setuid) \
109
		$(use_with selinux) \
121
		$(use_with selinux) \
110
		$(use_with slang) \
122
		$(native_use_with slang) \
111
		$(use_enable static-libs static) \
123
		$(use_enable static-libs static) \
112
		$(use_with udev) \
124
		$(native_use_with udev) \
113
		$(tc-has-tls || echo --disable-tls)
125
		$(tc-has-tls || echo --disable-tls)
114
}
126
}
115
127
116
src_install() {
128
multilib_src_compile() {
117
	default
129
	if multilib_build_binaries; then
118
	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
130
		default
131
	else
132
		emake libuuid.la libblkid.la libmount.la
133
	fi
134
}
119
135
120
	use python && python_optimize
136
multilib_src_install() {
137
	if multilib_build_binaries; then
138
		emake DESTDIR="${D}" install
139
		use python && python_optimize
140
	else
141
		emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
142
			install-pkgconfigDATA install-uuidincHEADERS \
143
			install-nodist_blkidincHEADERS install-nodist_mountincHEADERS
144
	fi
121
145
122
	# need the libs in /
146
	# need the libs in /
123
	gen_usr_ldscript -a blkid mount uuid
147
	gen_usr_ldscript -a blkid mount uuid
Lines 126-131 src_install() { Link Here
126
	prune_libtool_files
150
	prune_libtool_files
127
}
151
}
128
152
153
multilib_src_install_all() {
154
	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
155
}
156
129
pkg_postinst() {
157
pkg_postinst() {
130
	if ! use tty-helpers; then
158
	if ! use tty-helpers; then
131
		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
159
		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."

Return to bug 490968