Author: mturk
Date: Wed Nov 11 22:22:42 2009
New Revision: 835100
URL: http://svn.apache.org/viewvc?rev=835100&view=rev
Log:
Allow 64-bit cross compile on 32-bit windows - Not complete
Modified:
commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in
commons/sandbox/runtime/trunk/src/main/native/configure
commons/sandbox/runtime/trunk/src/main/native/test/testcase.c
Modified: commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in?rev=835100&r1=835099&r2=835100&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in (original)
+++ commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in Wed Nov 11
22:22:42 2009
@@ -275,6 +275,7 @@
-...@del /Q $(SRCDIR)\modules\network\ssl\*.$(OBJ) 2>NUL
-...@del /Q $(SRCDIR)\srclib\bzip2\*.$(OBJ) 2>NUL
-...@del /Q $(SRCDIR)\srclib\regex\*.$(OBJ) 2>NUL
+ -...@del /Q $(SRCDIR)\srclib\sqlite\*.$(OBJ) 2>NUL
-...@del /Q $(SRCDIR)\srclib\zlib\*.$(OBJ) 2>NUL
-...@del /Q *.dll 2>NUL
-...@del /Q *.lib 2>NUL
Modified: commons/sandbox/runtime/trunk/src/main/native/configure
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/configure?rev=835100&r1=835099&r2=835100&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure Wed Nov 11 22:22:42
2009
@@ -931,17 +931,18 @@
fi
test -x $test$exe && rc=`./$test$exe 2>/dev/null`
rm -rf $test.* $test *.pdb >/dev/null 2>&1 || true
+ test ".$rc" = . && rc=$2
echo $rc 1>&2
echo $rc
}
-sizeof_int=`check_sizeof int`
+sizeof_int=`check_sizeof int 4`
if [ ".$sizeof_int" = .0 ]; then
echo "[ERROR] Cannot determine the size of int." 1>&2
exit 1
fi
-sizeof_wchar=`check_sizeof wchar_t`
+sizeof_wchar=`check_sizeof wchar_t 2`
if [ ".$sizeof_wchar" = .0 ]; then
echo "[ERROR] Cannot determine the size of wchar_t." 1>&2
exit 1
@@ -949,14 +950,14 @@
have_long_long=1
have_long_double=1
-sizeof_long_long=`check_sizeof 'long long'`
+sizeof_long_long=`check_sizeof 'long long' 0`
test ".$sizeof_long_long" = .0 && have_long_long=0
-sizeof_long_double=`check_sizeof 'long double'`
+sizeof_long_double=`check_sizeof 'long double' 0`
test ".$sizeof_long_double" = .0 && have_long_double=0
if [ ".$host" = .windows ]; then
- have_ktmw32=`have_include ktmw32`
+ have_ktmw32=`have_include 1 ktmw32`
have_aio=0
have_libaio=0
have_windows=1
@@ -965,7 +966,7 @@
else
have_ktmw32=0
have_off64t=1
- sizeof_off64_t=`check_sizeof off64_t`
+ sizeof_off64_t=`check_sizeof off64_t 0`
test ".$sizeof_off64_t" = .0 && have_off64t=0
have_aio=`have_include 0 aio`
have_libaio=`have_include 0 libaio`
@@ -1002,7 +1003,7 @@
fi
if [ ".$host" = ".solaris" ]; then
- have_port=`have_include port`
+ have_port=`have_include 0 port`
if [ ".$have_port" = .1 ]; then
have_port=`have_function 0 port_create`
fi
@@ -1188,11 +1189,11 @@
#define CC_SIZEOF_INT $sizeof_int
#define CC_SIZEOF_WCHAR_T $sizeof_wchar
-#define CC_SIZEOF_LONG `check_sizeof long`
+#define CC_SIZEOF_LONG `check_sizeof long 4`
#define CC_SIZEOF_LONG_LONG $sizeof_long_long
#define CC_SIZEOF_LONG_DOUBLE $sizeof_long_double
-#define CC_SIZEOF_VOIDP `check_sizeof 'void *'`
-#define CC_SIZEOF_SIZE_T `check_sizeof size_t`
+#define CC_SIZEOF_VOIDP `check_sizeof 'void *' 8`
+#define CC_SIZEOF_SIZE_T `check_sizeof size_t 4`
#define CC_SIZEOF_OFF64_T $sizeof_off64_t
#define CC_IS_BIG_ENDIAN $bige
Modified: commons/sandbox/runtime/trunk/src/main/native/test/testcase.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/test/testcase.c?rev=835100&r1=835099&r2=835100&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/test/testcase.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/test/testcase.c Wed Nov 11
22:22:42 2009
@@ -39,6 +39,7 @@
#if defined (WIN32)
#include <io.h>
+#include <fcntl.h>
#include <sys/stat.h>
#define random rand
#define srandom srand
