svn commit: r454677 - in head: Mk www/libxul
Jan Beich
jbeich at FreeBSD.org
Wed Nov 22 06:28:57 UTC 2017
Author: jbeich
Date: Wed Nov 22 06:28:56 2017
New Revision: 454677
URL: https://svnweb.freebsd.org/changeset/ports/454677
Log:
Oops, back out r454668
BUNDLE_LIBS is used by every XUL app that cannot share libxul.so
Modified:
head/Mk/bsd.gecko.mk (contents, props changed)
head/www/libxul/Makefile (contents, props changed)
Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk Wed Nov 22 06:28:01 2017 (r454676)
+++ head/Mk/bsd.gecko.mk Wed Nov 22 06:28:56 2017 (r454677)
@@ -89,6 +89,10 @@ CPE_VENDOR?=mozilla
USE_PERL5= build
USE_XORG= x11 xcomposite xdamage xext xfixes xrender xt
+.if ${MOZILLA} != "libxul"
+BUNDLE_LIBS= yes
+.endif
+
.if ${MOZILLA_VER:R:R} >= 49
USES+= compiler:c++14-lang
CPPFLAGS+= -D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \
Modified: head/www/libxul/Makefile
==============================================================================
--- head/www/libxul/Makefile Wed Nov 22 06:28:01 2017 (r454676)
+++ head/www/libxul/Makefile Wed Nov 22 06:28:56 2017 (r454677)
@@ -46,7 +46,6 @@ SHEBANG_FILES= xpcom/idl-parser/xpidl/xpidl.py \
MAKE_ENV= SKIP_GRE_REGISTRATION=1 mozappdir=${PREFIX}/lib/${MOZILLA}
LDFLAGS+= -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}
USE_LDCONFIG= ${PREFIX}/lib/${MOZILLA}
-BUNDLE_LIBS= yes
MOZ_OPTIONS?= --enable-application=xulrunner
MOZ_CHANNEL= esr
More information about the svn-ports-all
mailing list