Bug 1517232 - NSPR: Remove the gonk reference r=ted
authorSylvestre Ledru <sledru@mozilla.com>
Wed, 02 Jan 2019 14:18:48 +0100
changeset 4798 56bef12b6f9a446e6361fd4a458f3f440160c72e
parent 4797 90d2902aab61c0c6effba94605a39514543a3968
child 4799 494198b1bad64da2bad6baacedc9fe04c578be01
push id305
push usersledru@mozilla.com
push dateSat, 12 Jan 2019 12:43:54 +0000
reviewersted
bugs1517232
Bug 1517232 - NSPR: Remove the gonk reference r=ted
configure
configure.in
--- a/configure
+++ b/configure
@@ -778,17 +778,16 @@ PATH_SEPARATOR
 SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 with_android_ndk
 with_android_toolchain
 with_android_version
 with_android_platform
-with_gonk
 with_dist_prefix
 with_dist_bindir
 with_dist_includedir
 with_dist_libdir
 with_mozilla
 enable_optimize
 enable_debug
 enable_debug_symbols
@@ -868,16 +867,17 @@ x_libraries=NONE
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
 libexecdir='${exec_prefix}/libexec'
 datarootdir='${prefix}/share'
 datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE}'
 infodir='${datarootdir}/info'
 htmldir='${docdir}'
 dvidir='${docdir}'
 pdfdir='${docdir}'
 psdir='${docdir}'
@@ -1479,17 +1479,16 @@ Optional Packages:
   --with-android-ndk=DIR
                           location where the Android NDK can be found
   --with-android-toolchain=DIR
                           location of the Android toolchain
   --with-android-version=VER
                           Android platform version, default 5 for arm, 9 for x86/mips
   --with-android-platform=DIR
                           location of platform dir
-  --with-gonk=DIR         location of gonk dir
   --with-dist-prefix=DIST_PREFIX
                           place build files in DIST_PREFIX dist
   --with-dist-bindir=DIR  build execuatables in DIR DIST_PREFIX/bin
   --with-dist-includedir=DIR
                           build include files in DIR DIST_PREFIX/include/nspr
   --with-dist-libdir=DIR  build library files in DIR DIST_PREFIX/lib
   --with-mozilla          Compile NSPR with Mozilla support
   --with-arm-kuser        Use kuser helpers (Linux/ARM only)
@@ -2651,29 +2650,16 @@ i?86-*android*)
 mipsel-*android*)
     android_tool_prefix="mipsel-linux-android"
     ;;
 *)
     android_tool_prefix="$target_os"
     ;;
 esac
 
-
-
-# Check whether --with-gonk was given.
-if test "${with_gonk+set}" = set; then :
-  withval=$with_gonk; gonkdir=$withval
-fi
-
-
-if test -n "$gonkdir" ; then
-
-    $as_echo "#define ANDROID 1" >>confdefs.h
-
-else
 case "$target" in
 *-android*|*-linuxandroid*)
     if test -z "$android_ndk" ; then
        as_fn_error $? "You must specify --with-android-ndk=/path/to/ndk when targeting Android." "$LINENO" 5
     fi
 
     if test -z "$android_toolchain" ; then
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for android toolchain directory" >&5
@@ -2749,17 +2735,16 @@ case "$target" in
     CFLAGS="-mandroid -I$android_platform/usr/include -fno-short-enums -fno-exceptions $CFLAGS"
     CXXFLAGS="-mandroid -I$android_platform/usr/include -fpic -fno-short-enums -fno-exceptions $CXXFLAGS"
     LDFLAGS="-mandroid -L$android_platform/usr/lib -Wl,-rpath-link=$android_platform/usr/lib --sysroot=$android_platform $LDFLAGS"
 
     $as_echo "#define ANDROID 1" >>confdefs.h
 
     ;;
 esac
-fi
 
 dist_prefix='${MOD_DEPTH}/dist'
 dist_bindir='${dist_prefix}/bin'
 dist_includedir='${dist_prefix}/include/nspr'
 dist_libdir='${dist_prefix}/lib'
 if test "${includedir}" = '${prefix}/include'; then
     includedir='${prefix}/include/nspr'
 fi
--- a/configure.in
+++ b/configure.in
@@ -142,31 +142,16 @@ i?86-*android*)
 mipsel-*android*)
     android_tool_prefix="mipsel-linux-android"
     ;;
 *)
     android_tool_prefix="$target_os"
     ;;
 esac
 
-dnl ========================================================
-dnl = Gonk is a fork of Android used for Mozilla's B2G project.
-dnl = Configuration is done largely by the top level config
-dnl = and the specified gonk directory doesn't matter here.
-dnl ========================================================
-
-AC_ARG_WITH(gonk,
-[  --with-gonk=DIR         location of gonk dir],
-    gonkdir=$withval)
-
-if test -n "$gonkdir" ; then
-    dnl Most things are directly configured by env vars when building for gonk
-
-    AC_DEFINE(ANDROID)
-else
 case "$target" in
 *-android*|*-linuxandroid*)
     if test -z "$android_ndk" ; then
        AC_MSG_ERROR([You must specify --with-android-ndk=/path/to/ndk when targeting Android.])
     fi
 
     if test -z "$android_toolchain" ; then
         AC_MSG_CHECKING([for android toolchain directory])
@@ -241,17 +226,16 @@ case "$target" in
     CPPFLAGS="-I$android_platform/usr/include $CPPFLAGS"
     CFLAGS="-mandroid -I$android_platform/usr/include -fno-short-enums -fno-exceptions $CFLAGS"
     CXXFLAGS="-mandroid -I$android_platform/usr/include -fpic -fno-short-enums -fno-exceptions $CXXFLAGS"
     LDFLAGS="-mandroid -L$android_platform/usr/lib -Wl,-rpath-link=$android_platform/usr/lib --sysroot=$android_platform $LDFLAGS"
 
     AC_DEFINE(ANDROID)
     ;;
 esac
-fi
 
 dnl ========================================================
 dnl =
 dnl = Check options that may affect the compiler
 dnl =
 dnl ========================================================
 dist_prefix='${MOD_DEPTH}/dist'
 dist_bindir='${dist_prefix}/bin'