diff options
| author | ryoon <ryoon> | 2013-01-19 09:25:25 +0000 |
|---|---|---|
| committer | ryoon <ryoon> | 2013-01-19 09:25:25 +0000 |
| commit | 767e84ceb882746c020e3f3e2b531ffb6b264ff3 (patch) | |
| tree | 11aacaf9772ca0899bf19e7d9617010da7f82a91 | |
| parent | 40d12758fc1e5848b8c347a8857abe2798918a62 (diff) | |
| download | pkgsrc-767e84ceb882746c020e3f3e2b531ffb6b264ff3.tar.gz | |
Fix build of firefox.
Move yasm dependency to mozilla-common.mk from Makefile.
| -rw-r--r-- | devel/xulrunner/Makefile | 10 | ||||
| -rw-r--r-- | devel/xulrunner/mozilla-common.mk | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/devel/xulrunner/Makefile b/devel/xulrunner/Makefile index e2961d76859..639c895ff94 100644 --- a/devel/xulrunner/Makefile +++ b/devel/xulrunner/Makefile @@ -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" diff --git a/devel/xulrunner/mozilla-common.mk b/devel/xulrunner/mozilla-common.mk index 5280c12499d..6c7b18bc76d 100644 --- a/devel/xulrunner/mozilla-common.mk +++ b/devel/xulrunner/mozilla-common.mk @@ -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 |