Changeset 26783 for gs2-extensions/gnome-lib/trunk/src

Timestamp:

2013-01-25T15:29:56+13:00 (11 years ago)

Author:

davidb

Message:

Changes that resulted from testing under Android NDK

File:

• gs2-extensions/gnome-lib/trunk/src/packages/CASCADE-MAKE/LIBICONV.sh (modified) (1 diff)

gs2-extensions/gnome-lib/trunk/src/packages/CASCADE-MAKE/LIBICONV.sh

@@ -10 +10 @@
 prefix=$GEXTGNOME_INSTALLED
 
+if [ "x$crossOS" = "xandroid" ] ; then
+  # Stops configure generating a local 'stdint.h' in 'srclib' folder
+  # (when this file was generated, caused no end of issues with chaining
+  #  standard header files, errors with time_t, pid_t etc)
+  # Fix came from:
+  #  http://stackoverflow.com/questions/9053702/building-libiconv-fails-with-the-android-standalone-toolchain
+
+  extra_config_args="gl_cv_header_working_stdint_h=yes"
+else
+  extra_config_args=
+fi
+
+
 opt_run_untar $force_untar $auto_untar $package $version
-opt_run_configure $force_config $auto_config $package $version $prefix
+opt_run_configure $force_config $auto_config $package $version $prefix \
+  $extra_config_args
 
 opt_run_make $compile $package $version