kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix build of firefox.

Browse source 
Move yasm dependency to mozilla-common.mk from Makefile.
This commit is contained in:
ryoon 2013-01-19 09:25:25 +00:00
parent 8ec04994e1
commit 77cc67abc3
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
devel/xulrunner/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.89 2013/01/18 18:29:54 ryoon Exp $
# $NetBSD: Makefile,v 1.90 2013/01/19 09:25:25 ryoon Exp $
.include "dist.mk"
PKGNAME= xulrunner-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/esr//}
@ -33,14 +33,6 @@ LDFLAGS+= -Wl,-rpath,${PREFIX}/lib/xulrunner -Wl,-rpath,${PREFIX}/lib
.include "mozilla-common.mk"
.include "options.mk"
# When MACHINAE_ARCH == "arm", linjpeg-turbo should be enabled.
.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
BUILD_DEPENDS+= yasm>=1.1.0:../../devel/yasm
CONFIGURE_ARGS+= --enable-libjpeg-turbo
.else
CONFIGURE_ARGS+= --diable-libjpeg-turbo
.endif
PLIST_VARS+= sps webrtc vorbis tremor
.if !empty(MACHINE_PLATFORM:S/i386/x86/:MLinux-*-x86*) || ${OPSYS} == "Darwin"

10
devel/xulrunner/mozilla-common.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: mozilla-common.mk,v 1.38 2013/01/10 15:01:30 ryoon Exp $
# $NetBSD: mozilla-common.mk,v 1.39 2013/01/19 09:25:25 ryoon Exp $
#
# common Makefile fragment for mozilla packages based on gecko 2.0.
#
@ -59,6 +59,14 @@ PYTHON_FOR_BUILD_ONLY= yes
.include "../../lang/python/application.mk"
CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
# When MACHINAE_ARCH == "arm", linjpeg-turbo should be enabled.
.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
BUILD_DEPENDS+= yasm>=1.1.0:../../devel/yasm
CONFIGURE_ARGS+= --enable-libjpeg-turbo
.else
CONFIGURE_ARGS+= --diable-libjpeg-turbo
.endif
#
# pysqlite2 is used by xulrunner's Python virtualenv. If pysqlite2 isn't
# installed at build time it will attempt to download it instead, so the