zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Protobuf fix (#7110)

Browse Source 
* Fixed a bug where when using shared libraries OS X does not set the RPATH correctly
This commit is contained in:
Brian Van Essen 2018-01-31 10:39:53 -07:00 committed by becker33
parent 06758fe5cb
commit bc0f683e64
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
var/spack/repos/builtin/packages/protobuf/package.py
View File

@ -22,6 +22,7 @@
# License along with this program; if not, write to the Free Software # License along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################## ##############################################################################
import sys
from spack import * from spack import *
import spack.util.web import spack.util.web
@ -33,6 +34,11 @@ class Protobuf(CMakePackage):
url = "https://github.com/google/protobuf/archive/v3.2.0.tar.gz" url = "https://github.com/google/protobuf/archive/v3.2.0.tar.gz"
root_cmakelists_dir = "cmake" 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.4.0', '1d077a7d4db3d75681f5c333f2de9b1a')
version('3.3.0', 'f0f712e98de3db0c65c0c417f5e7aca8') version('3.3.0', 'f0f712e98de3db0c65c0c417f5e7aca8')
version('3.2.0', 'efaa08ae635664fb5e7f31421a41a995') version('3.2.0', 'efaa08ae635664fb5e7f31421a41a995')
@ -69,4 +75,6 @@ def cmake_args(self):
'-Dprotobuf_BUILD_TESTS:BOOL=OFF', '-Dprotobuf_BUILD_TESTS:BOOL=OFF',
'-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON' '-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON'
] ]
if sys.platform == 'darwin':
args.extend(['-DCMAKE_MACOSX_RPATH=ON'])
return args return args