diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2003-02-24 23:54:29 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2003-02-24 23:54:29 +0000 |
| commit | 2e7ff4472505de31d75f7585a397354a93e7e47a (patch) | |
| tree | 0d62f49abd74a5a5acc3065bdac60c31ea13472a /emulators/uae | |
| parent | Allow overriding of SAMBA_LOGDIR, SAMBA_PRIVATE, SAMBA_CONFDIR, and (diff) | |
Allow UAE to build with gcc3.x.
Respect CFLAGS, use AUTOCONF.
PR: 46644
Submitted by: Keith Jones <freebsd.dev@blueyonder.co.uk>
Notes
Notes:
svn path=/head/; revision=76429
Diffstat (limited to 'emulators/uae')
| -rw-r--r-- | emulators/uae/Makefile | 5 | ||||
| -rw-r--r-- | emulators/uae/files/patch-aa | 20 | ||||
| -rw-r--r-- | emulators/uae/files/patch-configure.in | 13 | ||||
| -rw-r--r-- | emulators/uae/files/patch-src+Makefile.in | 15 |
4 files changed, 31 insertions, 22 deletions
diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile index f5a9c89414e9..02f05b40bfda 100644 --- a/emulators/uae/Makefile +++ b/emulators/uae/Makefile @@ -7,6 +7,7 @@ PORTNAME= uae PORTVERSION= 0.8.22 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= ftp://ftp.freiburg.linux.de/pub/uae/sources/develop/ @@ -15,18 +16,18 @@ COMMENT= Amiga emulator USE_GMAKE= yes GNU_CONFIGURE= yes +USE_AUTOCONF= yes CONFIGURE_ARGS= --enable-sound --enable-vidmode --enable-dga USE_XLIB= yes USE_GNOMENG= yes USE_GNOME= gtk12 USE_REINPLACE= yes -USE_GCC= 2.95 CFLAGS+= ${PTHREAD_CFLAGS} pre-configure: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/configure + ${WRKSRC}/configure.in do-install: ${INSTALL_PROGRAM} ${WRKSRC}/uae ${PREFIX}/bin diff --git a/emulators/uae/files/patch-aa b/emulators/uae/files/patch-aa deleted file mode 100644 index 03f8aba0a1db..000000000000 --- a/emulators/uae/files/patch-aa +++ /dev/null @@ -1,20 +0,0 @@ ---- configure.orig Tue Aug 15 16:01:31 2000 -+++ configure Sun Sep 17 08:48:28 2000 -@@ -5121,7 +5121,7 @@ - echo "configure:5122: checking for pthread library" >&5 - TMP_SAVE_CFLAGS=$CFLAGS - TMP_SAVE_LIBS=$LIBS --LIBS="$LIBS -lpthread" -+LIBS="$LIBS -pthread" - cat > conftest.$ac_ext <<EOF - #line 5127 "configure" - #include "confdefs.h" -@@ -6051,7 +6051,7 @@ - if [ "x$HAVE_PTHREAD_LIB" = "xyes" ]; then - THREADDEP=td-posix - CFLAGS="$CFLAGS -DSUPPORT_THREADS -D_REENTRANT" -- LIBS="$LIBS -lpthread" -+ LIBS="$LIBS -pthread" - if [ "x$HAVE_POSIX4_LIB" = "xyes" ]; then - LIBS="$LIBS -lposix4" - fi diff --git a/emulators/uae/files/patch-configure.in b/emulators/uae/files/patch-configure.in new file mode 100644 index 000000000000..be3c5f79e0d4 --- /dev/null +++ b/emulators/uae/files/patch-configure.in @@ -0,0 +1,13 @@ +--- configure.in.orig Mon Feb 4 14:23:29 2002 ++++ configure.in Tue Feb 25 00:30:57 2003 +@@ -598,9 +598,7 @@ + + if test $ac_cv_prog_gcc = yes; then + WARNING_CFLAGS="-Wall -Wno-unused -Wno-format -W -Wmissing-prototypes -Wstrict-prototypes" +- OPTIMIZE_CFLAGS="-O2 -fomit-frame-pointer" +- dnl Not nice, but needed to turn off -g +- CFLAGS= ++ OPTIMIZE_CFLAGS="-fomit-frame-pointer" + fi + + if [[ "x$DO_PROFILING" = "xyes" ]]; then diff --git a/emulators/uae/files/patch-src+Makefile.in b/emulators/uae/files/patch-src+Makefile.in new file mode 100644 index 000000000000..b9a2a5448068 --- /dev/null +++ b/emulators/uae/files/patch-src+Makefile.in @@ -0,0 +1,15 @@ +--- src/Makefile.in.orig Mon Feb 24 23:47:30 2003 ++++ src/Makefile.in Mon Feb 24 23:49:01 2003 +@@ -120,10 +120,8 @@ + cpustbl.c: cpuemu.c + cputbl.h: cpuemu.c + +-cpufast.s: cpuemu.c tools/cpuopti +- $(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(NO_SCHED_CFLAGS) $< -o cputmp.s +- ./tools/cpuopti <cputmp.s >$@ +- rm cputmp.s ++cpufast.s: cpuemu.c ++ $(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(NO_SCHED_CFLAGS) $< -o $@ + + console_missing.o: missing.c + $(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(CFLAGS_$@) $< -o $@ |