Date: Sun, 25 Feb 2018 06:39:37 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r462941 - head/Mk Message-ID: <201802250639.w1P6dbHk097945@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sun Feb 25 06:39:36 2018 New Revision: 462941 URL: https://svnweb.freebsd.org/changeset/ports/462941 Log: 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) Modified: head/Mk/bsd.gecko.mk (contents, props changed) Modified: head/Mk/bsd.gecko.mk ============================================================================== --- head/Mk/bsd.gecko.mk Sun Feb 25 06:39:03 2018 (r462940) +++ head/Mk/bsd.gecko.mk Sun Feb 25 06:39:36 2018 (r462941) @@ -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/ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802250639.w1P6dbHk097945>