diff options
| author | Edwin Groothuis <edwin@FreeBSD.org> | 2004-10-13 00:09:07 +0000 |
|---|---|---|
| committer | Edwin Groothuis <edwin@FreeBSD.org> | 2004-10-13 00:09:07 +0000 |
| commit | 1b791a4c00dd82ef09c7f3feda1f13a8dcf51917 (patch) | |
| tree | 05f167f7a44b5bbf783651290f7f41d527fcdc47 /emulators | |
| parent | [MAINTAINER] www/wordpress: update to 1.2.1 for security and bug fixes (diff) | |
[ maintainer ] emulators/pearpc: fix SDL build via update, fix build with JITC
PearPC 0.3.1 includes my patch for configure.in which makes
SDL usable and fixes stdint.h/inttypes.h trouble.
Fix build with JITC cpu for gcc34
PR: ports/72442
Submitted by: Roman Bogorodskiy <bogorodskiy@inbox.ru>
Notes
Notes:
svn path=/head/; revision=119120
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/pearpc/Makefile | 14 | ||||
| -rw-r--r-- | emulators/pearpc/distinfo | 4 | ||||
| -rw-r--r-- | emulators/pearpc/files/patch-gcc34 | 41 |
3 files changed, 51 insertions, 8 deletions
diff --git a/emulators/pearpc/Makefile b/emulators/pearpc/Makefile index 80606eb90f8b..2fdf58efff8e 100644 --- a/emulators/pearpc/Makefile +++ b/emulators/pearpc/Makefile @@ -6,7 +6,7 @@ # PORTNAME= pearpc -PORTVERSION= 0.3.0 +PORTVERSION= 0.3.1 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -42,6 +42,13 @@ CONFIGURE_ARGS+= --disable-fpo #CONFIGURE_ARGS+= --enable-ui=nogui #.endif +.if defined(WITH_SDL) +CONFIGURE_ARGS+= --enable-ui=sdl +USE_SDL= sdl +.else +CONFIGURE_ARGS+= --enable-ui=x11 +.endif + .include <bsd.port.pre.mk> # jitc_x86 is avaible only on x86 @@ -68,11 +75,6 @@ pre-everything:: @${ECHO_MSG} "" .endif -post-patch: -.if ${OSVERSION} < 500000 - @${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|' ${WRKSRC}/src/system/osapi/posix/types.h -.endif - post-configure: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/src/Makefile diff --git a/emulators/pearpc/distinfo b/emulators/pearpc/distinfo index 2781613a9e30..e084f807a182 100644 --- a/emulators/pearpc/distinfo +++ b/emulators/pearpc/distinfo @@ -1,2 +1,2 @@ -MD5 (pearpc-0.3.0.tar.gz) = 6d68187c78cae674a5efa6662c4cdb22 -SIZE (pearpc-0.3.0.tar.gz) = 814686 +MD5 (pearpc-0.3.1.tar.gz) = d7ac0566f6ab884029e374ac68842932 +SIZE (pearpc-0.3.1.tar.gz) = 834258 diff --git a/emulators/pearpc/files/patch-gcc34 b/emulators/pearpc/files/patch-gcc34 new file mode 100644 index 000000000000..c09b6393ab39 --- /dev/null +++ b/emulators/pearpc/files/patch-gcc34 @@ -0,0 +1,41 @@ +--- src/cpu/cpu_jitc_x86/ppc_cpu.h.orig Tue Oct 5 15:48:01 2004 ++++ src/cpu/cpu_jitc_x86/ppc_cpu.h Tue Oct 5 17:03:40 2004 +@@ -112,7 +112,8 @@ + uint32 current_code_base; + } PACKED; + +-enum PPC_Register { ++ ++/*enum PPC_Register { + PPC_REG_NO = 0, + PPC_GPR0 = offsetof(PPC_CPU_State, gpr), + PPC_FPR1 = offsetof(PPC_CPU_State, fpr), +@@ -132,7 +133,27 @@ + PPC_PVR = offsetof(PPC_CPU_State, pvr), + PPC_HID0 = offsetof(PPC_CPU_State, hid), + PPC_HID1 = offsetof(PPC_CPU_State, hid)+sizeof (uint32), +-}; ++};*/ ++#define PPC_Register size_t ++#define PPC_REG_NO 0 ++#define PPC_GPR0 offsetof(PPC_CPU_State, gpr) ++#define PPC_FPR1 offsetof(PPC_CPU_State, fpr) ++#define PPC_CR offsetof(PPC_CPU_State, cr) ++#define PPC_FPSCR offsetof(PPC_CPU_State, fpscr) ++#define PPC_XER offsetof(PPC_CPU_State, xer) ++#define PPC_LR offsetof(PPC_CPU_State, lr) ++#define PPC_CTR offsetof(PPC_CPU_State, ctr) ++#define PPC_MSR offsetof(PPC_CPU_State, msr) ++#define PPC_SRR0 offsetof(PPC_CPU_State, srr) ++#define PPC_SRR1 offsetof(PPC_CPU_State, srr)+sizeof (uint32) ++#define PPC_DSISR offsetof(PPC_CPU_State, dsisr) ++#define PPC_DAR offsetof(PPC_CPU_State, dar) ++#define PPC_DEC offsetof(PPC_CPU_State, dec) ++#define PPC_SDR1 offsetof(PPC_CPU_State, sdr1) ++#define PPC_EAR offsetof(PPC_CPU_State, ear) ++#define PPC_PVR offsetof(PPC_CPU_State, pvr) ++#define PPC_HID0 offsetof(PPC_CPU_State, hid) ++#define PPC_HID1 offsetof(PPC_CPU_State, hid)+sizeof (uint32) + + enum PPC_CRx { + PPC_CR0=0, |