try to make libcript available

tshirtman · tshirtman · commit d80e772b82e7 · 2012-08-16T00:42:52.000+02:00
diff --git a/recipes/libcrypt/recipe.sh b/recipes/libcrypt/recipe.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+VERSION_libcrypt=0.03
+URL_libcrypt=http://sourceforge.net/projects/libcrypt/files/libcrypt/$VERSION_libcrypt/crypt_${VERSION_libcrypt/./_}.zip
+DEPS_libcrypt=()
+BUILD_libcrypt=$BUILD_PATH/libcrypt/$(get_directory $URL_libcrypt)
+RECIPE_libcrypt=$RECIPES_PATH/libcrypt
+
+function prebuild_libcrypt() {
+	sed -i "s/-mpentium //" $BUILD_PATH/libcrypt/makefile
+	try rm  $BUILD_PATH/libcrypt/crypt_0_03
+	if [ ! -d $BUILD_libcrypt ]
+	then
+		mkdir $BUILD_libcrypt
+		cp $BUILD_PATH/libcrypt/* $BUILD_libcrypt
+	fi
+	true
+}
+
+function build_libcrypt() {
+	cd $BUILD_libcrypt
+
+	if [ -f libcrypt.a ]; then
+		return
+	fi
+
+	push_arm
+
+	try make
+
+	pop_arm
+}
+
+function postbuild_libcrypt() {
+	true
+}
diff --git a/recipes/python/patches/disable-modules.patch b/recipes/python/patches/disable-modules.patch
@@ -5,7 +5,7 @@
  
  # This global variable is used to hold the list of modules to be disabled.
 -disabled_module_list = []
-+disabled_module_list = ['spwd', '_ctypes','bz2','ossaudiodev','_curses','_curses_panel','readline','_locale','_bsddb','gdbm','dbm','nis','linuxaudiodev','crypt','_multiprocessing']
++disabled_module_list = ['spwd', '_ctypes','bz2','ossaudiodev','_curses','_curses_panel','readline','_locale','_bsddb','gdbm','dbm','nis','linuxaudiodev','_multiprocessing']
  
  def add_dir_to_list(dirlist, dir):
      """Add the directory 'dir' to the list 'dirlist' (at the front) if
diff --git a/recipes/python/recipe.sh b/recipes/python/recipe.sh
@@ -63,6 +63,13 @@ function build_python() {
 		export LDFLAGS="$LDFLAGS -L$BUILD_openssl/"
 	fi
 
+
+	# libcrypt activated ?
+	if [ "X$BUILD_libcrypt" != "X" ]; then
+		nebug "Activate flags for libcrypt / python"
+		export LDFLAGS="$LDFLAGS -L$BUILD_libcrypt/"
+	fi
+
 	try ./configure --host=arm-eabi --prefix="$BUILD_PATH/python-install" --enable-shared --disable-toolbox-glue --disable-framework
 	echo ./configure --host=arm-eabi --prefix="$BUILD_PATH/python-install" --enable-shared --disable-toolbox-glue --disable-framework
 	echo $MAKE HOSTPYTHON=$BUILD_python/hostpython HOSTPGEN=$BUILD_python/hostpgen CROSS_COMPILE_TARGET=yes INSTSONAME=libpython2.7.so
diff --git a/src/src/org/renpy/android/PythonActivity.java b/src/src/org/renpy/android/PythonActivity.java
@@ -220,6 +220,7 @@ public void run() {
 		System.loadLibrary("python2.7");
         System.loadLibrary("application");
         System.loadLibrary("sdl_main");
+        System.loadLibrary("crypt");
 
 		System.load(getFilesDir() + "/lib/python2.7/lib-dynload/_io.so");
         System.load(getFilesDir() + "/lib/python2.7/lib-dynload/unicodedata.so");
