summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Van Essen <vanessen1@llnl.gov>2018-01-31 10:39:53 -0700
committerbecker33 <becker33@llnl.gov>2018-01-31 09:39:53 -0800
commitbc0f683e64e50aeac2ba6bc0a6d3ae3dc17ac949 (patch)
tree713976f453746f793709f3caac39ccc9faa123d0
parent06758fe5cbcbf631959ffc459ccaf372345231cf (diff)
downloadspack-bc0f683e64e50aeac2ba6bc0a6d3ae3dc17ac949.tar.gz
spack-bc0f683e64e50aeac2ba6bc0a6d3ae3dc17ac949.tar.bz2
spack-bc0f683e64e50aeac2ba6bc0a6d3ae3dc17ac949.tar.xz
spack-bc0f683e64e50aeac2ba6bc0a6d3ae3dc17ac949.zip
Protobuf fix (#7110)
* Fixed a bug where when using shared libraries OS X does not set the RPATH correctly
-rw-r--r--var/spack/repos/builtin/packages/protobuf/package.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/protobuf/package.py b/var/spack/repos/builtin/packages/protobuf/package.py
index 52bb28b498..445a2aecb7 100644
--- a/var/spack/repos/builtin/packages/protobuf/package.py
+++ b/var/spack/repos/builtin/packages/protobuf/package.py
@@ -22,6 +22,7 @@
# License along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
+import sys
from spack import *
import spack.util.web
@@ -33,6 +34,11 @@ class Protobuf(CMakePackage):
url = "https://github.com/google/protobuf/archive/v3.2.0.tar.gz"
root_cmakelists_dir = "cmake"
+ version('3.5.1.1', '5005003ae6b94773c4bbca87a644b131')
+ version('3.5.1', '710f1a75983092c9b45ecef207236104')
+ version('3.5.0.1', 'b3ed2401acf167207277b254fd7f9638')
+ version('3.5.0', 'd95db321e1a9901fffc51ed8994afd36')
+ version('3.4.1', '31b19dcfd6567095fdb66a8c07347222')
version('3.4.0', '1d077a7d4db3d75681f5c333f2de9b1a')
version('3.3.0', 'f0f712e98de3db0c65c0c417f5e7aca8')
version('3.2.0', 'efaa08ae635664fb5e7f31421a41a995')
@@ -69,4 +75,6 @@ class Protobuf(CMakePackage):
'-Dprotobuf_BUILD_TESTS:BOOL=OFF',
'-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON'
]
+ if sys.platform == 'darwin':
+ args.extend(['-DCMAKE_MACOSX_RPATH=ON'])
return args