Wed Mar 17 15:32:18 2010 UTC ()
Fix build on NetBSD/amd64. Not MAKE_JOBS_SAFE.


(joerg)
diff -r1.19 -r1.20 pkgsrc/devel/elfsh/Makefile
diff -r1.4 -r1.5 pkgsrc/devel/elfsh/distinfo
diff -r0 -r1.1 pkgsrc/devel/elfsh/patches/patch-ad
cvs diff -r1.19 -r1.20 pkgsrc/devel/elfsh/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/elfsh/Makefile 2009/05/20 00:58:12 1.19
+++ pkgsrc/devel/elfsh/Makefile 2010/03/17 15:32:18 1.20
@@ -1,29 +1,30 @@ @@ -1,29 +1,30 @@
1# $NetBSD: Makefile,v 1.19 2009/05/20 00:58:12 wiz Exp $ 1# $NetBSD: Makefile,v 1.20 2010/03/17 15:32:18 joerg Exp $
2# 2#
3 3
4VERS= 0.51b3 4VERS= 0.51b3
5DISTNAME= elfsh-${VERS}-portable 5DISTNAME= elfsh-${VERS}-portable
6PKGNAME= elfsh-${VERS} 6PKGNAME= elfsh-${VERS}
7PKGREVISION= 3 7PKGREVISION= 3
8CATEGORIES= devel 8CATEGORIES= devel
9MASTER_SITES= http://elfsh.asgardlabs.org/files/ 9MASTER_SITES= http://elfsh.asgardlabs.org/files/
10EXTRACT_SUFX= .tgz 10EXTRACT_SUFX= .tgz
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://elfsh.segfault.net/ 13HOMEPAGE= http://elfsh.segfault.net/
14COMMENT= ELF format exploration shell 14COMMENT= ELF format exploration shell
15 15
16PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
 17MAKE_JOBS_SAFE= no
17 18
18WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 19WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
19 20
20USE_GNU_READLINE= yes 21USE_GNU_READLINE= yes
21 22
22SUBST_CLASSES+= elfsh 23SUBST_CLASSES+= elfsh
23SUBST_STAGE.elfsh= post-patch 24SUBST_STAGE.elfsh= post-patch
24SUBST_MESSAGE.elfsh= Filling placeholders. 25SUBST_MESSAGE.elfsh= Filling placeholders.
25SUBST_FILES.elfsh= vm/include/elfsh.h 26SUBST_FILES.elfsh= vm/include/elfsh.h
26SUBST_SED.elfsh= -e s,@@SH@@,${SH}, 27SUBST_SED.elfsh= -e s,@@SH@@,${SH},
27SUBST_SED.elfsh+= -e s,@@PREFIX@@,${PREFIX}, 28SUBST_SED.elfsh+= -e s,@@PREFIX@@,${PREFIX},
28 29
29# XXX This package should be converted to use libtool 30# XXX This package should be converted to use libtool
cvs diff -r1.4 -r1.5 pkgsrc/devel/elfsh/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/elfsh/distinfo 2005/02/23 22:24:13 1.4
+++ pkgsrc/devel/elfsh/distinfo 2010/03/17 15:32:18 1.5
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.4 2005/02/23 22:24:13 agc Exp $ 1$NetBSD: distinfo,v 1.5 2010/03/17 15:32:18 joerg Exp $
2 2
3SHA1 (elfsh-0.51b3-portable.tgz) = d8afc99cb2966710aa4b6a781ad9008bf0baaeb9 3SHA1 (elfsh-0.51b3-portable.tgz) = d8afc99cb2966710aa4b6a781ad9008bf0baaeb9
4RMD160 (elfsh-0.51b3-portable.tgz) = 278b2c846335d14953b27fa8946763622acb6303 4RMD160 (elfsh-0.51b3-portable.tgz) = 278b2c846335d14953b27fa8946763622acb6303
5Size (elfsh-0.51b3-portable.tgz) = 136679 bytes 5Size (elfsh-0.51b3-portable.tgz) = 136679 bytes
6SHA1 (patch-aa) = 0494158b7daf4d1b55984bf98c161bf70e114430 6SHA1 (patch-aa) = 0494158b7daf4d1b55984bf98c161bf70e114430
7SHA1 (patch-ab) = 4db74e87f1505e4bd0334060019944eccd9f5cd3 7SHA1 (patch-ab) = 4db74e87f1505e4bd0334060019944eccd9f5cd3
8SHA1 (patch-ac) = e60e109b4e2664619defc9a56616d1c7b7c3b35a 8SHA1 (patch-ac) = e60e109b4e2664619defc9a56616d1c7b7c3b35a
 9SHA1 (patch-ad) = 4fffefc0cddd6817eba3b0812bcf6935c0fcd438
File Added: pkgsrc/devel/elfsh/patches/patch-ad
$NetBSD: patch-ad,v 1.1 2010/03/17 15:32:18 joerg Exp $

--- libelfsh/include/libelfsh-compat.h.orig	2010-03-17 15:23:59.000000000 +0000
+++ libelfsh/include/libelfsh-compat.h
@@ -38,6 +38,9 @@
 /* Portability Stuffs */
 #if defined(__OpenBSD__) || defined(__NetBSD__)
  #include <sys/exec_elf.h>
+#  if defined(__NetBSD__) && defined(__x86_64__)
+#  include <i386/elf_machdep.h>
+#  endif
 #elif defined(__linux__) || defined(__FreeBSD__) || defined(sun)
  #include <elf.h>
 #endif