Date: Fri, 24 Aug 2012 12:37:06 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r950 - in branches/experimental: Mk www/firefox www/firefox-esr www/firefox-nightly Message-ID: <201208241237.q7OCb6ho035744@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Fri Aug 24 12:37:06 2012
New Revision: 950
Log:
better quote options/variables in .mozconfig
Modified:
branches/experimental/Mk/bsd.gecko.mk
branches/experimental/www/firefox-esr/Makefile
branches/experimental/www/firefox-nightly/Makefile
branches/experimental/www/firefox/Makefile
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Thu Aug 23 14:12:23 2012 (r949)
+++ branches/experimental/Mk/bsd.gecko.mk Fri Aug 24 12:37:06 2012 (r950)
@@ -663,7 +663,7 @@
.endif
.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
-MOZ_EXPORT+= MOZ_OPTIMIZE_FLAGS='"${CFLAGS:M-O*}"'
+MOZ_EXPORT+= MOZ_OPTIMIZE_FLAGS="${CFLAGS:M-O*}"
MOZ_OPTIONS+= --enable-optimize
.else
MOZ_OPTIONS+= --disable-optimize
@@ -806,13 +806,13 @@
${MOZCONFIG_SED} < ${PORT_MOZCONFIG} >> ${MOZCONFIG} ; \
fi
.for arg in ${MOZ_OPTIONS}
- @${ECHO_CMD} ac_add_options ${arg} >> ${MOZCONFIG}
+ @${ECHO_CMD} ac_add_options ${arg:Q} >> ${MOZCONFIG}
.endfor
.for arg in ${MOZ_MK_OPTIONS}
- @${ECHO_CMD} mk_add_options ${arg} >> ${MOZCONFIG}
+ @${ECHO_CMD} mk_add_options ${arg:Q} >> ${MOZCONFIG}
.endfor
.for var in ${MOZ_EXPORT}
- @${ECHO_CMD} "export ${var}" >> ${MOZCONFIG}
+ @${ECHO_CMD} export ${var:Q} >> ${MOZCONFIG}
.endfor
.endif # .if !defined(NOMOZCONFIG)
.if exists(${MOZSRC}/build/unix/mozilla-config.in)
Modified: branches/experimental/www/firefox-esr/Makefile
==============================================================================
--- branches/experimental/www/firefox-esr/Makefile Thu Aug 23 14:12:23 2012 (r949)
+++ branches/experimental/www/firefox-esr/Makefile Fri Aug 24 12:37:06 2012 (r950)
@@ -75,8 +75,8 @@
MOZ_OPTIONS+= ${CONFIGURE_TARGET}
MAKEFILE= ${WRKSRC}/client.mk
ALL_TARGET= profiledbuild
-MOZ_MK_OPTIONS+=PROFILE_GEN_SCRIPT='"${PYTHON_CMD} \
- @MOZ_OBJDIR@/_profile/pgo/profileserver.py"'
+MOZ_MK_OPTIONS+=PROFILE_GEN_SCRIPT="${PYTHON_CMD} \
+ @MOZ_OBJDIR@/_profile/pgo/profileserver.py"
.endif
.if ${ARCH} == amd64 || ${ARCH} == i386
Modified: branches/experimental/www/firefox-nightly/Makefile
==============================================================================
--- branches/experimental/www/firefox-nightly/Makefile Thu Aug 23 14:12:23 2012 (r949)
+++ branches/experimental/www/firefox-nightly/Makefile Fri Aug 24 12:37:06 2012 (r950)
@@ -85,8 +85,8 @@
MOZ_OPTIONS+= ${CONFIGURE_TARGET}
MAKEFILE= ${WRKSRC}/client.mk
ALL_TARGET= profiledbuild
-MOZ_MK_OPTIONS+=PROFILE_GEN_SCRIPT='"${PYTHON_CMD} \
- @MOZ_OBJDIR@/_profile/pgo/profileserver.py"'
+MOZ_MK_OPTIONS+=PROFILE_GEN_SCRIPT="${PYTHON_CMD} \
+ @MOZ_OBJDIR@/_profile/pgo/profileserver.py"
.endif
.if ${ARCH} == amd64 || ${ARCH} == i386
Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile Thu Aug 23 14:12:23 2012 (r949)
+++ branches/experimental/www/firefox/Makefile Fri Aug 24 12:37:06 2012 (r950)
@@ -76,8 +76,8 @@
MOZ_OPTIONS+= ${CONFIGURE_TARGET}
MAKEFILE= ${WRKSRC}/client.mk
ALL_TARGET= profiledbuild
-MOZ_MK_OPTIONS+=PROFILE_GEN_SCRIPT='"${PYTHON_CMD} \
- @MOZ_OBJDIR@/_profile/pgo/profileserver.py"'
+MOZ_MK_OPTIONS+=PROFILE_GEN_SCRIPT="${PYTHON_CMD} \
+ @MOZ_OBJDIR@/_profile/pgo/profileserver.py"
.endif
.if ${ARCH} == amd64 || ${ARCH} == i386
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208241237.q7OCb6ho035744>