Browse Source

Fixes to compile on ios 5.1

mingodad 10 years ago
parent
commit
738f986026

+ 2 - 1
SquiLu/Makefile-SquiLu-PI3

@@ -52,7 +52,8 @@ CFLAGS = $(INC) -O3 -Wall -fno-strict-aliasing  \
     -DWITH_MPDECIMAL=1 \
     -DWITH_MYSQL2=1 \
     -DWITH_POSTGRESQL2=1 \
-    -DWITH_UUID=1
+    -DWITH_UUID=1 \
+    -DSC_USE_MKSTEMP=1
 
 RESINC = 
 #LIBDIR =  -Llib -L../myaxtls -L../mpdecimal -L../discount

+ 6 - 4
SquiLu/Makefile-SquiLu-ios-through-linux

@@ -49,7 +49,7 @@ CFLAGS = $(INC) -O3 -Wall -fno-strict-aliasing  \
     -DWITH_UUID=1 \
     -DSQLITE_ENABLE_JSON1=1 \
     -DSQLITE_OMIT_PREPARED=1 \
-    -DTARGET_IOS=1
+    -DTARGET_IOS=1 -DWITHOUTH_SHA512=1
 
 RESINC = 
 LIBDIR = -L$(MYSDKPREFIX)/lib -L$(MYSDKPREFIX)/lib/system -Llib
@@ -98,6 +98,7 @@ SOURCES= sq/sq.c  \
     ../SquiLu-ext/sq_tinyxml2.cpp  \
     ../SquiLu-ext/sq_zlib.cpp  \
     ../SquiLu-ext/tinyxml2.cpp \
+    ../SquiLu-ext/dad_utils.cpp \
     squirrel/lua-regex.c  \
     squirrel/sqapi.cpp  \
     squirrel/sqbaselib.cpp  \
@@ -106,6 +107,7 @@ SOURCES= sq/sq.c  \
     squirrel/sqdebug.cpp  \
     squirrel/sqfuncstate.cpp  \
     squirrel/sqlexer.cpp  \
+    squirrel/sq_lexer.cpp  \
     squirrel/sqmem.cpp  \
     squirrel/sqobject.cpp  \
     squirrel/sqstate.cpp  \
@@ -135,8 +137,8 @@ AXTLS_SRC_FILES := \
 	$(AXTLS_PATH)/tls1_clnt.c \
 	$(AXTLS_PATH)/tls1_svr.c \
 	$(AXTLS_PATH)/x509.c
-#	$(AXTLS_PATH)/sha384.c \
-#	$(AXTLS_PATH)/sha512.c \
+#	$(AXTLS_PATH)/sha384.c
+#	$(AXTLS_PATH)/sha512.c
 
 AXTLS_OPT_DEFINES := \
 	-DCONFIG_SSL_ENABLE_CLIENT2=1 \
@@ -278,7 +280,7 @@ SOURCES += $(UNQL_SRC_FILES)
 	$(CC) -c -o $@ $< $(CFLAGS)
 	
 %.o: %.cpp
-	$(CXX) -c -o $@ $< $(CFLAGS)
+	$(CXX) -c -o $@ $< $(CPPFLAGS)
 	
 squilu-ios: $(OBJECTS)
 	$(CC) $(CFLAGS) -o $@ $(SOURCES) $(LIBDIR) $(LDFLAGS)

+ 1 - 1
SquiLu/do-mk-ios

@@ -4,7 +4,7 @@ MYCCTOOLS=$HOME/local/cctools
 export PATH=$MYCCTOOLS/bin:$CLANG_HOME/bin:$PATH
 export LD_LIBRARY_PATH=$CLANG_HOME/lib:$LD_LIBRARY_PATH
 export CFLAGS=-I$CLANG_HOME/include
-export CXXFLAGS=$CFLAGS
+export CXXFLAGS="$CFLAGS -std=c++11"
 export LDLAGS=-L$CLANG_HOME/lib
 export CC=clang
 export CXX=clang++

+ 2 - 1
myaxtls/Makefile

@@ -2,7 +2,8 @@ CFLAGS = -O3 -DSSL_STATIC_LIBRARY=1 -DAXTLS_LIBRARY=1 -DAS_STATIC_LIB=1 -DCONFIG
 
 SOURCES= aes.c asn1.c bigint.c crypto_misc.c gen_cert.c hmac.c \
     loader.c sha256.c md5.c openssl.c os_port.c p12.c rc4.c \
-    rsa.c sha1.c tls1.c tls1_clnt.c tls1_svr.c x509.c
+    rsa.c sha1.c tls1.c tls1_clnt.c tls1_svr.c x509.c \
+    sha384.c sha512.c
 
 OBJECTS = $(SOURCES:.c=.o)
 

+ 1 - 1
myaxtls/os_int.h

@@ -57,7 +57,7 @@ typedef INT64 int64_t;
 #else
 #include <stdint.h>
 #if defined(TARGET_IOS)
-
+	#define be64toh(val) OSSwapBigToHostConstInt64(val)
 #elif defined(__BSD__)
     #include <sys/types.h>
     #include <sys/endian.h>

+ 0 - 1
myaxtls/os_port.h

@@ -164,7 +164,6 @@ EXP_FUNC int STDCALL getdomainname(char *buf, int buf_size);
 #include <sys/wait.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <asm/byteorder.h>
 
 #define SOCKET_READ(A,B,C)      read(A,B,C)
 #define SOCKET_WRITE(A,B,C)     write(A,B,C)

+ 2 - 0
myaxtls/x509.c

@@ -156,6 +156,7 @@ int x509_new(const uint8_t *cert, int *len, X509_CTX **ctx)
         }
             break;
 
+#ifndef WITHOUTH_SHA512
         case SIG_TYPE_SHA384:
         {
             SHA384_CTX sha384_ctx;
@@ -177,6 +178,7 @@ int x509_new(const uint8_t *cert, int *len, X509_CTX **ctx)
             x509_ctx->digest = bi_import(bi_ctx, sha512_dgst, SHA512_SIZE);
         }
             break;
+#endif
     }
 
     if (cert[offset] == ASN1_V3_DATA)