Bump ed25519 version, remove patch, snapcraft fix attempt (#1607)

Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
hyperledger · Jul 27, 2018 · 8f508ed · 8f508ed
1 parent 30d7ee0
commit 8f508ed
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 42 deletions.
diff --git a/cmake/Modules/Finded25519.cmake b/cmake/Modules/Finded25519.cmake
@@ -12,12 +12,7 @@ find_package_handle_standard_args(ed25519 DEFAULT_MSG
     )
 
 set(URL https://github.com/hyperledger/iroha-ed25519)
-if (MSVC)
-  # trunk/1.2 with windows-specific changes
-  set(VERSION 31bb9b50e01b21ea2c21d33929e20934be4665b4)
-else()
-  set(VERSION e7188b8393dbe5ac54378610d53630bd4a180038)
-endif()
+set(VERSION f42953c631fae93011612f6b1ee33f1f88c3f8af)
 set_target_description(ed25519 "Digital signature algorithm" ${URL} ${VERSION})
 
 if (NOT ed25519_FOUND)

diff --git a/docker/android/Dockerfile b/docker/android/Dockerfile
@@ -46,7 +46,7 @@ RUN set -ex; \
 # ed25519
 RUN set -e; \
 	git clone git://github.com/hyperledger/iroha-ed25519; \
-	(cd ./iroha-ed25519 ; git checkout e7188b8393dbe5ac54378610d53630bd4a180038); \
+	(cd ./iroha-ed25519 ; git checkout f42953c631fae93011612f6b1ee33f1f88c3f8af); \
 	cmake -DCMAKE_SYSTEM_NAME=Android -DCMAKE_SYSTEM_VERSION=$VERSION -DCMAKE_ANDROID_ARCH_ABI=$PLATFORM -DANDROID_NDK=$NDK_PATH -DCMAKE_ANDROID_STL_TYPE=c++_static -DCMAKE_INSTALL_PREFIX=$DEPS_DIR -DTESTING=OFF -DCMAKE_BUILD_TYPE=$BUILD_TYPE_A -DBUILD=STATIC -H./iroha-ed25519 -B./iroha-ed25519/build; \
 	VERBOSE=1 cmake --build ./iroha-ed25519/build --target install -- -j$PARALLELISM; \
 	mv "$DEPS_DIR"/lib/static/libed25519.a "$DEPS_DIR"/lib; rmdir "$DEPS_DIR"/lib/static/
diff --git a/docker/dependencies/Dockerfile b/docker/dependencies/Dockerfile
@@ -234,7 +234,7 @@ RUN set -e; \
 # install ed25519
 RUN set -e; \
     git clone git://github.com/hyperledger/iroha-ed25519.git /tmp/ed25519; \
-    (cd /tmp/ed25519 ; git checkout e7188b8393dbe5ac54378610d53630bd4a180038); \
+    (cd /tmp/ed25519 ; git checkout f42953c631fae93011612f6b1ee33f1f88c3f8af); \
     cmake \
         -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
         -DTESTING=OFF \

diff --git a/docker/develop/Dockerfile b/docker/develop/Dockerfile
@@ -221,7 +221,7 @@ RUN set -e; \
 # install ed25519
 RUN set -e; \
     git clone git://github.com/hyperledger/iroha-ed25519.git /tmp/ed25519; \
-    (cd /tmp/ed25519 ; git checkout e7188b8393dbe5ac54378610d53630bd4a180038); \
+    (cd /tmp/ed25519 ; git checkout f42953c631fae93011612f6b1ee33f1f88c3f8af); \
     cmake \
         -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
         -DTESTING=OFF \

diff --git a/patch/close.patch b/patch/close.patch
diff --git a/shared_model/packages/android/android-build.sh b/shared_model/packages/android/android-build.sh
@@ -93,7 +93,7 @@ VERBOSE=1 cmake --build ./protobuf/.build --target install -- -j"$CORES"
 
 # ed25519
 git clone https://github.com/hyperledger/iroha-ed25519.git
-(cd ./iroha-ed25519 ; git checkout e7188b8393dbe5ac54378610d53630bd4a180038)
+(cd ./iroha-ed25519 ; git checkout f42953c631fae93011612f6b1ee33f1f88c3f8af)
 cmake "${ANDROID_TOOLCHAIN_ARGS[@]}" "${INSTALL_ARGS[@]}" -DTESTING=OFF -DCMAKE_BUILD_TYPE="$BUILD_TYPE" -DBUILD=STATIC -H./iroha-ed25519 -B./iroha-ed25519/build
 VERBOSE=1 cmake --build ./iroha-ed25519/build --target install -- -j"$CORES"
 mv "$DEPS_DIR"/lib/static/libed25519.a "$DEPS_DIR"/lib; rmdir "$DEPS_DIR"/lib/static/

diff --git a/shared_model/packages/ios/ios-build.sh b/shared_model/packages/ios/ios-build.sh
@@ -92,7 +92,7 @@ VERBOSE=1 cmake --build ./protobuf/.build --target install -- -j"$CORES"
 # ed25519
 git clone https://github.com/hyperledger/iroha-ed25519.git
 (cd ./iroha-ed25519;
-git checkout e7188b8393dbe5ac54378610d53630bd4a180038)
+git checkout f42953c631fae93011612f6b1ee33f1f88c3f8af)
 cmake -DCMAKE_BUILD_TYPE="$BUILD_TYPE" "${IOS_TOOLCHAIN_ARGS[@]}" "${INSTALL_ARGS[@]}" -DTESTING=OFF -DBUILD=STATIC -H./iroha-ed25519 -B./iroha-ed25519/build
 VERBOSE=1 cmake --build ./iroha-ed25519/build --target install -- -j"$CORES"
 mv "$DEPS_DIR"/lib/static/libed25519.a "$DEPS_DIR"/lib;

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -88,7 +88,7 @@ parts:
      - -DgRPC_PROTOBUF_PROVIDER=package
      - -DgRPC_GFLAGS_PROVIDER=package
      - -DBUILD_SHARED_LIBS=ON
-    after: [cmake, protobuf, c-ares]
+    after: [cmake, protobuf, c-ares, gflags]
   spdlog:
     source: https://github.com/gabime/spdlog.git
     source-commit: f85a08622e20b74bff34381cafcb8ef8167b29d0
@@ -150,7 +150,7 @@ parts:
       mv $SNAPCRAFT_PART_INSTALL/include $SNAPCRAFT_PART_INSTALL/usr/local/include
   ed25519:
     source: https://github.com/hyperledger/iroha-ed25519.git
-    source-commit: e7188b8393dbe5ac54378610d53630bd4a180038
+    source-commit: f42953c631fae93011612f6b1ee33f1f88c3f8af
     plugin: cmake
     configflags: [-DTESTING=OFF]
     after: [cmake]