The newest prelink available!

3 files changed, 75 insertions, 7 deletions

diff --git a/sys-devel/prelink/ChangeLog b/sys-devel/prelink/ChangeLog
index 59dd78fea186..9f5d92353a72 100644
--- a/sys-devel/prelink/ChangeLog
+++ b/sys-devel/prelink/ChangeLog
@@ -1,12 +1,15 @@
 # ChangeLog for sys-devel/prelink
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/ChangeLog,v 1.15 2003/04/14 09:49:39 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/ChangeLog,v 1.16 2003/04/14 12:26:18 cretin Exp $
 
 09 Mar 2003; Stefan Jones <cretin@gentoo.org> prelink-*.ebuild :
   Removed sparc from KEYWORDS as it is not supported by anyone.
 
 *prelink-20030217 (07 Mar 2003):
 
+  14 Apr 2003; Stefan Jones <cretin@gentoo.org> :
+  Added patch so compiles under sys-libs/glibc-2.3.1, moved to stable.
+
   09 Mar 2003; Stefan Jones <cretin@gentoo.org> prelink-20030217.ebuild :
   Changed DEPEND to glibc-2.3.2
 
diff --git a/sys-devel/prelink/files/prelink-20030217-glibc231.patch b/sys-devel/prelink/files/prelink-20030217-glibc231.patch
new file mode 100644
index 000000000000..bc767331950e
--- /dev/null
+++ b/sys-devel/prelink/files/prelink-20030217-glibc231.patch
@@ -0,0 +1,65 @@
+--- prelink/src/prelink.h	2003-02-17 17:27:43.000000000 +0000
++++ prelink.new/src/prelink.h	2003-04-14 13:10:29.000000000 +0100
+@@ -402,4 +402,62 @@
+ extern int verify;
+ extern GElf_Addr mmap_reg_start, mmap_reg_end;
+ 
++#if (R_390_NUM == 27)
++
++/* Additional s390 relocs */
++
++#define R_390_GOTOFF16		27	/* 16 bit offset to GOT. */
++#define R_390_GOTOFF64		28	/* 64 bit offset to GOT. */
++#define R_390_GOTPLT12		29	/* 12 bit offset to jump slot.	*/
++#define R_390_GOTPLT16		30	/* 16 bit offset to jump slot.	*/
++#define R_390_GOTPLT32		31	/* 32 bit offset to jump slot.	*/
++#define R_390_GOTPLT64		32	/* 64 bit offset to jump slot.	*/
++#define R_390_GOTPLTENT		33	/* 32 bit rel. offset to jump slot.  */
++#define R_390_PLTOFF16		34	/* 16 bit offset from GOT to PLT. */
++#define R_390_PLTOFF32		35	/* 32 bit offset from GOT to PLT. */
++#define R_390_PLTOFF64		36	/* 16 bit offset from GOT to PLT. */
++#define R_390_TLS_LOAD		37	/* Tag for load insn in TLS code.  */
++#define R_390_TLS_GDCALL	38	/* Tag for function call in general
++					   dynamic TLS code. */
++#define R_390_TLS_LDCALL	39	/* Tag for function call in local
++					   dynamic TLS code. */
++#define R_390_TLS_GD32		40	/* Direct 32 bit for general dynamic
++					   thread local data.  */
++#define R_390_TLS_GD64		41	/* Direct 64 bit for general dynamic
++					  thread local data.  */
++#define R_390_TLS_GOTIE12	42	/* 12 bit GOT offset for static TLS
++					   block offset.  */
++#define R_390_TLS_GOTIE32	43	/* 32 bit GOT offset for static TLS
++					   block offset.  */
++#define R_390_TLS_GOTIE64	44	/* 64 bit GOT offset for static TLS
++					   block offset. */
++#define R_390_TLS_LDM32		45	/* Direct 32 bit for local dynamic
++					   thread local data in LE code.  */
++#define R_390_TLS_LDM64		46	/* Direct 64 bit for local dynamic
++					   thread local data in LE code.  */
++#define R_390_TLS_IE32		47	/* 32 bit address of GOT entry for
++					   negated static TLS block offset.  */
++#define R_390_TLS_IE64		48	/* 64 bit address of GOT entry for
++					   negated static TLS block offset.  */
++#define R_390_TLS_IEENT		49	/* 32 bit rel. offset to GOT entry for
++					   negated static TLS block offset.  */
++#define R_390_TLS_LE32		50	/* 32 bit negated offset relative to
++					   static TLS block.  */
++#define R_390_TLS_LE64		51	/* 64 bit negated offset relative to
++					   static TLS block.  */
++#define R_390_TLS_LDO32		52	/* 32 bit offset relative to TLS
++					   block.  */
++#define R_390_TLS_LDO64		53	/* 64 bit offset relative to TLS
++					   block.  */
++#define R_390_TLS_DTPMOD	54	/* ID of module containing symbol.  */
++#define R_390_TLS_DTPOFF	55	/* Offset in TLS block.	 */
++#define R_390_TLS_TPOFF		56	/* Negated offset in static TLS
++					   block.  */
++
++/* Keep this the last entry.  */
++#undef R_390_NUM
++#define R_390_NUM		57
++
++#endif
++
+ #endif /* PRELINK_H */
diff --git a/sys-devel/prelink/prelink-20030217.ebuild b/sys-devel/prelink/prelink-20030217.ebuild
index 7fe2d503ffb2..23b511bce91d 100644
--- a/sys-devel/prelink/prelink-20030217.ebuild
+++ b/sys-devel/prelink/prelink-20030217.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/prelink-20030217.ebuild,v 1.4 2003/04/14 11:31:22 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/prelink-20030217.ebuild,v 1.5 2003/04/14 12:26:18 cretin Exp $
 
 IUSE=""
 
@@ -13,18 +13,20 @@ HOMEPAGE="ftp://people.redhat.com/jakub/prelink"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~alpha"
+KEYWORDS="x86 ppc alpha"
 
 DEPEND=">=dev-libs/elfutils-0.72
 	!dev-libs/libelf
-	>=sys-libs/glibc-2.3.2
+	>=sys-libs/glibc-2.3.1
 	>=sys-devel/binutils-2.13.90.0.10"
 
 
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}; epatch ${FILESDIR}/${P}-no-undosyslibs-test.patch
+	cd ${S}
+	epatch ${FILESDIR}/${P}-no-undosyslibs-test.patch
+	epatch ${FILESDIR}/${P}-glibc231.patch
 }
 
 src_compile() {
@@ -39,7 +41,5 @@ src_install() {
 
 	dodoc INSTALL TODO ChangeLog THANKS COPYING README AUTHORS NEWS
 
-	insinto /etc
-	doins ${S}/doc/prelink.conf
 }