FFmpeg appears to require a newer version of binutils on arm; switch

to the generic target for now on that arch. It's slower, but at least
it builds...

okay espie@
This commit is contained in:
sthen 2010-08-07 22:41:47 +00:00
parent 9eebe9b217
commit e9ba02b84c

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.55 2010/07/24 14:50:07 jolan Exp $
# $OpenBSD: Makefile,v 1.56 2010/08/07 22:41:47 sthen Exp $
COMMENT= audio/video converter and streamer with bktr(4) support
@ -46,6 +46,11 @@ LIB_DEPENDS= SDL.>=4::devel/sdl \
schroedinger-1.0::multimedia/schroedinger \
bz2.>=10::archivers/bzip2
.if ${MACHINE_ARCH:Marm}
# XXX binutils
CONFIGURE_ARGS+= --arch=generic
.endif
# inter-library dependencies for the current configuration
LIBavcodec_EXTRALIBS=-L${LOCALBASE}/lib -lfaac -lfaad -lgsm -lm -lmp3lame -logg -loil-0.3 -lschroedinger-1.0 -lspeex -ltheora -lvorbis -lvorbisenc -lx264 -lz -pthread -Wl,-rpath,${LOCALBASE}/lib
LIBavdevice_EXTRALIBS=-L${X11BASE}/lib -lX11 -lXext -lXfixes -lm -lsndio -Wl,-rpath,${LOCALBASE}/lib -Wl,-rpath,${X11BASE}/lib