diff options
author | dholland <dholland@pkgsrc.org> | 2011-11-26 15:50:27 +0000 |
---|---|---|
committer | dholland <dholland@pkgsrc.org> | 2011-11-26 15:50:27 +0000 |
commit | 61deb47f8191a40ad02789b6db23256c259ef910 (patch) | |
tree | 8a9c6bdd08241517835ef8095b4c93da2f82bc54 /devel/elftoolchain | |
parent | 4fec68da336ce7f412acdef8d5f96fe71b1b7fa9 (diff) | |
download | pkgsrc-61deb47f8191a40ad02789b6db23256c259ef910.tar.gz |
Add a minor version to the shared libraries; otherwise a bootstrapped
build does e.g. "ln -sf libelf.so.1 libelf.so.1" and then install
fails with ELOOP.
This is a bug in bootstrap-mk-files but I'm going to fix it in both
places to avoid demanding rebootstrapping.
Diffstat (limited to 'devel/elftoolchain')
-rw-r--r-- | devel/elftoolchain/Makefile | 3 | ||||
-rw-r--r-- | devel/elftoolchain/PLIST | 5 | ||||
-rw-r--r-- | devel/elftoolchain/distinfo | 5 | ||||
-rw-r--r-- | devel/elftoolchain/patches/patch-libdwarf_Makefile | 18 | ||||
-rw-r--r-- | devel/elftoolchain/patches/patch-libelf_Makefile | 18 | ||||
-rw-r--r-- | devel/elftoolchain/patches/patch-libelftc_Makefile | 18 |
6 files changed, 64 insertions, 3 deletions
diff --git a/devel/elftoolchain/Makefile b/devel/elftoolchain/Makefile index 5d82cf9b995..26c32309b18 100644 --- a/devel/elftoolchain/Makefile +++ b/devel/elftoolchain/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2011/11/25 21:39:07 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2011/11/26 15:50:27 dholland Exp $ DISTNAME= elftoolchain-0.5.1 +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=elftoolchain/${DISTNAME}/} EXTRACT_SUFX= .tar.bz2 diff --git a/devel/elftoolchain/PLIST b/devel/elftoolchain/PLIST index f8071002186..92962dbe529 100644 --- a/devel/elftoolchain/PLIST +++ b/devel/elftoolchain/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2011/11/20 06:25:18 agc Exp $ +@comment $NetBSD: PLIST,v 1.2 2011/11/26 15:50:27 dholland Exp $ bin/addr2line bin/ar bin/brandelf @@ -16,16 +16,19 @@ bin/strip lib/libdwarf.a lib/libdwarf.so lib/libdwarf.so.3 +lib/libdwarf.so.3.0 lib/libdwarf_p.a lib/libdwarf_pic.a lib/libelf.a lib/libelf.so lib/libelf.so.1 +lib/libelf.so.1.0 lib/libelf_p.a lib/libelf_pic.a lib/libelftc.a lib/libelftc.so lib/libelftc.so.1 +lib/libelftc.so.1.0 lib/libelftc_p.a lib/libelftc_pic.a man/cat1/addr2line.0 diff --git a/devel/elftoolchain/distinfo b/devel/elftoolchain/distinfo index 6c1f0538c4d..60b1ca81dca 100644 --- a/devel/elftoolchain/distinfo +++ b/devel/elftoolchain/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2011/11/20 06:25:18 agc Exp $ +$NetBSD: distinfo,v 1.2 2011/11/26 15:50:27 dholland Exp $ SHA1 (elftoolchain-0.5.1.tar.bz2) = 333cfce857ca220177d0a5d111d40afca1eea0c7 RMD160 (elftoolchain-0.5.1.tar.bz2) = 4be0adf8349c764474810e23cfb022c655002d77 @@ -17,3 +17,6 @@ SHA1 (patch-ak) = 699aeca92ce35f57988b6135c6b7f3a8f533825f SHA1 (patch-al) = 1ca5bb02b4bf8b4d0820747c3398d1f5f317c66c SHA1 (patch-am) = 286bd77aef36812b60fb29218368573b74ac892e SHA1 (patch-an) = 6de919bb0cf3f406c9b5addcf868c57d5d71403e +SHA1 (patch-libdwarf_Makefile) = bea37cf65de237146dc51a71aed04581bc6c1d95 +SHA1 (patch-libelf_Makefile) = 29fdcead0e1d01ba2cf1d9e16e9d50bc041c9eec +SHA1 (patch-libelftc_Makefile) = a91f55e598482123a04dd5e50e5d992a8d866036 diff --git a/devel/elftoolchain/patches/patch-libdwarf_Makefile b/devel/elftoolchain/patches/patch-libdwarf_Makefile new file mode 100644 index 00000000000..d986602d07d --- /dev/null +++ b/devel/elftoolchain/patches/patch-libdwarf_Makefile @@ -0,0 +1,18 @@ +$NetBSD: patch-libdwarf_Makefile,v 1.1 2011/11/26 15:50:27 dholland Exp $ + +Add a minor version to libdwarf.so; otherwise a bootstrapped build does +"ln -sf libdwarf.so.3 libdwarf.so.3" and then install fails with ELOOP. + +This is a bug in bootstrap-mk-files but I'm going to fix it in both +places to avoid demanding rebootstrapping. + +--- libdwarf/Makefile~ 2011-10-27 03:47:28.000000000 +0000 ++++ libdwarf/Makefile +@@ -79,6 +79,7 @@ GENSRCS= dwarf_pubnames.c dwarf_pubtypes + CLEANFILES= ${GENSRCS} + + SHLIB_MAJOR= 3 ++SHLIB_MINOR= 0 + + WARNS?= 6 + diff --git a/devel/elftoolchain/patches/patch-libelf_Makefile b/devel/elftoolchain/patches/patch-libelf_Makefile new file mode 100644 index 00000000000..2a4dd7307a3 --- /dev/null +++ b/devel/elftoolchain/patches/patch-libelf_Makefile @@ -0,0 +1,18 @@ +$NetBSD: patch-libelf_Makefile,v 1.1 2011/11/26 15:50:27 dholland Exp $ + +Add a minor version to libelf.so; otherwise a bootstrapped build does +"ln -sf libelf.so.1 libelf.so.1" and then install fails with ELOOP. + +This is a bug in bootstrap-mk-files but I'm going to fix it in both +places to avoid demanding rebootstrapping. + +--- libelf/Makefile~ 2011-01-01 11:17:52.000000000 +0000 ++++ libelf/Makefile +@@ -61,6 +61,7 @@ GENSRCS= libelf_fsize.c libelf_msize.c l + CLEANFILES= ${GENSRCS} + + SHLIB_MAJOR= 1 ++SHLIB_MINOR= 0 + + WARNS?= 6 + diff --git a/devel/elftoolchain/patches/patch-libelftc_Makefile b/devel/elftoolchain/patches/patch-libelftc_Makefile new file mode 100644 index 00000000000..01441384e37 --- /dev/null +++ b/devel/elftoolchain/patches/patch-libelftc_Makefile @@ -0,0 +1,18 @@ +$NetBSD: patch-libelftc_Makefile,v 1.1 2011/11/26 15:50:27 dholland Exp $ + +Add a minor version to libelftc.so; otherwise a bootstrapped build does +"ln -sf libelftc.so.1 libelftc.so.1" and then install fails with ELOOP. + +This is a bug in bootstrap-mk-files but I'm going to fix it in both +places to avoid demanding rebootstrapping. + +--- libelftc/Makefile~ 2011-11-26 15:18:44.000000000 +0000 ++++ libelftc/Makefile +@@ -17,6 +17,7 @@ INCS= libelftc.h + BRANCH= 0.5.1 # Change this on release branches. + + SHLIB_MAJOR= 1 ++SHLIB_MINOR= 0 + + WARNS?= 6 + |