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

Fix Protobuf URLs (#5373)

Browse Source 
The default implementation of Package.fetch_remote_versions will take
a URL like https://github.com/google/protobuf/archive/ and automatically
search https://github.com/google/protobuf/releases/ for new package
versions. In the case of protobuf the release/ path contains release
artifacts for a version and the archive/ path contains the desired
source. Since both are associated with the version, and
Package.fetch_remote_versions only stores one URL for a given version,
the two paths are in conflict; previously the URL returned for a
given version was arbitrarily chosen between the two paths. This
updates the definition for the Protobuf package to always search for
URLs in https://github.com/google/protobuf/archive/
This commit is contained in:
Axel Huebl 2017-09-25 19:47:55 +02:00 committed by scheibelp
parent 8864d145e9
commit 28dd6b378c
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################## ##############################################################################
from spack import * from spack import *
import spack.util.web
class Protobuf(CMakePackage): class Protobuf(CMakePackage):
@ -33,9 +34,10 @@ class Protobuf(CMakePackage):
root_cmakelists_dir = "cmake" root_cmakelists_dir = "cmake"
version('3.4.0', '1d077a7d4db3d75681f5c333f2de9b1a') version('3.4.0', '1d077a7d4db3d75681f5c333f2de9b1a')
version('3.2.0', '61d899b8369781f6dd1e62370813392d') version('3.3.0', 'f0f712e98de3db0c65c0c417f5e7aca8')
version('3.1.0', '14a532a7538551d5def317bfca41dace') version('3.2.0', 'efaa08ae635664fb5e7f31421a41a995')
version('3.0.2', '845b39e4b7681a2ddfd8c7f528299fbb') version('3.1.0', '39d6a4fa549c0cce164aa3064b1492dc')
version('3.0.2', '7349a7f43433d72c6d805c6ca22b7eeb')
# does not build with CMake: # does not build with CMake:
# version('2.5.0', '9c21577a03adc1879aba5b52d06e25cf') # version('2.5.0', '9c21577a03adc1879aba5b52d06e25cf')
@ -46,6 +48,16 @@ class Protobuf(CMakePackage):
# first fixed in 3.4.0: https://github.com/google/protobuf/pull/3406 # first fixed in 3.4.0: https://github.com/google/protobuf/pull/3406
patch('pkgconfig.patch', when='@:3.3.2') patch('pkgconfig.patch', when='@:3.3.2')
def fetch_remote_versions(self):
"""Ignore additional source artifacts uploaded with releases,
only keep known versions
fix for https://github.com/LLNL/spack/issues/5356"""
return dict(map(
lambda u: (u, self.url_for_version(u)),
spack.util.web.find_versions_of_archive(
self.all_urls, self.list_url, self.list_depth)
))
def cmake_args(self): def cmake_args(self):
args = [ args = [
'-Dprotobuf_BUILD_TESTS:BOOL=OFF', '-Dprotobuf_BUILD_TESTS:BOOL=OFF',