From owner-freebsd-gecko@FreeBSD.ORG Sat Aug 23 19:24:18 2014 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 80B3F357 for ; Sat, 23 Aug 2014 19:24:18 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0A9FB3506 for ; Sat, 23 Aug 2014 19:24:17 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id s7NJO8Jf074507 for ; Sat, 23 Aug 2014 19:24:08 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id s7NJO3t1073932 for freebsd-gecko@freebsd.org; Sat, 23 Aug 2014 19:24:03 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 23 Aug 2014 19:24:03 GMT Message-Id: <201408231924.s7NJO3t1073932@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1663 - trunk/Mk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reply-To: freebsd-gecko@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Aug 2014 19:24:18 -0000 Author: jbeich Date: Sat Aug 23 19:24:03 2014 New Revision: 1663 Log: drop extract excludes as they keep breaking build Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Tue Aug 19 18:10:18 2014 (r1662) +++ trunk/Mk/bsd.gecko.mk Sat Aug 23 19:24:03 2014 (r1663) @@ -106,11 +106,6 @@ PKGINSTALL_INC?= ${.CURDIR}/../../www/firefox/files/pkg-install.in PKGDEINSTALL_INC?= ${.CURDIR}/../../www/firefox/files/pkg-deinstall.in -EXTRACT_AFTER_ARGS?= --exclude */CVS/* \ - --exclude */macbuild/* \ - --exclude */package/* \ - --exclude mozilla*/gc/boehm - MOZ_PKGCONFIG_FILES?= ${MOZILLA}-gtkmozembed ${MOZILLA}-js \ ${MOZILLA}-xpcom ${MOZILLA}-plugin @@ -132,24 +127,19 @@ cairo_LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo cairo_MOZ_OPTIONS= --enable-system-cairo -cairo_EXTRACT_AFTER_ARGS= --exclude mozilla*/gfx/cairo/cairo event_LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 event_MOZ_OPTIONS= --with-system-libevent -event_EXTRACT_AFTER_ARGS= --exclude mozilla*/ipc/chromium/src/third_party/libevent ffi_LIB_DEPENDS= libffi.so:${PORTSDIR}/devel/libffi ffi_MOZ_OPTIONS= --enable-system-ffi -ffi_EXTRACT_AFTER_ARGS= --exclude mozilla*/js/src/ctypes/libffi .if exists(${FILESDIR}/patch-bug847568) || exists(${FILESDIR}/patch-z-bug847568) graphite_LIB_DEPENDS= libgraphite2.so:${PORTSDIR}/graphics/graphite2 graphite_MOZ_OPTIONS= --with-system-graphite2 -graphite_EXTRACT_AFTER_ARGS= --exclude mozilla*/gfx/graphite2 harfbuzz_LIB_DEPENDS= libharfbuzz.so:${PORTSDIR}/print/harfbuzz harfbuzz_MOZ_OPTIONS= --with-system-harfbuzz -harfbuzz_EXTRACT_AFTER_ARGS= --exclude mozilla*/gfx/harfbuzz .endif hunspell_LIB_DEPENDS= libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell @@ -163,62 +153,48 @@ #jpeg_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/libjpeg-turbo jpeg_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg jpeg_MOZ_OPTIONS= --with-system-jpeg=${LOCALBASE} -jpeg_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libjpeg nspr_LIB_DEPENDS= libnspr4.so:${PORTSDIR}/devel/nspr nspr_MOZ_OPTIONS= --with-system-nspr nss_LIB_DEPENDS= libnss3.so:${PORTSDIR}/security/nss nss_MOZ_OPTIONS= --with-system-nss -nss_EXTRACT_AFTER_ARGS= --exclude mozilla*/dbm \ - --exclude mozilla*/security/coreconf \ - --exclude mozilla*/security/nss .if exists(${FILESDIR}/patch-z-bug517422) || exists(${FILESDIR}/patch-zz-bug517422) opus_LIB_DEPENDS= libopus.so:${PORTSDIR}/audio/opus opus_MOZ_OPTIONS= --with-system-opus -opus_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libopus .endif pixman_LIB_DEPENDS= libpixman-1.so:${PORTSDIR}/x11/pixman pixman_MOZ_OPTIONS= --enable-system-pixman -pixman_EXTRACT_AFTER_ARGS= --exclude mozilla*/gfx/cairo/libpixman png_LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png png_MOZ_OPTIONS= --with-system-png=${LOCALBASE} -#png_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libpng .if exists(${FILESDIR}/patch-z-bug517422) || exists(${FILESDIR}/patch-zz-bug517422) soundtouch_LIB_DEPENDS= libSoundTouch.so:${PORTSDIR}/audio/soundtouch soundtouch_MOZ_OPTIONS= --with-system-soundtouch -soundtouch_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libsoundtouch # XXX disabled: bug 913854 not yet upstreamed speex_LIB_DEPENDS= libspeexdsp.so:${PORTSDIR}/audio/speex speex_MOZ_OPTIONS= --with-system-speex -speex_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libspeex_resampler .endif sqlite_LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3 sqlite_MOZ_OPTIONS= --enable-system-sqlite -sqlite_EXTRACT_AFTER_ARGS= --exclude mozilla*/db/sqlite3 .if exists(${FILESDIR}/patch-z-bug517422) || exists(${FILESDIR}/patch-zz-bug517422) # XXX disabled: update to 1.2.x or review backported fixes theora_LIB_DEPENDS= libtheora.so:${PORTSDIR}/multimedia/libtheora theora_MOZ_OPTIONS= --with-system-theora -theora_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libtheora vorbis_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis vorbis_MOZ_OPTIONS= --with-system-vorbis --with-system-ogg -vorbis_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libvorbis \ - --exclude mozilla*/media/libogg .endif -vpx_BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm vpx_LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx vpx_MOZ_OPTIONS= --with-system-libvpx -vpx_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libvpx .for use in ${USE_MOZILLA} ${use:S/-/_WITHOUT_/}= ${TRUE} @@ -230,7 +206,6 @@ LIB_DEPENDS+= ${${dep}_LIB_DEPENDS} RUN_DEPENDS+= ${${dep}_RUN_DEPENDS} MOZ_OPTIONS+= ${${dep}_MOZ_OPTIONS} -EXTRACT_AFTER_ARGS+= ${${dep}_EXTRACT_AFTER_ARGS} .else BUILD_DEPENDS+= ${-${dep}_BUILD_DEPENDS} .endif