diff options
| author | jbeich <jbeich@FreeBSD.org> | 2018-02-25 14:39:36 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2018-02-25 14:39:36 +0800 |
| commit | 9e2b8bf876ca84fb2836c9ed80f7d6c0b2544732 (patch) | |
| tree | 0deaa1e14b8d58381a5765914153626fe07e9080 /Mk | |
| parent | b7a805ac169a5a6cf7054966718f26c3b1df6fdc (diff) | |
| download | freebsd-ports-gnome-9e2b8bf876ca84fb2836c9ed80f7d6c0b2544732.tar.gz freebsd-ports-gnome-9e2b8bf876ca84fb2836c9ed80f7d6c0b2544732.tar.zst freebsd-ports-gnome-9e2b8bf876ca84fb2836c9ed80f7d6c0b2544732.zip | |
gecko: convert to CONFIGURE_OUTSOURCE
client.mk is on its way out upstream, switching to it was a mistake.
$ MACH=1 gmake -f client.mk build
client.mk:40: /.mozconfig-client-mk: No such file or directory
gmake: *** No rule to make target '/.mozconfig-client-mk'. Stop.
MFH: 2018Q1 (required by Firefox 59)
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.gecko.mk | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index dd320f78067f..eaab374887e0 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -88,6 +88,8 @@ USES+= cpe gmake iconv localbase perl5 pkgconfig \ CPE_VENDOR?=mozilla USE_PERL5= build USE_XORG= x11 xcomposite xdamage xext xfixes xrender xt +HAS_CONFIGURE= yes +CONFIGURE_OUTSOURCE= yes .if ${MOZILLA} != "libxul" BUNDLE_LIBS= yes @@ -128,14 +130,10 @@ MOZILLA_SUFX?= none MOZSRC?= ${WRKSRC} PLISTF?= ${WRKDIR}/plist_files -MOZ_OBJDIR?= ${WRKSRC}/obj-${ARCH:C/amd64/x86_64/}-unknown-${OPSYS:tl}${OSREL} - MOZ_PIS_DIR?= lib/${MOZILLA}/init.d PORT_MOZCONFIG?= ${FILESDIR}/mozconfig.in MOZCONFIG?= ${WRKSRC}/.mozconfig -# XXX Not ?= because fmake uses MAKEFILE internally -MAKEFILE= ${WRKSRC}/client.mk MOZILLA_PLIST_DIRS?= bin lib share/pixmaps share/applications PKGINSTALL?= ${WRKDIR}/pkg-install PKGDEINSTALL?= ${WRKDIR}/pkg-deinstall @@ -145,14 +143,11 @@ PKGDEINSTALL_INC?= ${.CURDIR}/../../www/firefox/files/pkg-deinstall.in MOZ_PKGCONFIG_FILES?= ${MOZILLA}-gtkmozembed ${MOZILLA}-js \ ${MOZILLA}-xpcom ${MOZILLA}-plugin -MAKE_ENV+= MACH=1 # XXX bug 1412398 -ALL_TARGET?= build - MOZ_EXPORT+= ${CONFIGURE_ENV} \ RUSTFLAGS="${RUSTFLAGS}" \ PERL="${PERL}" MOZ_OPTIONS+= --prefix="${PREFIX}" -MOZ_MK_OPTIONS+=MOZ_OBJDIR="${MOZ_OBJDIR}" +MOZ_MK_OPTIONS+=MOZ_OBJDIR="${BUILD_WRKSRC}" LDFLAGS+= -Wl,--as-needed |