[FAB-6708] Build flags to disable BCCSP plugins

Change-Id: Iab53d795c414ef1a1c2153bcd3ded4e5c963ffa4 Signed-off-by: Divyank Katira <[email protected]>
hyperledger · Nov 2, 2017 · 2efa8bf · 2efa8bf
1 parent 8b685f6
commit 2efa8bf
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/...ic/patches/0003-Fix-plugin-warnings.patch → ...uild-flags-to-disable-BCCSP-plugins.patch b/...ic/patches/0003-Fix-plugin-warnings.patch → ...uild-flags-to-disable-BCCSP-plugins.patch
@@ -1,21 +1,23 @@
-From 28c289a68765f342698f4e94adc536c265ba149b Mon Sep 17 00:00:00 2001
-From: Troy Ronda <troy@troyronda.com>
+From b4e3609ad67eae03109cd80957793e0ec33eac1e Mon Sep 17 00:00:00 2001
+From: Troy Ronda <t.....@securekey.com>
 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 <[email protected]>
+Change-Id: Id00605ebfb1a75cfcd5ae9ecd950d3fdd215a588
+Signed-off-by: Troy Ronda <[email protected]>
+Signed-off-by: Divyank Katira <[email protected]>
 ---
  bccsp/factory/pluginfactory.go                   |  4 ++-
  bccsp/factory/sdkpatch_pluginfactory_noplugin.go | 40 ++++++++++++++++++++++++
  2 files changed, 43 insertions(+), 1 deletion(-)
  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
@@ -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
@@ -1,4 +1,4 @@
-// +build !linux
+// +build !linux,!nobccspplugin nobccspplugin
 
 /*
 Copyright IBM Corp., SecureKey Technologies Inc. All Rights Reserved.