From 2efa8bf7ad9b39e81ed5cb6376080c15f0bd9078 Mon Sep 17 00:00:00 2001 From: Divyank Katira Date: Thu, 2 Nov 2017 16:34:18 -0400 Subject: [PATCH] [FAB-6708] Build flags to disable BCCSP plugins Change-Id: Iab53d795c414ef1a1c2153bcd3ded4e5c963ffa4 Signed-off-by: Divyank Katira --- ...uild-flags-to-disable-BCCSP-plugins.patch} | 20 ++++++++++--------- .../fabric/bccsp/factory/pluginfactory.go | 2 +- .../sdkpatch_pluginfactory_noplugin.go | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) rename scripts/third_party_pins/fabric/patches/{0003-Fix-plugin-warnings.patch => 0003-Build-flags-to-disable-BCCSP-plugins.patch} (80%) diff --git a/scripts/third_party_pins/fabric/patches/0003-Fix-plugin-warnings.patch b/scripts/third_party_pins/fabric/patches/0003-Build-flags-to-disable-BCCSP-plugins.patch similarity index 80% rename from scripts/third_party_pins/fabric/patches/0003-Fix-plugin-warnings.patch rename to scripts/third_party_pins/fabric/patches/0003-Build-flags-to-disable-BCCSP-plugins.patch index ced82f302e..bf82b4c602 100644 --- a/scripts/third_party_pins/fabric/patches/0003-Fix-plugin-warnings.patch +++ b/scripts/third_party_pins/fabric/patches/0003-Build-flags-to-disable-BCCSP-plugins.patch @@ -1,9 +1,11 @@ -From 28c289a68765f342698f4e94adc536c265ba149b Mon Sep 17 00:00:00 2001 -From: Troy Ronda +From b4e3609ad67eae03109cd80957793e0ec33eac1e Mon Sep 17 00:00:00 2001 +From: Troy Ronda Date: Thu, 19 Oct 2017 11:59:49 -0400 -Subject: [PATCH] Fix darwin warnings +Subject: [PATCH] Build flags to disable BCCSP plugins -Signed-off-by: Troy Ronda +Change-Id: Id00605ebfb1a75cfcd5ae9ecd950d3fdd215a588 +Signed-off-by: Troy Ronda +Signed-off-by: Divyank Katira --- bccsp/factory/pluginfactory.go | 4 ++- bccsp/factory/sdkpatch_pluginfactory_noplugin.go | 40 ++++++++++++++++++++++++ @@ -11,11 +13,11 @@ Signed-off-by: Troy Ronda create mode 100644 bccsp/factory/sdkpatch_pluginfactory_noplugin.go diff --git a/bccsp/factory/pluginfactory.go b/bccsp/factory/pluginfactory.go -index 3870bbcd..fe584d67 100644 +index 3870bbcd..fd95e9f3 100644 --- a/bccsp/factory/pluginfactory.go +++ b/bccsp/factory/pluginfactory.go @@ -1,3 +1,5 @@ -+// +build linux ++// +build linux,!nobccspplugin + /* Copyright IBM Corp. All Rights Reserved. @@ -31,11 +33,11 @@ index 3870bbcd..fe584d67 100644 const ( diff --git a/bccsp/factory/sdkpatch_pluginfactory_noplugin.go b/bccsp/factory/sdkpatch_pluginfactory_noplugin.go new file mode 100644 -index 00000000..6d68d601 +index 00000000..4011a1e0 --- /dev/null +++ b/bccsp/factory/sdkpatch_pluginfactory_noplugin.go @@ -0,0 +1,40 @@ -+// +build !linux ++// +build !linux,!nobccspplugin nobccspplugin + +/* +Copyright IBM Corp., SecureKey Technologies Inc. All Rights Reserved. @@ -76,5 +78,5 @@ index 00000000..6d68d601 + return nil, errors.New("not supported") +} -- -2.14.2 +2.14.1 diff --git a/third_party/github.com/hyperledger/fabric/bccsp/factory/pluginfactory.go b/third_party/github.com/hyperledger/fabric/bccsp/factory/pluginfactory.go index 2d12cbbcd6..3ea088df56 100644 --- a/third_party/github.com/hyperledger/fabric/bccsp/factory/pluginfactory.go +++ b/third_party/github.com/hyperledger/fabric/bccsp/factory/pluginfactory.go @@ -1,4 +1,4 @@ -// +build linux +// +build linux,!nobccspplugin /* Copyright IBM Corp. All Rights Reserved. diff --git a/third_party/github.com/hyperledger/fabric/bccsp/factory/sdkpatch_pluginfactory_noplugin.go b/third_party/github.com/hyperledger/fabric/bccsp/factory/sdkpatch_pluginfactory_noplugin.go index 3013536fa0..547e133fec 100644 --- a/third_party/github.com/hyperledger/fabric/bccsp/factory/sdkpatch_pluginfactory_noplugin.go +++ b/third_party/github.com/hyperledger/fabric/bccsp/factory/sdkpatch_pluginfactory_noplugin.go @@ -1,4 +1,4 @@ -// +build !linux +// +build !linux,!nobccspplugin nobccspplugin /* Copyright IBM Corp., SecureKey Technologies Inc. All Rights Reserved.