Skip to content

S
sgxwallet
Unverified Commit 388c88e5 authored by a72d9e2bad9edfd58d6c0248c12c953b71d409d2's avatar a72d9e2bad9edfd58d6c0248c12c953b71d409d2
Browse files
Options

Added gmp

parent 39dea5d4
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 38 deletions
EnclaveGmpTest/Makefile
View file @ 388c88e5
...@@ -183,7 +183,7 @@ AM_DEFAULT_VERBOSITY = 1 ...@@ -183,7 +183,7 @@ AM_DEFAULT_VERBOSITY = 1
AUTOCONF = ${SHELL} /d/sgxd/missing autoconf AUTOCONF = ${SHELL} /d/sgxd/missing autoconf
AUTOHEADER = ${SHELL} /d/sgxd/missing autoheader AUTOHEADER = ${SHELL} /d/sgxd/missing autoheader
AUTOMAKE = ${SHELL} /d/sgxd/missing automake-1.15 AUTOMAKE = ${SHELL} /d/sgxd/missing automake-1.15
AWK = mawk AWK = gawk
CC = gcc CC = gcc
CCDEPMODE = depmode=gcc3 CCDEPMODE = depmode=gcc3
CFLAGS = -g -O2 CFLAGS = -g -O2
...@@ -200,8 +200,8 @@ ECHO_N = -n ...@@ -200,8 +200,8 @@ ECHO_N = -n
ECHO_T = ECHO_T =
ENCLAVE_SIGN_TARGET = signed_enclave_dev ENCLAVE_SIGN_TARGET = signed_enclave_dev
EXEEXT = .so EXEEXT = .so
GMP_CPPFLAGS = -I/d/gmp-build//include GMP_CPPFLAGS = -Igmp-build/include
GMP_LDFLAGS = -L/d/gmp-build//lib GMP_LDFLAGS = -Lgmp-build/lib
INSTALL = /usr/bin/install -c INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644 INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL} INSTALL_PROGRAM = ${INSTALL}
...@@ -224,10 +224,10 @@ PACKAGE_URL = ...@@ -224,10 +224,10 @@ PACKAGE_URL =
PACKAGE_VERSION = 1.0 PACKAGE_VERSION = 1.0
PATH_SEPARATOR = : PATH_SEPARATOR = :
SET_MAKE = SET_MAKE =
SGXSDK = /opt/intel/sgxsdk SGXSDK = sgx-sdk-build/sgxsdk
SGXSDK_BINDIR = /opt/intel/sgxsdk/bin/x64 SGXSDK_BINDIR = sgx-sdk-build/sgxsdk/bin/x64
SGXSDK_INCDIR = /opt/intel/sgxsdk/include SGXSDK_INCDIR = sgx-sdk-build/sgxsdk/include
SGXSDK_LIBDIR = /opt/intel/sgxsdk/lib64 SGXSDK_LIBDIR = sgx-sdk-build/sgxsdk/lib64
SGXSSL = /opt/intel/sgxssl SGXSSL = /opt/intel/sgxssl
SGXSSL_INCDIR = /opt/intel/sgxssl/include SGXSSL_INCDIR = /opt/intel/sgxssl/include
SGXSSL_LIBDIR = /opt/intel/sgxssl/lib64 SGXSSL_LIBDIR = /opt/intel/sgxssl/lib64
...@@ -246,8 +246,8 @@ SGX_UAE_SERVICE_LIB = sgx_uae_service ...@@ -246,8 +246,8 @@ SGX_UAE_SERVICE_LIB = sgx_uae_service
SGX_URTS_LIB = sgx_urts SGX_URTS_LIB = sgx_urts
SHELL = /bin/bash SHELL = /bin/bash
STRIP = STRIP =
TGMP_CPPFLAGS = -I/opt/gmp/6.1.2/include TGMP_CPPFLAGS = -Itgmp-build/include
TGMP_LDFLAGS = -L/opt/gmp/6.1.2/lib TGMP_LDFLAGS = -Ltgmp-build/lib
VERSION = 1.0 VERSION = 1.0
abs_builddir = /d/sgxd/EnclaveGmpTest abs_builddir = /d/sgxd/EnclaveGmpTest
abs_srcdir = /d/sgxd/EnclaveGmpTest abs_srcdir = /d/sgxd/EnclaveGmpTest
......
Makefile
View file @ 388c88e5
...@@ -259,7 +259,7 @@ AM_DEFAULT_VERBOSITY = 1 ...@@ -259,7 +259,7 @@ AM_DEFAULT_VERBOSITY = 1
AUTOCONF = ${SHELL} /d/sgxd/missing autoconf AUTOCONF = ${SHELL} /d/sgxd/missing autoconf
AUTOHEADER = ${SHELL} /d/sgxd/missing autoheader AUTOHEADER = ${SHELL} /d/sgxd/missing autoheader
AUTOMAKE = ${SHELL} /d/sgxd/missing automake-1.15 AUTOMAKE = ${SHELL} /d/sgxd/missing automake-1.15
AWK = mawk AWK = gawk
CC = gcc CC = gcc
CCDEPMODE = depmode=gcc3 CCDEPMODE = depmode=gcc3
CFLAGS = -g -O2 CFLAGS = -g -O2
...@@ -276,8 +276,8 @@ ECHO_N = -n ...@@ -276,8 +276,8 @@ ECHO_N = -n
ECHO_T = ECHO_T =
ENCLAVE_SIGN_TARGET = signed_enclave_dev ENCLAVE_SIGN_TARGET = signed_enclave_dev
EXEEXT = EXEEXT =
GMP_CPPFLAGS = -I/d/gmp-build//include GMP_CPPFLAGS = -Igmp-build/include
GMP_LDFLAGS = -L/d/gmp-build//lib GMP_LDFLAGS = -Lgmp-build/lib
INSTALL = /usr/bin/install -c INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644 INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL} INSTALL_PROGRAM = ${INSTALL}
...@@ -300,10 +300,10 @@ PACKAGE_URL = ...@@ -300,10 +300,10 @@ PACKAGE_URL =
PACKAGE_VERSION = 1.0 PACKAGE_VERSION = 1.0
PATH_SEPARATOR = : PATH_SEPARATOR = :
SET_MAKE = SET_MAKE =
SGXSDK = /opt/intel/sgxsdk SGXSDK = sgx-sdk-build/sgxsdk
SGXSDK_BINDIR = /opt/intel/sgxsdk/bin/x64 SGXSDK_BINDIR = sgx-sdk-build/sgxsdk/bin/x64
SGXSDK_INCDIR = /opt/intel/sgxsdk/include SGXSDK_INCDIR = sgx-sdk-build/sgxsdk/include
SGXSDK_LIBDIR = /opt/intel/sgxsdk/lib64 SGXSDK_LIBDIR = sgx-sdk-build/sgxsdk/lib64
SGXSSL = /opt/intel/sgxssl SGXSSL = /opt/intel/sgxssl
SGXSSL_INCDIR = /opt/intel/sgxssl/include SGXSSL_INCDIR = /opt/intel/sgxssl/include
SGXSSL_LIBDIR = /opt/intel/sgxssl/lib64 SGXSSL_LIBDIR = /opt/intel/sgxssl/lib64
...@@ -322,8 +322,8 @@ SGX_UAE_SERVICE_LIB = sgx_uae_service ...@@ -322,8 +322,8 @@ SGX_UAE_SERVICE_LIB = sgx_uae_service
SGX_URTS_LIB = sgx_urts SGX_URTS_LIB = sgx_urts
SHELL = /bin/bash SHELL = /bin/bash
STRIP = STRIP =
TGMP_CPPFLAGS = -I/opt/gmp/6.1.2/include TGMP_CPPFLAGS = -Itgmp-build/include
TGMP_LDFLAGS = -L/opt/gmp/6.1.2/lib TGMP_LDFLAGS = -Ltgmp-build/lib
VERSION = 1.0 VERSION = 1.0
abs_builddir = /d/sgxd abs_builddir = /d/sgxd
abs_srcdir = /d/sgxd abs_srcdir = /d/sgxd
......
compile
View file @ 388c88e5
/usr/share/automake-1.15/compile /usr/share/automake-1.16/compile
\ No newline at end of file \ No newline at end of file
configure
View file @ 388c88e5
...@@ -4252,6 +4252,11 @@ else ...@@ -4252,6 +4252,11 @@ else
as_fn_error $? "Unknown build mode $_sgxbuild" "$LINENO" 5 as_fn_error $? "Unknown build mode $_sgxbuild" "$LINENO" 5
fi fi
SGXSDK=sgx-sdk-build/sgxsdk
SGX_DEBUG_FLAGS=$_sgxdebug SGX_DEBUG_FLAGS=$_sgxdebug
SGXSDK_INCDIR=$SGXSDK/include SGXSDK_INCDIR=$SGXSDK/include
...@@ -4260,13 +4265,10 @@ fi ...@@ -4260,13 +4265,10 @@ fi
ac_cv_sgx_sdk=$SGXSDK ac_cv_sgx_sdk=$SGXSDK
ac_cv_sgx_sdk_incdir=$SGXSDK/include ac_cv_sgx_sdk_incdir=$SGXSDK/include
if test -d $SGXSDK/lib; then :
SGXSDK_LIBDIR=$SGXSDK/lib
ac_cv_sgx_sdk_libdir=$SGXSDK/lib
elif test -d $SGXSDK/lib64; then : if test -d $SGXSDK/lib64; then :
SGXSDK_LIBDIR=$SGXSDK/lib64 SGXSDK_LIBDIR=$SGXSDK/lib64
...@@ -4274,17 +4276,15 @@ elif test -d $SGXSDK/lib64; then : ...@@ -4274,17 +4276,15 @@ elif test -d $SGXSDK/lib64; then :
else else
as_fn_error $? "Can't find Intel SGX SDK lib directory" "$LINENO" 5 as_fn_error $? "Can't find Intel SGX SDK lib directory $SGXSDK" "$LINENO" 5
fi fi
if test -d $SGXSDK/bin/ia32; then :
ac_cv_sgx_sdk_bindir=$SGXSDK/bin
SGXSDK_BINDIR=$SGXSDK/bin/ia32
elif test -d $SGXSDK/bin/x64; then :
if test -d $SGXSDK/bin/x64; then :
ac_cv_sgx_sdk_bindir=$SGXSDK/bin/x64 ac_cv_sgx_sdk_bindir=$SGXSDK/bin/x64
SGXSDK_BINDIR=$SGXSDK/bin/x64 SGXSDK_BINDIR=$SGXSDK/bin/x64
...@@ -4292,7 +4292,7 @@ elif test -d $SGXSDK/bin/x64; then : ...@@ -4292,7 +4292,7 @@ elif test -d $SGXSDK/bin/x64; then :
else else
as_fn_error $? "Can't find Intel SGX SDK bin directory" "$LINENO" 5 as_fn_error $? "Can't find Intel SGX SDK bin directory in $SGXSDK" "$LINENO" 5
fi fi
......
depcomp
View file @ 388c88e5
/usr/share/automake-1.15/depcomp /usr/share/automake-1.16/depcomp
\ No newline at end of file \ No newline at end of file
install-sh
View file @ 388c88e5
/usr/share/automake-1.15/install-sh /usr/share/automake-1.16/install-sh
\ No newline at end of file \ No newline at end of file
missing
View file @ 388c88e5
/usr/share/automake-1.15/missing /usr/share/automake-1.16/missing
\ No newline at end of file \ No newline at end of file
scripts/build.py
View file @ 388c88e5
...@@ -66,14 +66,14 @@ GMP_BUILD_DIR = "gmp-build" ...@@ -66,14 +66,14 @@ GMP_BUILD_DIR = "gmp-build"
TGMP_BUILD_DIR = "tgmp-build" TGMP_BUILD_DIR = "tgmp-build"
SDK_DIR = topDir + "/sgx-sdk-build" SDK_DIR = topDir + "/sgx-sdk-build"
INSTALL_SH = "/usr/share/automake-1.16/install-sh" AUTOMAKE_DIR = "/usr/share/automake-1.16"
if not os.path.isfile(INSTALL_SH): if not os.path.isdir(AUTOMAKE_DIR):
INSTALL_SH = "/usr/share/automake-1.15/install-sh" INSTALL_SH = "/usr/share/automake-1.15"
if not os.path.isfile(INSTALL_SH): if not os.path.isdir(AUTOMAKE_DIR):
raise Exception("Could not find " + INSTALL_SH) raise Exception("Could not find " + AUTOMAKE_DIR)
...@@ -82,6 +82,10 @@ if not os.path.isfile(INSTALL_SH): ...@@ -82,6 +82,10 @@ if not os.path.isfile(INSTALL_SH):
subprocess.call(["rm", "-f", "install-sh"]); subprocess.call(["rm", "-f", "install-sh"]);
subprocess.call(["rm", "-f", "compile"]);
subprocess.call(["rm", "-f", "missing"]);
subprocess.call(["rm", "-f", "depcomp"]);
subprocess.call(["rm", "-rf", GMP_BUILD_DIR]); subprocess.call(["rm", "-rf", GMP_BUILD_DIR]);
subprocess.call(["rm", "-rf", TGMP_BUILD_DIR]); subprocess.call(["rm", "-rf", TGMP_BUILD_DIR]);
subprocess.call(["rm", "-rf", SDK_DIR]); subprocess.call(["rm", "-rf", SDK_DIR]);
...@@ -92,7 +96,12 @@ subprocess.call(["mkdir", "-p", TGMP_BUILD_DIR]); ...@@ -92,7 +96,12 @@ subprocess.call(["mkdir", "-p", TGMP_BUILD_DIR]);
subprocess.call(["mkdir", "-p", SDK_DIR]); subprocess.call(["mkdir", "-p", SDK_DIR]);
subprocess.call(["ln", "-s", INSTALL_SH, "install-sh"]) subprocess.call(["ln", "-s", AUTOMAKE_DIR + "/install-sh", "install-sh"])
subprocess.call(["ln", "-s", AUTOMAKE_DIR + "/depcomp", "depcomp"])
subprocess.call(["ln", "-s", AUTOMAKE_DIR + "/missing", "missing"])
subprocess.call(["ln", "-s", AUTOMAKE_DIR + "/compile", "compile"])
subprocess.call(["scripts/sgx_linux_x64_sdk_2.5.100.49891.bin", "--prefix=" + topDir + "/sgx-sdk-build"]); subprocess.call(["scripts/sgx_linux_x64_sdk_2.5.100.49891.bin", "--prefix=" + topDir + "/sgx-sdk-build"]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment