diff options
| author | rh <rh@pkgsrc.org> | 2001-05-05 13:47:12 +0000 |
|---|---|---|
| committer | rh <rh@pkgsrc.org> | 2001-05-05 13:47:12 +0000 |
| commit | 4a00add4e60e8edffa39251cc61c365f6448bcb7 (patch) | |
| tree | 46cd5abd0ee220eb47844d6ecb5e162b23dec8cf /devel | |
| parent | 011bf78d9b675b0b991630a3c203469fda70c91e (diff) | |
| download | pkgsrc-4a00add4e60e8edffa39251cc61c365f6448bcb7.tar.gz | |
Make SDL compile under a.out systems: only use "-f elf" on ELF systems.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/SDL/Makefile | 19 | ||||
| -rw-r--r-- | devel/SDL/distinfo | 4 | ||||
| -rw-r--r-- | devel/SDL/patches/patch-aj | 11 |
3 files changed, 27 insertions, 7 deletions
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile index 35958d36680..6b5c484ebbd 100644 --- a/devel/SDL/Makefile +++ b/devel/SDL/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/04/17 16:27:20 rh Exp $ +# $NetBSD: Makefile,v 1.12 2001/05/05 13:47:12 rh Exp $ # DISTNAME= SDL-1.2.0 @@ -21,11 +21,22 @@ USE_GMAKE= YES USE_MESA= YES USE_X11= YES USE_LIBTOOL= YES + +.include "../../mk/bsd.prefs.mk" + +.if ${OBJECT_FMT} == "ELF" +NASMFLAGS= -f elf +.else +NASMFLAGS= -f aoutb +.endif + LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig CONFIGURE_ARGS+= --disable-pthread-sem -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -D_POSIX_THREAD_SYSCALL_SOFT=1" -LDFLAGS+= -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -#CC= ${LOCALBASE}/pthreads/bin/pgcc +CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -D_POSIX_THREAD_SYSCALL_SOFT=1" +CONFIGURE_ENV+= NASMFLAGS="${NASMFLAGS}" +MAKE_ENV+= NASMFLAGS="${NASMFLAGS}" +LDFLAGS+= -Wl,-R${X11BASE}/lib -L${X11BASE}/lib +#CC= ${LOCALBASE}/pthreads/bin/pgcc pre-patch: cd ${WRKSRC} && ${MKDIR} src/audio/netbsd diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo index fd2d42f5b37..e81beeba41b 100644 --- a/devel/SDL/distinfo +++ b/devel/SDL/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2001/04/28 14:27:34 rh Exp $ +$NetBSD: distinfo,v 1.5 2001/05/05 13:47:12 rh Exp $ SHA1 (SDL-1.2.0.tar.gz) = ba99b4fbf04a7a9622dc6f8d103216abcf17ee19 Size (SDL-1.2.0.tar.gz) = 1375872 bytes @@ -11,7 +11,7 @@ SHA1 (patch-af) = 89d37132bbcecb65082dad3e0a40e15db5e4448c SHA1 (patch-ag) = 989c3464686a3158c538034ad7ea012a4e4b4b9e SHA1 (patch-ah) = f509c0c146002cf2525bd9b7c7532fbca7aa4fb6 SHA1 (patch-ai) = 9c732852520b86e2ffa4b467d4b5220a53c9ecc6 -SHA1 (patch-aj) = 0867b14176c7601df57db3c81176457eb48d4566 +SHA1 (patch-aj) = 4059a74bf4dfb074813af5314de9eb1c78337760 SHA1 (patch-ak) = 657947be674831c98850f044315e4681fe58ea29 SHA1 (patch-am) = 1231a8617f34c5bbdb3c8adc19cba4b0e18bb477 SHA1 (patch-an) = b875bc9e173d69cb5fcc1b4ea3e7039b7633d187 diff --git a/devel/SDL/patches/patch-aj b/devel/SDL/patches/patch-aj index 53d967b7b72..9196f6e71d0 100644 --- a/devel/SDL/patches/patch-aj +++ b/devel/SDL/patches/patch-aj @@ -1,7 +1,16 @@ -$NetBSD: patch-aj,v 1.4 2001/04/17 16:27:22 rh Exp $ +$NetBSD: patch-aj,v 1.5 2001/05/05 13:47:13 rh Exp $ --- configure.in.orig Tue Mar 27 05:39:19 2001 +++ configure.in +@@ -389,7 +389,7 @@ + NASMFLAGS="-f win32" + ;; + *) +- NASMFLAGS="-f elf" ++ test -n "$NASMFLAGS" || NASMFLAGS="-f elf" + ;; + esac + AC_SUBST(NASMFLAGS) @@ -1199,7 +1199,11 @@ COPY_ARCH_SRC(src/thread, linux, SDL_systhread_c.h) COPY_ARCH_SRC(src/thread, linux, SDL_sysmutex.c) |