Remove nonstd optional (hyperledger-iroha#1083)

* Remove nonstd optional Signed-off-by: Dumitru <[email protected]> * Remove optional from snapcraft Signed-off-by: Dumitru <[email protected]>
SabiAmeno · Mar 30, 2018 · 52f5404 · 52f5404
1 parent e132255
commit 52f5404
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 29 deletions.
diff --git a/docker/develop/aarch64/Dockerfile b/docker/develop/aarch64/Dockerfile
@@ -161,13 +161,6 @@ RUN set -e; \
     ldconfig; \
     rm -rf /tmp/rapidjson
 
-# install optional
-RUN set -e; \
-    git clone https://github.com/martinmoene/optional-lite /tmp/optional-lite; \
-    (cd /tmp/optional-lite ; git checkout a0ddabb8b52e1eaaf0dd1515bb85698b747528e4); \
-    cp -r /tmp/optional-lite/include/nonstd /usr/local/include; \
-    rm -rf /tmp/optional-lite
-
 # install libpq
 RUN set -e; \
     git clone --progress https://git.postgresql.org/git/postgresql.git /tmp/postgresql; \

diff --git a/docker/develop/armv7l/Dockerfile b/docker/develop/armv7l/Dockerfile
@@ -161,13 +161,6 @@ RUN set -e; \
     ldconfig; \
     rm -rf /tmp/rapidjson
 
-# install optional
-RUN set -e; \
-    git clone https://github.com/martinmoene/optional-lite /tmp/optional-lite; \
-    (cd /tmp/optional-lite ; git checkout a0ddabb8b52e1eaaf0dd1515bb85698b747528e4); \
-    cp -r /tmp/optional-lite/include/nonstd /usr/local/include; \
-    rm -rf /tmp/optional-lite
-
 # install libpq
 RUN set -e; \
     git clone --progress https://git.postgresql.org/git/postgresql.git /tmp/postgresql; \

diff --git a/docker/develop/x86_64/Dockerfile b/docker/develop/x86_64/Dockerfile
@@ -161,13 +161,6 @@ RUN set -e; \
     ldconfig; \
     rm -rf /tmp/rapidjson
 
-# install optional
-RUN set -e; \
-    git clone https://github.com/martinmoene/optional-lite /tmp/optional-lite; \
-    (cd /tmp/optional-lite ; git checkout a0ddabb8b52e1eaaf0dd1515bb85698b747528e4); \
-    cp -r /tmp/optional-lite/include/nonstd /usr/local/include; \
-    rm -rf /tmp/optional-lite
-
 # install libpq
 RUN set -e; \
     git clone --progress https://git.postgresql.org/git/postgresql.git /tmp/postgresql; \

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -41,7 +41,6 @@ parts:
       - spdlog
       - rxcpp
       - rapidjson
-      - optional
       - libpq
       - pqxx
       - tbb
@@ -107,13 +106,6 @@ parts:
     plugin: cmake
     configflags: [-DRAPIDJSON_BUILD_EXAMPLES=OFF]
     after: [cmake]
-  optional:
-    source: https://github.com/martinmoene/optional-lite.git
-    source-commit: a0ddabb8b52e1eaaf0dd1515bb85698b747528e4
-    plugin: nil
-    install: |
-      mkdir -p $SNAPCRAFT_PART_INSTALL/usr/local/include
-      cp -r include/nonstd $SNAPCRAFT_PART_INSTALL/usr/local/include
   libpq:
     source: https://git.postgresql.org/git/postgresql.git
     source-commit: 029386ccbddd0a33d481b94e511f5219b03e6636