Browse Source

MoonchildProductions#1251 - Part 24: Remove temporary GNU M4 workaround.

We finally found where configure was failing. Apparently they just invoked m4 without regard for TOOLCHAIN_PREFIX. Easy to fix, difficult to find.
pull/24/head
athenian200 3 years ago committed by Roy Tam
parent
commit
d8c37e0db8
  1. 44
      application/palemoon/moz.configure
  2. 4
      old-configure.in

44
application/palemoon/moz.configure vendored

@ -6,48 +6,4 @@
include('../../toolkit/moz.configure')
# configure.in is unreliable on Solaris. The build system only picks up about
# half the boolean values defined there. Doing this instead
# works consistently. Most of the ones that use AC_DEFINE without a
# MOZ_ARG_BOOL in this directory's configure.in fail, but all the ones in
# old-configure.in work just fine and say there's a duplicate if I try and
# define them here.
if target_is_solaris:
set_define('HAVE_SIDEBAR', True)
set_config('HAVE_SIDEBAR', True)
set_define('MC_PALEMOON', True)
set_config('MC_PALEMOON', True)
set_define('MOZ_PHOENIX', True)
set_config('MOZ_PHOENIX', True)
set_define('MOZ_PERSONAS', True)
set_config('MOZ_PERSONAS', True)
# set_define('MOZ_DEVTOOLS', True)
# set_config('MOZ_DEVTOOLS', True)
set_define('MOZ_PHOENIX_EXTENSIONS', True)
set_config('MOZ_PHOENIX_EXTENSIONS', True)
set_define('MOZ_SERVICES_COMMON', True)
set_config('MOZ_SERVICES_COMMON', True)
# set_define('MOZ_SERVICES_SYNC', True)
# set_config('MOZ_SERVICES_SYNC', True)
# set_define('MOZ_JSDOWNLOADS', True)
# set_config('MOZ_JSDOWNLOADS', True)
# set_define('MOZ_WEBGL_CONFORMANT', True)
# set_config('MOZ_WEBGL_CONFORMANT', True)
# set_define('MOZ_ADDON_SIGNING', False)
# set_config('MOZ_ADDON_SIGNING', False)
# set_define('MOZ_REQUIRE_SIGNING', False)
# set_config('MOZ_REQUIRE_SIGNING', False)

4
old-configure.in

@ -765,7 +765,7 @@ case "$host" in
HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
;;
*)
HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O2}"
@ -4229,7 +4229,7 @@ if test -f "${srcdir}/${MOZ_BUILD_APP}/configure.in" ; then
_subconfigure_config_args="$ac_configure_args"
}
tmpscript=`$PYTHON -c 'import os, tempfile; print tempfile.mktemp(prefix="subscript.").replace(os.sep, "/")'` || exit 1
m4 "${srcdir}/build/autoconf/subconfigure.m4" \
${TOOLCHAIN_PREFIX}m4 "${srcdir}/build/autoconf/subconfigure.m4" \
"${srcdir}/build/autoconf/altoptions.m4" \
"${srcdir}/${MOZ_BUILD_APP}/configure.in" > $tmpscript
. $tmpscript

Loading…
Cancel
Save