Difference of 2.3.5 to 2.3.4.20041102-r2

glibc-2.3.4.20041102-r2.ebuild.patch (text/plain), 6.89 KB, created by Yuta SATOH (RETIRED) on 2005-07-07 14:05:03 UTC

--- glibc-2.3.5.ebuild	2005-07-04 17:35:59.000000000 +0900
+++ glibc-2.3.4.20041102-r2.ebuild	2005-07-08 05:58:56.248233448 +0900
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.ebuild,v 1.27 2005/07/04 08:22:32 vapier Exp $
+# $Header: $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -16,18 +16,18 @@
 #  CHOST = CTARGET  - install into /
 #  CHOST != CTARGET - install into /usr/CTARGET/
 
-KEYWORDS="~amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="-* ppc64"
 
-BRANCH_UPDATE=""
+BRANCH_UPDATE="20041102"
 
 # From linuxthreads/man
-GLIBC_MANPAGE_VERSION="2.3.5"
+GLIBC_MANPAGE_VERSION="2.3.4"
 
 # From manual
-GLIBC_INFOPAGE_VERSION="2.3.4-r1"
+GLIBC_INFOPAGE_VERSION="2.3.4"
 
 # Gentoo patchset
-PATCH_VER="1.4"
+PATCH_VER="0.1"
 
 # C Stubbs addon (contained in fedora, so ignoring)
 #CSTUBS_VER="2.1.2"
@@ -35,9 +35,9 @@
 #CSTUBS_URI="http://dev.gentoo.org/~eradicator/glibc/${CSTUBS_TARBALL}"
 
 # Fedora addons (from RHEL's glibc-2.3.4-2.src.rpm)
-FEDORA_VER="20041219T2331"
-FEDORA_TARBALL="glibc-fedora-${FEDORA_VER}.tar.bz2"
-FEDORA_URI="http://dev.gentoo.org/~eradicator/glibc/${FEDORA_TARBALL}"
+#FEDORA_VER="20041219T2331"
+#FEDORA_TARBALL="glibc-fedora-${FEDORA_VER}.tar.bz2"
+#FEDORA_URI="http://dev.gentoo.org/~eradicator/glibc/${FEDORA_TARBALL}"
 
 GENTOO_TOOLCHAIN_BASE_URI="http://dev.gentoo.org/~eradicator/glibc"
 
@@ -65,11 +65,18 @@
 	[[ ${CHOST} != ${CTARGET} ]]
 }
 
-GLIBC_RELEASE_VER=$(get_version_component_range 1-3)
-
 # Don't set this to :-, - allows BRANCH_UPDATE=""
 BRANCH_UPDATE=${BRANCH_UPDATE-$(get_version_component_range 4)}
 
+if [ -z "${BRANCH_UPDATE}" ]; then
+	GLIBC_RELEASE_VER="$(get_version_component_range 1-3)"
+	NEW_PV="${GLIBC_RELEASE_VER}"
+else
+	GLIBC_RELEASE_VER="2.3.3"
+	NEW_PV="$(get_version_component_range 1-3)"
+	PATCH_GLIBC_VER="${NEW_PV}"
+fi
+
 # (Recent snapshots fails with 2.6.5 and earlier with NPTL)
 NPTL_KERNEL_VERSION=${NPTL_KERNEL_VERSION:-"2.6.6"}
 LT_KERNEL_VERSION=${LT_KERNEL_VERSION:-"2.4.1"}
@@ -124,13 +131,14 @@
 #	GLIBC_SRC_URI="http://ftp.gnu.org/gnu/glibc/${PN}-${GLIBC_RELEASE_VER}.tar.bz2
 #	               http://ftp.gnu.org/gnu/glibc/${PN}-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2
 #	               http://ftp.gnu.org/gnu/glibc/${PN}-libidn-${GLIBC_RELEASE_VER}.tar.bz2
-	GLIBC_SRC_URI="mirror://gnu/glibc/${PN}-${GLIBC_RELEASE_VER}.tar.bz2
-	               mirror://gnu/glibc/${PN}-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2
-	               mirror://gnu/glibc/${PN}-libidn-${GLIBC_RELEASE_VER}.tar.bz2"
+#	GLIBC_SRC_URI="mirror://gnu/glibc/${PN}-${GLIBC_RELEASE_VER}.tar.bz2
+#	               mirror://gnu/glibc/${PN}-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2
+#	               mirror://gnu/glibc/${PN}-libidn-${GLIBC_RELEASE_VER}.tar.bz2"
+	GLIBC_SRC_URI="http://dev.gentoo.org/~lv/${PN}-${GLIBC_RELEASE_VER}.tar.bz2"
 
 	if [[ -n ${BRANCH_UPDATE} ]] ; then
 		GLIBC_SRC_URI="${GLIBC_SRC_URI}
-			${GENTOO_TOOLCHAIN_BASE_URI}/${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2"
+			${GENTOO_TOOLCHAIN_BASE_URI}/${PN}-${NEW_PV}-branch-update-${BRANCH_UPDATE}.patch.bz2"
 	fi
 
 	if [[ -n ${PATCH_VER} ]] ; then
@@ -170,8 +178,8 @@
 	unpack ${PN}-${GLIBC_RELEASE_VER}.tar.bz2
 
 	cd "${S}"
-	unpack ${PN}-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2
-	unpack ${PN}-libidn-${GLIBC_RELEASE_VER}.tar.bz2
+	#unpack ${PN}-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2
+	#unpack ${PN}-libidn-${GLIBC_RELEASE_VER}.tar.bz2
 
 	[[ -n ${CSTUBS_TARBALL} ]] && unpack ${CSTUBS_TARBALL}
 	[[ -n ${FEDORA_TARBALL} ]] && unpack ${FEDORA_TARBALL}
@@ -186,10 +194,10 @@
 	# to them with branchupdate)
 	if [[ -n ${BRANCH_UPDATE} ]] ; then
 		cd "${WORKDIR}"
-		unpack ${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
+		unpack ${PN}-${NEW_PV}-branch-update-${BRANCH_UPDATE}.patch.bz2
 
 		cd "${S}"
-		epatch "${WORKDIR}"/${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch
+		epatch "${WORKDIR}"/${PN}-${NEW_PV}-branch-update-${BRANCH_UPDATE}.patch
 
 		# Snapshot date patch
 		einfo "Patching version to display snapshot date ..."
@@ -209,9 +217,11 @@
 	# XXX: do not package ssp up into tarballs, leave it in FILESDIR
 	cd "${S}"
 	cp "${FILESDIR}"/2.3.5/ssp.c sysdeps/unix/sysv/linux/ || die "could not find ssp.c"
-	rm -f "${WORKDIR}"/patches/2*
-	epatch "${FILESDIR}"/2.3.5/glibc-2.3.5-propolice-guard-functions.patch
-	epatch "${FILESDIR}"/2.3.5/glibc-2.3.5-frandom-detect.patch
+	#rm -f "${WORKDIR}"/patches/2*
+	#epatch "${FILESDIR}"/2.3.5/glibc-2.3.5-propolice-guard-functions.patch
+	#epatch "${FILESDIR}"/2.3.5/glibc-2.3.5-frandom-detect.patch
+
+	want_nptl && epatch ${S}/fedora/glibc-nptl-check.patch
 
 	if [[ -n ${PATCH_VER} ]] ; then
 		cd "${S}"
@@ -274,7 +284,7 @@
 	# 2005.0 is setup properly, and this is executed as part of the
 	# 2004.3 -> 2005.0 upgrade script.
 	# It can be removed after 2004.3 has been purged from portage.
-	use amd64 && [ "$(get_libdir)" == "lib64" ] && ! has_multilib_profile && fix_lib64_symlinks
+	( use amd64 || use ppc64 ) && [ "$(get_libdir)" == "lib64" ] && ! has_multilib_profile && fix_lib64_symlinks
 
 	# it appears that /lib/tls is sometimes not removed. See bug
 	# 69258 for more info.
@@ -942,7 +952,8 @@
 		rm ${ROOT}/lib64
 		# now that lib64 is gone, nothing will run without calling ld.so
 		# directly. luckily the window of brokenness is almost non-existant
-		/lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64
+		use amd64 && /lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64
+		use ppc64 && /lib/ld64.so.1 /bin/mv ${ROOT}/lib ${ROOT}/lib64
 		# all better :)
 		ldconfig
 		ln -s lib64 ${ROOT}/lib
@@ -1040,7 +1051,7 @@
 			powerpc64*)
 				export CFLAGS_ppc="${CFLAGS_ppc--m32}"
 				export CHOST_ppc="powerpc-unknown-linux-gnu"
-				export CDEFINE_ppc="__powerpc__"
+				export CDEFINE_ppc="!__powerpc64__"
 				export LIBDIR_ppc="lib"
 
 				export CFLAGS_ppc64="${CFLAGS_ppc64--m64}"
@@ -1295,12 +1306,18 @@
 		LIBDIR_x86="lib"
 	fi
 
+	if [[ $(tc-arch) == "ppc64" && ${ABI} == "ppc" && $(get_libdir) != "lib" ]] && ! is_crosscompile; then
+		OLD_LIBDIR="$(get_libdir)"
+		LIBDIR_ppc="lib"
+	fi
+
 	toolchain-glibc_src_install
 
 	# Handle stupid lib32 BS on amd64
 	if [[ -n ${OLD_LIBDIR} ]] ; then
 		cd ${S}
-		LIBDIR_x86="${OLD_LIBDIR}"
+		[[ $(tc-arch) == "amd64" ]] && LIBDIR_x86="${OLD_LIBDIR}"
+		[[ $(tc-arch) == "ppc64" ]] && LIBDIR_ppc="${OLD_LIBDIR}"
 		unset OLD_LIBDIR
 
 		mv ${D}/lib ${D}/$(get_libdir)
@@ -1308,7 +1325,8 @@
 		dodir /lib
 		dodir /usr/lib
 		mv ${D}/usr/$(get_libdir)/locale ${D}/usr/lib
-		dosym ../$(get_libdir)/ld-linux.so.2 /lib/ld-linux.so.2
+		[[ $(tc-arch) == "amd64" ]] && dosym ../$(get_libdir)/ld-linux.so.2 /lib/ld-linux.so.2
+		[[ $(tc-arch) == "ppc64" ]] && dosym ../$(get_libdir)/ld.so.1 /lib/ld.so.1
 
 		for f in ${D}/usr/$(get_libdir)/*.so; do
 			local basef=$(basename ${f})