hppa root # emerge glibc Calculating dependencies ...done! >>> emerge (1 of 1) sys-libs/glibc-2.3.4.20041006 to / >>> md5 src_uri ;-) glibc-2.3.3.tar.bz2 >>> md5 src_uri ;-) glibc-manpages-2.3.4.tar.bz2 >>> md5 src_uri ;-) glibc-infopages-2.3.4.tar.bz2 >>> md5 src_uri ;-) glibc-hppa-patches-2004-08-24.tar.gz >>> md5 src_uri ;-) glibc-2.3.4-branch-update-20041006.patch.bz2 >>> Unpacking source... >>> Unpacking glibc-2.3.3.tar.bz2 to /var/tmp/portage/glibc-2.3.4.20041006/work >>> Unpacking glibc-manpages-2.3.4.tar.bz2 to /var/tmp/portage/glibc-2.3.4.20041006/work/glibc-2.3.3/man * Applying glibc-2.3.4-branch-update-20041006.patch.bz2... [ ok ] * Patching version to display snapshot date ... >>> Unpacking glibc-infopages-2.3.4.tar.bz2 to /var/tmp/portage/glibc-2.3.4.20041006/work/glibc-2.3.3 * Applying glibc-2.3.3-frandom-detect.patch... [ ok ] * Applying glibc-2.3.4-dl_execstack-PaX-support.patch... [ ok ] * Applying glibc-2.3.3_pre20040117-pt_pax.diff... [ ok ] * Applying glibc-2.3.4.20040808-i386-got-fix.diff... [ ok ] hppa * Applying hppa specific path of 2004-08-24 ... >>> Unpacking glibc-hppa-patches-2004-08-24.tar.gz to /var/tmp/portage/glibc-2.3.4.20041006/temp * Applying elf_dl-reloc.c.diff... [ ok ] * Applying elf_dl-runtime.c.diff... [ ok ] * Applying elf_dynamic-link.h.diff... [ ok ] * Applying linuxthreads_descr.h.diff... [ ok ] * Applying linuxthreads_oldsemaphore.c.diff... [ ok ] * Applying linuxthreads_pt-machine.c.diff... [ ok ] * Applying linuxthreads_pthread.c.diff... [ ok ] * Applying linuxthreads_spinlock.c.diff... [ ok ] * Applying linuxthreads_spinlock.h.diff... [ ok ] * Applying linuxthreads_sysdeps_hppa_pspinlock.c.diff... [ ok ] * Applying linuxthreads_sysdeps_hppa_pt-machine.h.diff... [ ok ] * Applying linuxthreads_sysdeps_pthread_bits_initspin.h.diff... [ ok ] * Applying linuxthreads_sysdeps_pthread_bits_libc-lock.h.diff... [ ok ] * Applying linuxthreads_sysdeps_pthread_bits_pthreadtypes.h.diff... [ ok ] * Applying linuxthreads_sysdeps_pthread_pthread.h.diff... * Failed Patch: linuxthreads_sysdeps_pthread_pthread.h.diff! * * Include in your bugreport the contents of: * * /var/tmp/portage/glibc-2.3.4.20041006/temp/linuxthreads_sysdeps_pthread_pthread.h.diff-6207.out hppa root # cat /var/tmp/portage/glibc-2.3.4.20041006/temp/linuxthreads_sysdeps_pthread_pthread.h.diff-6207.out ***** linuxthreads_sysdeps_pthread_pthread.h.diff ***** ======================================================= PATCH COMMAND: patch -p0 -p1 < /var/tmp/portage/glibc-2.3.4.20041006/temp/glibc-hppa-patches-2004-08-24/linuxthreads_sysdeps_pthread_pthread.h.diff ======================================================= patching file linuxthreads/sysdeps/pthread/pthread.h Hunk #1 FAILED at 31. 1 out of 1 hunk FAILED -- saving rejects to file linuxthreads/sysdeps/pthread/pthread.h.rej ======================================================= PATCH COMMAND: patch -p1 -p1 < /var/tmp/portage/glibc-2.3.4.20041006/temp/glibc-hppa-patches-2004-08-24/linuxthreads_sysdeps_pthread_pthread.h.diff ======================================================= patching file linuxthreads/sysdeps/pthread/pthread.h Hunk #1 FAILED at 31. 1 out of 1 hunk FAILED -- saving rejects to file linuxthreads/sysdeps/pthread/pthread.h.rej ======================================================= PATCH COMMAND: patch -p2 -p1 < /var/tmp/portage/glibc-2.3.4.20041006/temp/glibc-hppa-patches-2004-08-24/linuxthreads_sysdeps_pthread_pthread.h.diff ======================================================= patching file linuxthreads/sysdeps/pthread/pthread.h Hunk #1 FAILED at 31. 1 out of 1 hunk FAILED -- saving rejects to file linuxthreads/sysdeps/pthread/pthread.h.rej ======================================================= PATCH COMMAND: patch -p3 -p1 < /var/tmp/portage/glibc-2.3.4.20041006/temp/glibc-hppa-patches-2004-08-24/linuxthreads_sysdeps_pthread_pthread.h.diff ======================================================= patching file linuxthreads/sysdeps/pthread/pthread.h Hunk #1 FAILED at 31. 1 out of 1 hunk FAILED -- saving rejects to file linuxthreads/sysdeps/pthread/pthread.h.rej ======================================================= PATCH COMMAND: patch -p4 -p1 < /var/tmp/portage/glibc-2.3.4.20041006/temp/glibc-hppa-patches-2004-08-24/linuxthreads_sysdeps_pthread_pthread.h.diff ======================================================= patching file linuxthreads/sysdeps/pthread/pthread.h Hunk #1 FAILED at 31. 1 out of 1 hunk FAILED -- saving rejects to file linuxthreads/sysdeps/pthread/pthread.h.rej hppa pthread # cat pthread.h.rej *************** *** 31,56 **** /* Initializers. */ #define PTHREAD_MUTEX_INITIALIZER \ - {0, 0, 0, PTHREAD_MUTEX_TIMED_NP, __LOCK_INITIALIZER} #ifdef __USE_GNU # define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP \ - {0, 0, 0, PTHREAD_MUTEX_RECURSIVE_NP, __LOCK_INITIALIZER} # define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP \ - {0, 0, 0, PTHREAD_MUTEX_ERRORCHECK_NP, __LOCK_INITIALIZER} # define PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP \ - {0, 0, 0, PTHREAD_MUTEX_ADAPTIVE_NP, __LOCK_INITIALIZER} #endif - #define PTHREAD_COND_INITIALIZER {__LOCK_INITIALIZER, 0, "", 0} #ifdef __USE_UNIX98 # define PTHREAD_RWLOCK_INITIALIZER \ - { __LOCK_INITIALIZER, 0, NULL, NULL, NULL, \ PTHREAD_RWLOCK_DEFAULT_NP, PTHREAD_PROCESS_PRIVATE } #endif #ifdef __USE_GNU # define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \ - { __LOCK_INITIALIZER, 0, NULL, NULL, NULL, \ PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP, PTHREAD_PROCESS_PRIVATE } #endif --- 31,56 ---- /* Initializers. */ #define PTHREAD_MUTEX_INITIALIZER \ + {0, 0, 0, PTHREAD_MUTEX_TIMED_NP, __LOCK_ALT_INITIALIZER} #ifdef __USE_GNU # define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP \ + {0, 0, 0, PTHREAD_MUTEX_RECURSIVE_NP, __LOCK_ALT_INITIALIZER} # define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP \ + {0, 0, 0, PTHREAD_MUTEX_ERRORCHECK_NP, __LOCK_ALT_INITIALIZER} # define PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP \ + {0, 0, 0, PTHREAD_MUTEX_ADAPTIVE_NP, __LOCK_ALT_INITIALIZER} #endif + #define PTHREAD_COND_INITIALIZER {__LOCK_ALT_INITIALIZER, 0, "", 0} #ifdef __USE_UNIX98 # define PTHREAD_RWLOCK_INITIALIZER \ + { __LOCK_ALT_INITIALIZER, 0, NULL, NULL, NULL, \ PTHREAD_RWLOCK_DEFAULT_NP, PTHREAD_PROCESS_PRIVATE } #endif #ifdef __USE_GNU # define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \ + { __LOCK_ALT_INITIALIZER, 0, NULL, NULL, NULL, \ PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP, PTHREAD_PROCESS_PRIVATE } #endif The pthread.h.rej wasn't actually generated when the ebuild tried to apply the patch, but when I tried to apply the patch manually with 'patch -p4 < /var/tmp/portage/glibc-2.3.4.20041006/temp/glibc-hppa-patches-2004-08-24/linuxthreads_sysdeps_pthread_pthread.h.diff' in linuxthreads/sysdeps/pthread it generated the above one.
Fixed in cvs. I marked this glibc -hppa since it was never tested and problems have been reported on the parisc-linux mailing list.
I still always forgot to click on this "Resolv bug" button :)
