diff options
author | Martin Schlemmer <azarah@gentoo.org> | 2002-11-16 18:28:29 +0000 |
---|---|---|
committer | Martin Schlemmer <azarah@gentoo.org> | 2002-11-16 18:28:29 +0000 |
commit | d2ef53f7d2284570ecda5d3e24750988ab81d7a7 (patch) | |
tree | a54ef996b2120652b72f8d8daa9e129bdd84a844 /sys-libs | |
parent | Initial import of bookmarksync. This closes bug #7168. (diff) | |
download | gentoo-2-d2ef53f7d2284570ecda5d3e24750988ab81d7a7.tar.gz gentoo-2-d2ef53f7d2284570ecda5d3e24750988ab81d7a7.tar.bz2 gentoo-2-d2ef53f7d2284570ecda5d3e24750988ab81d7a7.zip |
fix manpages not installing, bug #10645.
Diffstat (limited to 'sys-libs')
-rw-r--r-- | sys-libs/glibc/ChangeLog | 7 | ||||
-rw-r--r-- | sys-libs/glibc/files/2.3.1/glibc-2.3.1-libc_wait-compat.patch | 36 | ||||
-rw-r--r-- | sys-libs/glibc/files/digest-glibc-2.3.1-r1 | 2 | ||||
-rw-r--r-- | sys-libs/glibc/glibc-2.3.1-r1.ebuild | 229 | ||||
-rw-r--r-- | sys-libs/glibc/glibc-2.3.1-r2.ebuild | 18 |
5 files changed, 34 insertions, 258 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index 06b7008cd215..4251d83d0a8c 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,9 +1,14 @@ # ChangeLog for sys-libs/glibc # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.28 2002/11/16 10:48:35 cretin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.29 2002/11/16 18:28:29 azarah Exp $ *glibc-2.3.1-r2 (7 Nov 2002) + 16 Nov 2002; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.1-r2.ebuild : + + Fix type-o that caused manpages not installing (bug #10645). + Update to use epatch. + 16 Nov 2002: Stefan Jones <cretin@gentoo.org> glibc-2.3.1-r2.ebuild : Changed --with-header to --with-headers to fix fake configure option. diff --git a/sys-libs/glibc/files/2.3.1/glibc-2.3.1-libc_wait-compat.patch b/sys-libs/glibc/files/2.3.1/glibc-2.3.1-libc_wait-compat.patch index db4bfe27f861..d6f8bf51ab7b 100644 --- a/sys-libs/glibc/files/2.3.1/glibc-2.3.1-libc_wait-compat.patch +++ b/sys-libs/glibc/files/2.3.1/glibc-2.3.1-libc_wait-compat.patch @@ -1,26 +1,32 @@ -2002-04-19 Bruno Haible <bruno@clisp.org> - - * posix/Versions: Move back __libc_wait to GLIBC_2.0 section. - --- glibc-20020408/posix/Versions.bak 2002-02-04 12:42:40.000000000 +0100 +++ glibc-20020408/posix/Versions 2002-04-19 01:01:00.000000000 +0200 -@@ -14,6 +14,9 @@ - # functions used by libstdc++ 2.7.2 - __waitpid; +@@ -3,6 +3,9 @@ + # functions with special/multiple interfaces + __bsd_getpgrp; __setpgid; __getpgid; -+ # functions used by SunJava2-1.3.1/jre/lib/i386/libjava.so -+ __libc_wait; ++ # This will be GLIBC_PRIVATE, just give Sun JDK some time to catch up ++ __libc_wait; __libc_waitpid; + - # global variables - __environ; _environ; + # functions with required interface outside normal name space + _exit; -@@ -108,7 +111,7 @@ +@@ -83,6 +86,9 @@ + GLIBC_2.1.2 { + # functions used in other libraries + __vfork; ++ ++ # This will be GLIBC_PRIVATE, just give wine some time to catch up ++ __libc_fork; + } + GLIBC_2.2 { + # p* +@@ -109,6 +115,7 @@ GLIBC_PRIVATE { # functions which have an additional interface since they are # are cancelable. - __libc_wait; __libc_waitpid; __libc_pause; __libc_nanosleep; __libc_fork; -+ __libc_waitpid; __libc_pause; __libc_nanosleep; __libc_fork; ++ # __libc_wait; __libc_waitpid; ++ __libc_pause; __libc_nanosleep; # __libc_fork; __libc_pread; __libc_pread64; __libc_pwrite; __libc_pwrite64; + __waitid; __pselect; } - } - diff --git a/sys-libs/glibc/files/digest-glibc-2.3.1-r1 b/sys-libs/glibc/files/digest-glibc-2.3.1-r1 deleted file mode 100644 index a0effd0be274..000000000000 --- a/sys-libs/glibc/files/digest-glibc-2.3.1-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 e8e7ffcb86f921c5b597008bf6f891bd glibc-2.3.1.tar.gz 17882515 -MD5 73a5b953b89c8ebeb534bf59822dde07 glibc-linuxthreads-2.3.1.tar.gz 244012 diff --git a/sys-libs/glibc/glibc-2.3.1-r1.ebuild b/sys-libs/glibc/glibc-2.3.1-r1.ebuild deleted file mode 100644 index 3bf9837eb8c5..000000000000 --- a/sys-libs/glibc/glibc-2.3.1-r1.ebuild +++ /dev/null @@ -1,229 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.1-r1.ebuild,v 1.3 2002/11/16 10:48:35 cretin Exp $ - -IUSE="nls pic build" - -inherit flag-o-matic gcc - -filter-flags "-fomit-frame-pointer -malign-double" - -# Recently there has been a lot of stability problem in Gentoo-land. Many -# things can be the cause to this, but I believe that it is due to gcc3 -# still having issues with optimizations, or with it not filtering bad -# combinations (protecting the user maybe from himeself) yet. -# -# This can clearly be seen in large builds like glibc, where too aggressive -# CFLAGS cause the tests to fail miserbly. -# -# Quote from Nick Jones <carpaski@gentoo.org>, who in my opinion -# knows what he is talking about: -# -# People really shouldn't force code-specific options on... It's a -# bad idea. The -march options aren't just to look pretty. They enable -# options that are sensible (and include sse,mmx,3dnow when apropriate). -# -# The next command strips CFLAGS and CXXFLAGS from nearly all flags. If -# you do not like it, comment it, but do not bugreport if you run into -# problems. -# -# <azarah@gentoo.org> (13 Oct 2002) -strip-flags - -# Lock glibc at -O2 -- linuxthreads needs it and we want to be conservative here -export CFLAGS="${CFLAGS//-O?} -O2" -export CXXFLAGS="${CFLAGS}" - -S="${WORKDIR}/${P}" -DESCRIPTION="GNU libc6 (also called glibc2) C library" -SRC_URI="http://ftp.gnu.org/gnu/glibc/glibc-${PV}.tar.gz - http://ftp.gnu.org/gnu/glibc/glibc-linuxthreads-${PV}.tar.gz" -HOMEPAGE="http://www.gnu.org/software/libc/libc.html" - -KEYWORDS="~x86 ~ppc ~sparc ~sparc64 ~alpha" -# Is 99% compadible, just some .a's bork -SLOT="2.2" -LICENSE="GPL-2" - -# Portage-1.8.9 needed for smart library merging feature (avoids segfaults on glibc upgrade) -# Drobbins, 18 Mar 2002: we now rely on the system profile to select the correct linus-headers -DEPEND=">=sys-devel/gcc-3.2-r1 - >=sys-devel/binutils-2.13.90.0.4-r1 - sys-kernel/linux-headers - nls? ( sys-devel/gettext )" -RDEPEND="sys-kernel/linux-headers - sys-apps/baselayout - nls? ( sys-devel/gettext ) - build? ( >=sys-apps/portage-1.9.0 )" - -PROVIDE="virtual/glibc" - - -pkg_config() { - if [ "`gcc-major-version`" -ne "3" -o "`gcc-minor-version`" -lt "2" ] - then - eerror "As of glibc-2.3, gcc-3.2 or later is needed" - eerror "for the build to succeed." - die "GCC too old" - fi -} - -src_unpack() { - unpack glibc-${PV}.tar.gz || die - # Extract pre-made man pages. Otherwise we need perl, which is a no-no. - mkdir man; cd man - tar xjf ${FILESDIR}/glibc-manpages-${PV}.tar.bz2 || die - cd ${S} - unpack glibc-linuxthreads-${PV}.tar.gz || die - - # This next patch fixes a test that will timeout due to ReiserFS' slow handling of sparse files - einfo "Applying test-lfs-timeout patch..." - cd ${S}/io; patch -p0 < ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch > /dev/null || die - - # This add back glibc 2.2 compadibility. See bug #8766 and #9586 for more info, - # and also: - # - # http://lists.debian.org/debian-glibc/2002/debian-glibc-200210/msg00093.html - # - # We should think about remoing it in the future after things have settled. - # - # Thanks to Jan Gutter <jangutter@tuks.co.za> for reporting it. - # - # <azarah@gentoo.org> (26 Oct 2002). - einfo "Applying ctype-compat patch..." - cd ${S}; patch -p1 < ${FILESDIR}/${PV}/${P}-ctype-compat.patch > /dev/null || die - - # One more compat issue which breaks sun-jdk-1.3.1. See bug #8766 for more - # info, and also: - # - # http://sources.redhat.com/ml/libc-alpha/2002-04/msg00143.html - # - # Thanks to Jan Gutter <jangutter@tuks.co.za> for reporting it. - # - # <azarah@gentoo.org> (30 Oct 2002). - einfo "Applying libc_wait-compat patch..." - cd ${S}; patch -p1 < ${FILESDIR}/${PV}/${P}-libc_wait-compat.patch > /dev/null || die -} - -src_compile() { - local myconf="" - - # If we build for the build system we use the kernel headers from the target - use build \ - && myconf="${myconf} --with-headers=${ROOT}usr/include" - # Set it without "build" as well, else it might use the current kernel's - # headers, which might just fail (the linux-headers package is usually well - # tested...) - - use nls || myconf="${myconf} --disable-nls" - - # Thread Local Storage support. This dont really work as of yet... -# use x86 && use tls \ -# && myconf="${myconf} --with-tls" - myconf="${myconf} --without-tls" - - if [ "`uname -r | cut -d. -f2`" -ge "4" ] - then - myconf="${myconf} --enable-kernel=2.4.0" - fi - - einfo "Configuring GLIBC..." - rm -rf buildhere - mkdir buildhere - cd buildhere - ../configure --host=${CHOST} \ - --with-gd=no \ - --without-cvs \ - --enable-add-ons=yes \ - --disable-profile \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --libexecdir=/usr/lib/misc \ - ${myconf} || die - - einfo "Building GLIBC..." - make PARALLELMFLAGS="${MAKEOPTS}" || die -# einfo "Doing GLIBC checks..." -# make check -} - - -src_install() { - export LC_ALL="C" - einfo "Installing GLIBC..." - make PARALLELMFLAGS="${MAKEOPTS}" \ - install_root=${D} \ - install -C buildhere || die - - if [ -z "`use build`" ] - then - einfo "Installing Info pages..." - make PARALLELMFLAGS="${MAKEOPTS}" \ - install_root=${D} \ - info -C buildhere || die - - einfo "Installing Locale data..." - make PARALLELMFLAGS="${MAKEOPTS}" \ - install_root=${D} \ - localedata/install-locales -C buildhere || die - - einfo "Installing man pages and docs..." - # Install linuxthreads man pages - dodir /usr/share/man/man3 - doman ${S}/man/*.3thr - - # Install nscd config file - insinto /etc - doins ${S}/nscd/nscd.conf - - dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE \ - NEWS NOTES PROJECTS README* - else - rm -rf ${D}/usr/share ${D}/usr/lib/gconv - fi - - if [ "`use pic`" ] - then - find ${S}/buildhere -name "soinit.os" -exec cp {} ${D}/lib/soinit.o \; - find ${S}/buildhere -name "sofini.os" -exec cp {} ${D}/lib/sofini.o \; - find ${S}/buildhere -name "*_pic.a" -exec cp {} ${D}/lib \; - find ${S}/buildhere -name "*.map" -exec cp {} ${D}/lib \; - for i in ${D}/lib/*.map - do - mv ${i} ${i%.map}_pic.map - done - fi - - # Is this next line actually needed or does the makefile get it right? - # It previously has 0755 perms which was killing things. - fperms 4755 /usr/lib/misc/pt_chown - - rm -f ${D}/etc/ld.so.cache - - # Prevent overwriting of the /etc/localtime symlink. We'll handle the - # creation of the "factory" symlink in pkg_postinst(). - rm -f ${D}/etc/localtime - - # Some things want this, notably ash. - dosym /usr/lib/libbsd-compat.a /usr/lib/libbsd.a -} - -pkg_postinst() { - # Correct me if I am wrong here, but my /etc/localtime is a file - # created by zic .... - # I am thinking that it should only be recreated if no /etc/localtime - # exists, or if it is an invalid symlink. - # - # For invalid symlink: - # -f && -e will fail - # -L will succeed - # - if [ ! -e ${ROOT}/etc/localtime ] - then - echo "Please remember to set your timezone using the zic command." - rm -f ${ROOT}/etc/localtime - ln -s ../usr/share/zoneinfo/Factory ${ROOT}/etc/localtime - fi -} - diff --git a/sys-libs/glibc/glibc-2.3.1-r2.ebuild b/sys-libs/glibc/glibc-2.3.1-r2.ebuild index 3b7c2c7f5a32..d5c39c5e829e 100644 --- a/sys-libs/glibc/glibc-2.3.1-r2.ebuild +++ b/sys-libs/glibc/glibc-2.3.1-r2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.1-r2.ebuild,v 1.3 2002/11/16 10:48:35 cretin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.1-r2.ebuild,v 1.4 2002/11/16 18:28:29 azarah Exp $ IUSE="nls pic build" -inherit flag-o-matic gcc +inherit eutils flag-o-matic gcc filter-flags "-fomit-frame-pointer -malign-double" @@ -71,14 +71,13 @@ pkg_config() { src_unpack() { unpack glibc-${PV}.tar.gz || die # Extract pre-made man pages. Otherwise we need perl, which is a no-no. - mkdir man; cd man + mkdir -p ${S}/man; cd ${S}/man tar xjf ${FILESDIR}/glibc-manpages-${PV}.tar.bz2 || die cd ${S} unpack glibc-linuxthreads-${PV}.tar.gz || die # This next patch fixes a test that will timeout due to ReiserFS' slow handling of sparse files - einfo "Applying test-lfs-timeout patch..." - cd ${S}/io; patch -p0 < ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch > /dev/null || die + cd ${S}/io; epatch ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch # This add back glibc 2.2 compadibility. See bug #8766 and #9586 for more info, # and also: @@ -90,8 +89,7 @@ src_unpack() { # Thanks to Jan Gutter <jangutter@tuks.co.za> for reporting it. # # <azarah@gentoo.org> (26 Oct 2002). - einfo "Applying ctype-compat patch..." - cd ${S}; patch -p1 < ${FILESDIR}/${PV}/${P}-ctype-compat-v2.patch > /dev/null || die + cd ${S}; epatch ${FILESDIR}/${PV}/${P}-ctype-compat-v2.patch # One more compat issue which breaks sun-jdk-1.3.1. See bug #8766 for more # info, and also: @@ -101,16 +99,14 @@ src_unpack() { # Thanks to Jan Gutter <jangutter@tuks.co.za> for reporting it. # # <azarah@gentoo.org> (30 Oct 2002). - einfo "Applying libc_wait-compat patch..." - cd ${S}; patch -p1 < ${FILESDIR}/${PV}/${P}-libc_wait-compat.patch > /dev/null || die + cd ${S}; epatch ${FILESDIR}/${PV}/${P}-libc_wait-compat.patch # One more compat issue ... libc_stack_end is missing from ld.so. # Got this one from diffing redhat glibc tarball .. would help if # they used patches and not modified tarball ... # # <azarah@gentoo.org> (7 Nov 2002). - einfo "Applying stack_end-compat patch..." - cd ${S}; patch -p1 < ${FILESDIR}/${PV}/${P}-stack_end-compat.patch > /dev/null || die + cd ${S}; epatch ${FILESDIR}/${PV}/${P}-stack_end-compat.patch } src_compile() { |