From 8c69f9699a45c61c24ad96247f23d47b9c7e0e14 Mon Sep 17 00:00:00 2001 From: superhuawei1840 Date: Tue, 2 Jun 2020 13:47:23 +0800 Subject: [PATCH 1/7] add fix gmp,libpbc --- gmp.sh | 4 ++-- libpbc-configure.ac | 2 +- libpbc.sh | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gmp.sh b/gmp.sh index f7ba546..c36ceb1 100644 --- a/gmp.sh +++ b/gmp.sh @@ -6,13 +6,13 @@ cd gmp-6.1.2 sed -i '2igmp_asm_syntax_testing=no' configure -emconfigure ./configure --disable-assembly --disable-shared --prefix=$EMSCRIPTEN/system +emconfigure ./configure --disable-assembly --disable-shared --prefix=$EMSCRIPTEN/system --enable-cxx --host none echo '#define HAVE_MEMSET 1' >> config.h echo '#define HAVE_STRNLEN 1' >> config.h echo '#define HAVE_VSNPRINTF 1' >> config.h -make -j 12 +emmake make make install cd .. diff --git a/libpbc-configure.ac b/libpbc-configure.ac index 989f7b6..985d8da 100644 --- a/libpbc-configure.ac +++ b/libpbc-configure.ac @@ -10,7 +10,7 @@ AC_CONFIG_SRCDIR([./]) LT_INIT #AC_CANONICAL_HOST -CFLAGS= +CFLAGS+="$CFLAGS" default_fink_path=/sw case $host_os in darwin*) diff --git a/libpbc.sh b/libpbc.sh index 5dce82a..564ccf0 100644 --- a/libpbc.sh +++ b/libpbc.sh @@ -3,12 +3,12 @@ wget https://crypto.stanford.edu/pbc/files/pbc-0.5.14.tar.gz tar xf pbc-0.5.14.tar.gz cd pbc-0.5.14 - +CFLAGS="-L/usr/lib/ -L/usr/include/" cp ../libpbc-configure.ac configure.ac automake autoconf -emconfigure ./configure --prefix=$EMSCRIPTEN/system --disable-shared -emmake make -j 12 +emconfigure ./configure --prefix=$EMSCRIPTEN/system --disable-sharedi --host none +emmake make emmake make install cd .. From 038b22aaf72c6ca5e0bcc0d84ecd51bd02bbc00a Mon Sep 17 00:00:00 2001 From: superhuawei1840 Date: Tue, 2 Jun 2020 20:05:28 +0800 Subject: [PATCH 2/7] fix openssl --- openssl.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/openssl.sh b/openssl.sh index 5dfc61c..eecb312 100644 --- a/openssl.sh +++ b/openssl.sh @@ -1,10 +1,15 @@ -#!/bin/sh +#!/bin/bash -wget https://www.openssl.org/source/openssl-1.1.0h.tar.gz -tar xf openssl-1.1.0h.tar.gz -cd openssl-1.1.0h +wget https://www.openssl.org/source/openssl-1.1.1g.tar.gz +tar xf openssl-1.1.1g.tar.gz +cd openssl-1.1.1g -emconfigure ./Configure linux-generic64 --prefix=$EMSCRIPTEN/system +bash_cv_wcwidth_broken=no +bash_cv_signal_vintage=posix +ac_cv_lib_util_openpty=no +ac_cv_lib_dir_opendir=no + +emconfigure ./Configure linux-generic64 --prefix=$EMSCRIPTEN/system no-threads no-shared sed -i 's|^CROSS_COMPILE.*$|CROSS_COMPILE=|g' Makefile From 050b51f7c38465c96efa003d74f6195b971b88b8 Mon Sep 17 00:00:00 2001 From: superhuawei1840 Date: Tue, 2 Jun 2020 20:12:03 +0800 Subject: [PATCH 3/7] add readline --- .openssl.sh.swp | Bin 0 -> 12288 bytes readline.sh | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 .openssl.sh.swp create mode 100644 readline.sh diff --git a/.openssl.sh.swp b/.openssl.sh.swp new file mode 100644 index 0000000000000000000000000000000000000000..72d35683eb9e97a4ad90b6c72e84d89b2df3f5e1 GIT binary patch literal 12288 zcmeI2J#W)M7{{;d1q2c!TuG%$MYiKol@}=jDGE{~LaT%_Fw{ER7yGE+ba$>36u}IF zZ@@hzl3 z_RiDR6Gsh|=BWcVv)$@akp)Q^@@W(HX`3fo$RznG;Z6i0JWbg?r{f>%1$8&5Uy3C3 zBA#){G!Ku8o2wWa&cR{{x~4{Z&F*%u=QX!GJMG6Udwq3u>_%f0t6@PY#miu6Ju zJ;NR5MwZVRN-dJHrO-oT@tKN^lM+$J67N7{nnk=(ob! zb9E!4nWTf`r|m{I+_j^Zq>8wvvDSsU?>JRe+0!=qTt<${OBu`#b^M$hd6L?S> config.h +echo '#define HAVE_STRNLEN 1' >> config.h +echo '#define HAVE_VSNPRINTF 1' >> config.h + +emmake make +make install + +cd .. +rm -rf readline-8.0 From 474d0d80108ebaa8287e0a33920db238c0e807e9 Mon Sep 17 00:00:00 2001 From: superhuawei1840 Date: Tue, 2 Jun 2020 20:17:58 +0800 Subject: [PATCH 4/7] fix dotFile --- .gitignore | 1 + .openssl.sh.swp | Bin 12288 -> 0 bytes 2 files changed, 1 insertion(+) delete mode 100644 .openssl.sh.swp diff --git a/.gitignore b/.gitignore index 5a2a91b..087e408 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ samples/node_modules truebit-os +.* diff --git a/.openssl.sh.swp b/.openssl.sh.swp deleted file mode 100644 index 72d35683eb9e97a4ad90b6c72e84d89b2df3f5e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2J#W)M7{{;d1q2c!TuG%$MYiKol@}=jDGE{~LaT%_Fw{ER7yGE+ba$>36u}IF zZ@@hzl3 z_RiDR6Gsh|=BWcVv)$@akp)Q^@@W(HX`3fo$RznG;Z6i0JWbg?r{f>%1$8&5Uy3C3 zBA#){G!Ku8o2wWa&cR{{x~4{Z&F*%u=QX!GJMG6Udwq3u>_%f0t6@PY#miu6Ju zJ;NR5MwZVRN-dJHrO-oT@tKN^lM+$J67N7{nnk=(ob! zb9E!4nWTf`r|m{I+_j^Zq>8wvvDSsU?>JRe+0!=qTt<${OBu`#b^M$hd6L?S Date: Tue, 2 Jun 2020 20:20:08 +0800 Subject: [PATCH 5/7] fix gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 087e408..7ed6d10 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ samples/node_modules truebit-os .* - +!/.gitignore From 045c5c87065d4fb3f7597ce70286a77dc5743a82 Mon Sep 17 00:00:00 2001 From: superhuawei1840 Date: Sat, 8 Aug 2020 00:57:23 +0800 Subject: [PATCH 6/7] add libntl.sh --- libntl.sh | 9 +++++++++ makefile.ntl.patch | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 libntl.sh create mode 100644 makefile.ntl.patch diff --git a/libntl.sh b/libntl.sh new file mode 100644 index 0000000..e0f6d81 --- /dev/null +++ b/libntl.sh @@ -0,0 +1,9 @@ +#!/bin/bash +wget http://www.shoup.net/ntl/ntl-10.5.0.tar.gz +tar xf ntl-10.5.0.tar.gz +cd ntl-10.5.0 +cd src +emconfigure ./configure DEF_PREFIX=${HOME}/opt NTL_GMP_LIP=on +patch < makefile.ntl.patch +make -j 6 +make install diff --git a/makefile.ntl.patch b/makefile.ntl.patch new file mode 100644 index 0000000..b71e3d8 --- /dev/null +++ b/makefile.ntl.patch @@ -0,0 +1,42 @@ +10c10,12 +< CXX=g++ +--- +> CXX=em++ +> CXXCC=g++ +> GMPTARGET=$(HOME)/opt +14c16 +< CXXFLAGS=-g -O2 +--- +> CXXFLAGS=-g -O2 +18a21,22 +> NTL_LONG_LONG_TYPE = unsigned long long +> NTL_ULONG_TO_LONG = unsigned long long +20,21c24 +< +< AR=ar +--- +> AR=emar +120c123 +< WIZARD=on +--- +> WIZARD=off +309,310c312,315 +< $(COMPILE) MakeDescAux.cpp +< $(LINK) -o MakeDesc MakeDesc.cpp MakeDescAux.o $(LDLIBS) +--- +> # $(COMPILE) MakeDescAux.cpp +> # $(LINK) -o MakeDesc MakeDesc.cpp MakeDescAux.o $(LDLIBS) +> $(CXCC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) -c MakeDescAux.cpp +> $(CXCC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o MakeDesc MakeDesc.cpp MakeDescAux.o $(LDLIBS) +319c324,325 +< sh MakeGetTime "$(LINK)" "$(LDLIBS)" +--- +> # sh MakeGetTime "$(LINK)" "$(LDLIBS)" +> sh MakeGetTime "g++ $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)" "$(LDLIBS)" +333c339,342 +< $(LINK) $(GMP_OPT_INCDIR) -o gen_gmp_aux gen_gmp_aux.cpp $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(LDLIBS) +--- +> # $(LINK) $(GMP_OPT_INCDIR) -o gen_gmp_aux gen_gmp_aux.cpp $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(LDLIBS) +> # g++ $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -I/home/sme001/opt/include -o gen_lip_gmp_aux gen_lip_gmp_aux.cpp -L/home/sme001/opt/lib $(GMP_OPT_LIB) $(LDLIBS) +> # ./gen_lip_gmp_aux > lip_gmp_aux_impl.h +> $(CXXCC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -I/home/sme001/opt/include -o gen_gmp_aux gen_gmp_aux.cpp -L/usr/lib/x86_64-linux-gnu/ $(GMP_OPT_LIB) $(LDLIBS) From 68acb66ffa3e2207ab8338a52669955ff01e7933 Mon Sep 17 00:00:00 2001 From: superhuawei1840 Date: Sat, 8 Aug 2020 01:02:21 +0800 Subject: [PATCH 7/7] add makefile.ntl.patch --- makefile.ntl.patch | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/makefile.ntl.patch b/makefile.ntl.patch index b71e3d8..7dd4276 100644 --- a/makefile.ntl.patch +++ b/makefile.ntl.patch @@ -16,6 +16,10 @@ < AR=ar --- > AR=emar +46c49 +< DEF_PREFIX=/home/sme001/opt +--- +> DEF_PREFIX=$(HOME)/opt 120c123 < WIZARD=on --- @@ -33,10 +37,9 @@ --- > # sh MakeGetTime "$(LINK)" "$(LDLIBS)" > sh MakeGetTime "g++ $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)" "$(LDLIBS)" -333c339,342 +333c339,341 < $(LINK) $(GMP_OPT_INCDIR) -o gen_gmp_aux gen_gmp_aux.cpp $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(LDLIBS) --- > # $(LINK) $(GMP_OPT_INCDIR) -o gen_gmp_aux gen_gmp_aux.cpp $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(LDLIBS) -> # g++ $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -I/home/sme001/opt/include -o gen_lip_gmp_aux gen_lip_gmp_aux.cpp -L/home/sme001/opt/lib $(GMP_OPT_LIB) $(LDLIBS) > # ./gen_lip_gmp_aux > lip_gmp_aux_impl.h -> $(CXXCC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -I/home/sme001/opt/include -o gen_gmp_aux gen_gmp_aux.cpp -L/usr/lib/x86_64-linux-gnu/ $(GMP_OPT_LIB) $(LDLIBS) +> $(CXXCC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -I$(HOME)/opt/include -o gen_gmp_aux gen_gmp_aux.cpp -L/usr/lib/x86_64-linux-gnu/ $(GMP_OPT_LIB) $(LDLIBS)