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

(-)/home/portage/tree/sys-apps/util-linux/util-linux-2.24.ebuild (-27 / +73 lines)
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-123 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
multilib_src_configure() {
80
	local CPPFLAGS=${CPPFLAGS} ac_cv_func_fallocate opts
80
	lfs_fallocate_test
81
	lfs_fallocate_test
81
	export ac_cv_header_security_pam_misc_h=$(usex pam) #485486
82
	export ac_cv_header_security_pam_misc_h=$(usex pam) #485486
83
	if multilib_build_binaries; then
84
		opts=(
85
			--enable-agetty
86
			$(use_enable bash-completion)
87
			$(use_enable caps setpriv)
88
			$(use_enable cramfs)
89
			$(use_enable cytune)
90
			$(use_enable fdformat)
91
			--with-ncurses=$(usex ncurses $(usex unicode auto yes) no)
92
			$(use_enable tty-helpers mesg)
93
			--enable-partx
94
			$(use_with python)
95
			--enable-raw
96
			--enable-rename
97
			--enable-schedutils
98
			$(use_enable tty-helpers wall)
99
			$(use_enable tty-helpers write)
100
			$(use_enable suid makeinstall-chown)
101
			$(use_enable suid makeinstall-setuid)
102
			$(use_with slang)
103
			$(use_with udev)
104
		)
105
	else
106
		opts=(
107
			--disable-agetty
108
			--disable-bash-completion
109
			--disable-setpriv
110
			--disable-cramfs
111
			--disable-cytune
112
			--disable-fdformat
113
			--without-ncurses
114
			--disable-mesg
115
			--disable-partx
116
			--without-python
117
			--disable-raw
118
			--disable-rename
119
			--disable-schedutils
120
			--disable-wall
121
			--disable-write
122
			--disable-makeinstall-chown
123
			--disable-makeinstall-setuid
124
			--without-slang
125
			--without-udev
126
		)
127
	fi
128
129
	ECONF_SOURCE="${S}" \
82
	econf \
130
	econf \
83
		--enable-fs-paths-extra=/usr/sbin:/bin:/usr/bin \
131
		--enable-fs-paths-extra=/usr/sbin:/bin:/usr/bin \
84
		$(use_enable nls) \
132
		$(use_enable nls) \
85
		--enable-agetty \
86
		--with-bashcompletiondir="$(get_bashcompdir)" \
133
		--with-bashcompletiondir="$(get_bashcompdir)" \
87
		$(use_enable bash-completion) \
88
		$(use_enable caps setpriv) \
89
		$(use_enable cramfs) \
90
		$(use_enable cytune) \
91
		$(use_enable fdformat) \
92
		--with-ncurses=$(usex ncurses $(usex unicode auto yes) no) \
93
		--disable-kill \
134
		--disable-kill \
94
		--disable-last \
135
		--disable-last \
95
		--disable-login \
136
		--disable-login \
96
		$(use_enable tty-helpers mesg) \
97
		--disable-nologin \
137
		--disable-nologin \
98
		--enable-partx \
99
		$(use_with python) \
100
		--enable-raw \
101
		--enable-rename \
102
		--disable-reset \
138
		--disable-reset \
103
		--enable-schedutils \
104
		--disable-su \
139
		--disable-su \
105
		$(use_enable tty-helpers wall) \
106
		$(use_enable tty-helpers write) \
107
		$(use_enable suid makeinstall-chown) \
108
		$(use_enable suid makeinstall-setuid) \
109
		$(use_with selinux) \
140
		$(use_with selinux) \
110
		$(use_with slang) \
111
		$(use_enable static-libs static) \
141
		$(use_enable static-libs static) \
112
		$(use_with udev) \
142
		$(tc-has-tls || echo --disable-tls) \
113
		$(tc-has-tls || echo --disable-tls)
143
		"${opts[@]}"
114
}
144
}
115
145
116
src_install() {
146
multilib_src_compile() {
117
	default
147
	if multilib_build_binaries; then
118
	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
148
		default
149
	else
150
		emake libuuid.la libblkid.la libmount.la
151
	fi
152
}
119
153
120
	use python && python_optimize
154
multilib_src_install() {
155
	if multilib_build_binaries; then
156
		emake DESTDIR="${D}" install
157
		use python && python_optimize
158
	else
159
		emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
160
			install-pkgconfigDATA install-uuidincHEADERS \
161
			install-nodist_blkidincHEADERS install-nodist_mountincHEADERS
162
	fi
121
163
122
	# need the libs in /
164
	# need the libs in /
123
	gen_usr_ldscript -a blkid mount uuid
165
	gen_usr_ldscript -a blkid mount uuid
Lines 126-131 src_install() { Link Here
126
	prune_libtool_files
168
	prune_libtool_files
127
}
169
}
128
170
171
multilib_src_install_all() {
172
	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
173
}
174
129
pkg_postinst() {
175
pkg_postinst() {
130
	if ! use tty-helpers; then
176
	if ! use tty-helpers; then
131
		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
177
		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."

Return to bug 490968