Bug 1247282 - Restore mysys-perl-wrapper for libical. rs=Fallen
authoraleth <aleth@instantbird.org>
Sat, 13 Feb 2016 13:35:20 +0100
changeset 24362 f46004b3e9a6b6ac9f73a3a9897b277caff6ef29
parent 24361 bd1684a179caaf03f218e5ecb5aaec6ac27bb5af
child 24363 2de802a005e7d7e4544923373b9135ddda23a4c4
push id1623
push userclokep@gmail.com
push dateMon, 25 Apr 2016 14:53:28 +0000
treeherdercomm-beta@25267c20666e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersFallen
bugs1247282
Bug 1247282 - Restore mysys-perl-wrapper for libical. rs=Fallen
mail/configure.in
mailnews/build/msys-perl-wrapper
suite/configure.in
--- a/mail/configure.in
+++ b/mail/configure.in
@@ -37,16 +37,23 @@ AC_SUBST(MOZ_CALENDAR)
 
 MOZ_ARG_ENABLE_BOOL(incomplete-external-linkage,
 [  --enable-incomplete-external-linkage Changes some comm-central code to be built with external linkage. Developer only option, incomplete broken builds will result - There are already existing bugs for this. ],
     MOZ_INCOMPLETE_EXTERNAL_LINKAGE=1,
     MOZ_INCOMPLETE_EXTERNAL_LINKAGE= )
 
 AC_SUBST(MOZ_INCOMPLETE_EXTERNAL_LINKAGE)
 
+dnl This is required only for libical on Windows.
+case "$host" in
+*mingw*)
+    PERL="/bin/sh ${_topsrcdir}/../mailnews/build/msys-perl-wrapper"
+    ;;
+esac
+
 dnl =========================================================
 dnl = LDAP
 dnl =========================================================
 MOZ_ARG_DISABLE_BOOL(ldap,
 [  --disable-ldap          Disable LDAP support],
     MOZ_LDAP_XPCOM=,
     MOZ_LDAP_XPCOM=1)
 
new file mode 100644
--- /dev/null
+++ b/mailnews/build/msys-perl-wrapper
@@ -0,0 +1,20 @@
+#!/bin/sh
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+args=""
+
+for i in "${@}"
+do
+    case "$i" in
+    -I?:/*)
+        i="$(echo "${i}" | sed -e 's|^-I\(.\):/|-I/\1/|')"
+	;;
+    esac
+
+    args="${args} '${i}'"
+done
+
+eval "exec perl $args"
--- a/suite/configure.in
+++ b/suite/configure.in
@@ -38,16 +38,23 @@ AC_SUBST(MOZ_CALENDAR)
 
 MOZ_ARG_ENABLE_BOOL(incomplete-external-linkage,
 [  --enable-incomplete-external-linkage Changes some comm-central code to be built with external linkage. Developer only option, incomplete broken builds will result - There are already existing bugs for this. ],
     MOZ_INCOMPLETE_EXTERNAL_LINKAGE=1,
     MOZ_INCOMPLETE_EXTERNAL_LINKAGE= )
 
 AC_SUBST(MOZ_INCOMPLETE_EXTERNAL_LINKAGE)
 
+dnl This is required only for libical on Windows.
+case "$host" in
+*mingw*)
+    PERL="/bin/sh ${_topsrcdir}/../mailnews/build/msys-perl-wrapper"
+    ;;
+esac
+
 dnl =========================================================
 dnl = LDAP
 dnl =========================================================
 MOZ_ARG_DISABLE_BOOL(ldap,
 [  --disable-ldap          Disable LDAP support],
     MOZ_LDAP_XPCOM=,
     MOZ_LDAP_XPCOM=1)