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

Collapse All | Expand All

(-)glibc-2.3.3.20040420-r1.ebuild (-21 / +25 lines)
Lines 133-160 use_nptl() { Link Here
133
	return 1
133
	return 1
134
}
134
}
135
135
136
pkg_setup() {
136
glibc_setup() {
137
	# Check if we are going to downgrade, we don't like that
137
	# Check if we are going to downgrade, we don't like that
138
	local old_version
138
	#local old_version
139
139
	#
140
	old_version="`best_version glibc`"
140
	#old_version="`best_version glibc`"
141
	old_version="${old_version/sys-libs\/glibc-/}"
141
	#old_version="${old_version/sys-libs\/glibc-/}"
142
142
	#
143
	if [ "$old_version" ]; then
143
	#if [ "$old_version" ]; then
144
		if [ `python -c "import portage; print int(portage.vercmp(\"${PV}\",\"$old_version\"))"` -lt 0 ]; then
144
	# The vercmp fails if this ebuild is -r[0-9..] Please fix.
145
			if [ "${FORCE_DOWNGRADE}" ]; then
145
	#	if [ `python -c "import portage; print int(portage.vercmp(\"${PV}\",\"$old_version\"))"` -lt 0 ]; then
146
				ewarn "downgrading glibc, still not recommended, but we'll do as you wish"
146
	#		if [ "${FORCE_DOWNGRADE}" ]; then
147
			else
147
	#			ewarn "downgrading glibc, still not recommended, but we'll do as you wish"
148
				eerror "Downgrading glibc is not supported and we strongly recommend that"
148
	#		else
149
				eerror "you don't do it as it WILL break all applications compiled against"
149
	#			eerror "Downgrading glibc is not supported and we strongly recommend that"
150
				eerror "the new version (most likely including python and portage)."
150
	#			eerror "you don't do it as it WILL break all applications compiled against"
151
				eerror "If you are REALLY sure that you want to do it set "
151
	#			eerror "the new version (most likely including python and portage)."
152
				eerror "     FORCE_DOWNGRADE=1"
152
	#			eerror "If you are REALLY sure that you want to do it set "
153
				eerror "when you try it again."
153
	#			eerror "     FORCE_DOWNGRADE=1"
154
				die "glibc downgrade"
154
	#			eerror "when you try it again."
155
			fi
155
	#			die "glibc downgrade"
156
		fi
156
	#		fi
157
	fi
157
	#	fi
158
	#fi
158
159
159
	# We need gcc 3.2 or later ...
160
	# We need gcc 3.2 or later ...
160
	if [ "`gcc-major-version`" -ne "3" -o "`gcc-minor-version`" -lt "2" ]
161
	if [ "`gcc-major-version`" -ne "3" -o "`gcc-minor-version`" -lt "2" ]
Lines 246-251 src_unpack() { Link Here
246
247
247
	local LOCAL_P="${PN}-${MY_PV}"
248
	local LOCAL_P="${PN}-${MY_PV}"
248
249
250
	# we only need to check this one time. Bug #61856
251
	glibc_setup
252
249
	unpack glibc-${MY_PV}.tar.bz2
253
	unpack glibc-${MY_PV}.tar.bz2
250
254
251
	# Extract pre-made man pages.  Otherwise we need perl, which is a no-no.
255
	# Extract pre-made man pages.  Otherwise we need perl, which is a no-no.
(-)glibc-2.3.4.20040619-r1.ebuild (-1 / +5 lines)
Lines 273-279 setup_locales() { Link Here
273
}
273
}
274
274
275
275
276
pkg_setup() {
276
glibc_setup() {
277
	# genone this block of code breaks things. 
277
	# genone this block of code breaks things. 
278
	# Check if we are going to downgrade, we don't like that
278
	# Check if we are going to downgrade, we don't like that
279
	#local old_version
279
	#local old_version
Lines 476-481 do_ssp_patches() { Link Here
476
476
477
477
478
src_unpack() {
478
src_unpack() {
479
480
	# we only need to check this one time. Bug #61856
481
	glibc_setup
482
479
	# Check NPTL support _before_ we unpack things to save some time
483
	# Check NPTL support _before_ we unpack things to save some time
480
	want_nptl && check_nptl_support
484
	want_nptl && check_nptl_support
481
485

Return to bug 61856