diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2004-09-30 18:14:15 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2004-09-30 18:14:15 +0000 |
| commit | d3dae2133e692f6a7bb8592c5f6f2587de228d60 (patch) | |
| tree | 535fe8a0730350ab112f0dd869d9448d0507e397 /emulators/uae | |
| parent | Correct typo in previous commit (diff) | |
Unbreak with recent GCC.
Reported by: kris
Approved by: portmgr (krion), fjoe (mentor, implicit), maintainer
Diffstat (limited to 'emulators/uae')
| -rw-r--r-- | emulators/uae/Makefile | 8 | ||||
| -rw-r--r-- | emulators/uae/files/patch-src+include+sysdeps.h | 20 |
2 files changed, 21 insertions, 7 deletions
diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile index acfe1e67cd8f..7e73e06d85f5 100644 --- a/emulators/uae/Makefile +++ b/emulators/uae/Makefile @@ -24,12 +24,6 @@ USE_REINPLACE= yes CFLAGS+= ${PTHREAD_CFLAGS} -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 502126 -BROKEN= "Does not compile on FreeBSD >= 5.x" -.endif - pre-configure: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/configure.in @@ -55,4 +49,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/amiga/uae_rcli ${DATADIR}/amiga/ ${INSTALL_DATA} ${WRKSRC}/amiga/uaectrl ${DATADIR}/amiga/ -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/emulators/uae/files/patch-src+include+sysdeps.h b/emulators/uae/files/patch-src+include+sysdeps.h new file mode 100644 index 000000000000..318339a4ade4 --- /dev/null +++ b/emulators/uae/files/patch-src+include+sysdeps.h @@ -0,0 +1,20 @@ +--- src/include/sysdeps.h.orig Mon Nov 19 23:58:46 2001 ++++ src/include/sysdeps.h Thu Sep 30 16:59:24 2004 +@@ -103,12 +103,12 @@ + }; + #endif + +-#if defined(__GNUC__) && defined(AMIGA) +-/* gcc on the amiga need that __attribute((regparm)) must */ +-/* be defined in function prototypes as well as in */ +-/* function definitions ! */ ++#if defined(__GNUC__) ++/* recent gcc needs that __attribute((regparm)) must */ ++/* be defined in function prototypes as well as in */ ++/* function definitions ! */ + #define REGPARAM2 REGPARAM +-#else /* not(GCC & AMIGA) */ ++#else /* not GCC */ + #define REGPARAM2 + #endif + |