diff options
author | joerg <joerg> | 2007-11-13 18:01:58 +0000 |
---|---|---|
committer | joerg <joerg> | 2007-11-13 18:01:58 +0000 |
commit | 56e59bea17af9f245914ad880b964ab8910f46be (patch) | |
tree | d672a096df53e4520972cba3b1ab8e1fa3637181 | |
parent | e836d3fb86bc4eeb2db978625c79f3b54b1961b3 (diff) | |
download | pkgsrc-56e59bea17af9f245914ad880b964ab8910f46be.tar.gz |
Fix build on NetBSD/amd64 and add DESTDIR support.
-rw-r--r-- | emulators/pearpc/Makefile | 15 | ||||
-rw-r--r-- | emulators/pearpc/distinfo | 5 | ||||
-rw-r--r-- | emulators/pearpc/patches/patch-aa | 4 | ||||
-rw-r--r-- | emulators/pearpc/patches/patch-ah | 13 |
4 files changed, 26 insertions, 11 deletions
diff --git a/emulators/pearpc/Makefile b/emulators/pearpc/Makefile index 5f3eeb4f5f9..1cf70b1afeb 100644 --- a/emulators/pearpc/Makefile +++ b/emulators/pearpc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2007/02/19 18:44:10 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2007/11/13 18:01:58 joerg Exp $ DISTNAME= pearpc-0.4 PKGREVISION= 1 @@ -10,6 +10,8 @@ MAINTAINER= ghen@NetBSD.org HOMEPAGE= http://pearpc.sourceforge.net/ COMMENT= PowerPC emulator +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= yes USE_LANGUAGES= c c++ @@ -25,17 +27,16 @@ CONFIGURE_ARGS+= --enable-cpu=jitc_x86 CONFIGURE_ARGS+= --disable-debug -INSTALLATION_DIRS= share/${PKGBASE} bin +INSTALLATION_DIRS= share/${PKGBASE} ${EGDIR} bin do-install: ${SED} -e "s,@PREFIX@,${PREFIX}," \ -e "s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR}," \ ${FILESDIR}/pearpc.sh > ${WRKSRC}/pearpc.sh - ${INSTALL_SCRIPT} ${WRKSRC}/pearpc.sh ${PREFIX}/bin/pearpc - ${INSTALL_PROGRAM} ${WRKSRC}/src/ppc ${PREFIX}/share/${PKGBASE} - ${INSTALL_DATA} ${WRKSRC}/video.x ${PREFIX}/share/${PKGBASE} - ${INSTALL_DATA_DIR} ${EGDIR} - ${INSTALL_DATA} ${WRKSRC}/ppccfg.example ${EGDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/pearpc.sh ${DESTDIR}${PREFIX}/bin/pearpc + ${INSTALL_PROGRAM} ${WRKSRC}/src/ppc ${DESTDIR}${PREFIX}/share/${PKGBASE} + ${INSTALL_DATA} ${WRKSRC}/video.x ${DESTDIR}${PREFIX}/share/${PKGBASE} + ${INSTALL_DATA} ${WRKSRC}/ppccfg.example ${DESTDIR}${EGDIR} SUBST_CLASSES+= conf SUBST_STAGE.conf= post-patch diff --git a/emulators/pearpc/distinfo b/emulators/pearpc/distinfo index 046388bff51..cd1ac57157e 100644 --- a/emulators/pearpc/distinfo +++ b/emulators/pearpc/distinfo @@ -1,12 +1,13 @@ -$NetBSD: distinfo,v 1.6 2006/01/12 20:57:25 joerg Exp $ +$NetBSD: distinfo,v 1.7 2007/11/13 18:01:58 joerg Exp $ SHA1 (pearpc-0.4.tar.bz2) = 1cfa4f19f9a1de73c209a38d8fda174c0ebe6ad5 RMD160 (pearpc-0.4.tar.bz2) = 84c831b3ede69721d0fa48d71a30ee0e7ec512fc Size (pearpc-0.4.tar.bz2) = 687776 bytes -SHA1 (patch-aa) = 104fce78006613853c15573971cdb691a08c6401 +SHA1 (patch-aa) = bfb350b83e10c8862b978ee0a1cb02db841576ea SHA1 (patch-ab) = c8724e43d99476d5ccae8d8782dc8bf9705743ae SHA1 (patch-ac) = e6b52cf368391fe6d09722a6ba99e5b3933c5b03 SHA1 (patch-ad) = 5932a40320c7783c8379d2af7f6d98a42707ff1b SHA1 (patch-ae) = 53dfb9a705296085bc1cdf707b9c491b0a2a4030 SHA1 (patch-af) = dd2b1c23ab00313be04ca144fbceb3416b1d7d8f SHA1 (patch-ag) = 8ec459446fd666b99345d4a8963bcf47e35b0435 +SHA1 (patch-ah) = 0ba6c0f72f3fe382aa07bf2304813417ce2fd6f9 diff --git a/emulators/pearpc/patches/patch-aa b/emulators/pearpc/patches/patch-aa index 815cdd2b968..970d1840749 100644 --- a/emulators/pearpc/patches/patch-aa +++ b/emulators/pearpc/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2005/12/22 19:27:36 ghen Exp $ +$NetBSD: patch-aa,v 1.3 2007/11/13 18:01:58 joerg Exp $ --- src/system/osapi/posix/systimer.cc.orig 2005-12-21 14:43:21.000000000 +0100 +++ src/system/osapi/posix/systimer.cc @@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.2 2005/12/22 19:27:36 ghen Exp $ #ifdef USE_POSIX_REALTIME_CLOCK static void signal_handler(int signo, siginfo_t *extra, void *junk) { -+# ifndef __NetBSD__ ++# if !defined(__NetBSD__) || defined(si_value) sys_timer_struct *timer = reinterpret_cast<sys_timer_struct *>(extra->si_value.sival_ptr); +# else + sys_timer_struct *timer = reinterpret_cast<sys_timer_struct *>(extra->si_sigval.sival_ptr); diff --git a/emulators/pearpc/patches/patch-ah b/emulators/pearpc/patches/patch-ah new file mode 100644 index 00000000000..f62cabb615a --- /dev/null +++ b/emulators/pearpc/patches/patch-ah @@ -0,0 +1,13 @@ +$NetBSD: patch-ah,v 1.1 2007/11/13 18:01:58 joerg Exp $ + +--- src/tools/crc32.cc.orig 2007-11-13 17:40:47.000000000 +0100 ++++ src/tools/crc32.cc +@@ -106,7 +106,7 @@ uint32 ether_crc(size_t len, const byte + uint32 crc = 0xffffffff; // preload shift register, per CRC-32 spec + + #ifdef RUN_FASTER +- for (; (((uint32)p)&0x03)!=0 && len>0; len--) ++ for (; (((uintptr_t)p)&0x03)!=0 && len>0; len--) + DO_CRC(*p++); // will execute if *p is not dword aligned + for (; len>=sizeof(uint32); p += sizeof(uint32), len -= sizeof(uint32)) { + uint32 data = *(uint32*)p; |