From 9021407fec5495c440bd94bc57d39c4af7357ef8 Mon Sep 17 00:00:00 2001 From: Vixentael Date: Thu, 2 Nov 2017 20:18:12 +0200 Subject: [PATCH 1/6] circle ci: clean before make --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 1bbc217..0ad82bc 100644 --- a/circle.yml +++ b/circle.yml @@ -25,7 +25,7 @@ dependencies: override: - make - - sudo make install + - sudo make clean install test: override: From ae43ddee5d7062e493ea02427b67d98a42b17ef9 Mon Sep 17 00:00:00 2001 From: Vixentael Date: Thu, 2 Nov 2017 20:18:45 +0200 Subject: [PATCH 2/6] fix forgotten link libs for secure transport --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2deffbe..e55fd67 100644 --- a/Makefile +++ b/Makefile @@ -464,7 +464,7 @@ secure_transport_static: common_static $(SECURE_TRANSPORT_OBJ) @echo -n "link " @$(BUILD_CMD) -secure_transport_shared: CMD = $(CC) -shared -o $(BIN_PATH)/lib$(SECURE_TRANSPORT_BIN).$(SHARED_EXT) $(SECURE_TRANSPORT_OBJ) $(LDFLAGS) -lthemis -lsoter +secure_transport_shared: CMD = $(CC) -shared -o $(BIN_PATH)/lib$(SECURE_TRANSPORT_BIN).$(SHARED_EXT) $(SECURE_TRANSPORT_OBJ) $(CREDENTIAL_STORE_OBJ) $(RPC_OBJ) $(LDFLAGS) -lthemis -lsoter -l$(COMMON_BIN) secure_transport_shared: common_static $(SECURE_TRANSPORT_OBJ) @echo -n "link " From 0e6ac0b34d82494a3d63b7e8ca6c7de42b737d2e Mon Sep 17 00:00:00 2001 From: Vixentael Date: Thu, 2 Nov 2017 20:33:24 +0200 Subject: [PATCH 3/6] circle.ci: rm clean --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 0ad82bc..1bbc217 100644 --- a/circle.yml +++ b/circle.yml @@ -25,7 +25,7 @@ dependencies: override: - make - - sudo make clean install + - sudo make install test: override: From 65105fcf748e8b3b0095d3f86eba97c9b7af1009 Mon Sep 17 00:00:00 2001 From: Vixentael Date: Thu, 2 Nov 2017 20:36:57 +0200 Subject: [PATCH 4/6] maybe ldconfig will help us? --- circle.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 1bbc217..c4adf62 100644 --- a/circle.yml +++ b/circle.yml @@ -25,7 +25,8 @@ dependencies: override: - make - - sudo make install + - sudo make clean install + - sudo ldconfig test: override: From d4d49931f6e8ec4bb15b018758cfce3d4113a6db Mon Sep 17 00:00:00 2001 From: Vixentael Date: Thu, 2 Nov 2017 20:42:03 +0200 Subject: [PATCH 5/6] circle ci: play with sudo --- circle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index c4adf62..cb60dc7 100644 --- a/circle.yml +++ b/circle.yml @@ -25,8 +25,8 @@ dependencies: override: - make - - sudo make clean install - - sudo ldconfig + - make clean + - sudo make install test: override: From aaf72c3332f4e376f38ebae988e3796ebbe96f6f Mon Sep 17 00:00:00 2001 From: Vixentael Date: Thu, 2 Nov 2017 20:44:45 +0200 Subject: [PATCH 6/6] circle ci doesn't want to clean --- circle.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/circle.yml b/circle.yml index cb60dc7..1bbc217 100644 --- a/circle.yml +++ b/circle.yml @@ -25,7 +25,6 @@ dependencies: override: - make - - make clean - sudo make install test: