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

cvector: added version 1.0.3.1, added Makefile patch to fix libtool error (#47154)

Browse Source
This commit is contained in:
Laura Weber 2024-10-23 00:23:18 -07:00 committed by GitHub
parent e63e8b5efa
commit eccf97af33
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
var/spack/repos/builtin/packages/cvector/Makefile.patch Normal file
View File

@ -0,0 +1,19 @@
--- a/Makefile
+++ b/Makefile
@@ -89,11 +89,11 @@ else
INCLUDES = -I$(INC)
endif
-COMPILE_COMMAND = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c
-LIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CC) -version-info $(VERSION) -release $(RELEASE) -no-undefined -rpath $(INSTALL_PREFIX)/lib
-BUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES)
-BUILD_COMMAND_DYNAMIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -dynamic -I $(INSTALL_PREFIX)/include
-BUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static -I $(INSTALL_PREFIX)/include
+COMPILE_COMMAND = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c
+LIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link --tag=CC $(CC) -version-info $(VERSION) -release $(RELEASE) -no-undefined -rpath $(INSTALL_PREFIX)/lib
+BUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) $(INCLUDES)
+BUILD_COMMAND_DYNAMIC = $(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) -dynamic -I $(INSTALL_PREFIX)/include
+BUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) -static -I $(INSTALL_PREFIX)/include
INSTALL_COMMAND = $(LIBTOOL) --mode=install cp
INSTALL_FINISH_COMMAND = $(LIBTOOL) --mode=finish

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

@ -3,6 +3,8 @@
# #
# SPDX-License-Identifier: (Apache-2.0 OR MIT) # SPDX-License-Identifier: (Apache-2.0 OR MIT)
import re
from spack.package import * from spack.package import *
@ -10,16 +12,28 @@ class Cvector(MakefilePackage):
"""CVector -- ANSI C API for Dynamic Arrays""" """CVector -- ANSI C API for Dynamic Arrays"""
homepage = "https://cvector.sourceforge.net/" homepage = "https://cvector.sourceforge.net/"
url = "https://downloads.sourceforge.net/project/cvector/cvector/CVector-1.0.3/CVector-1.0.3.tar.gz"
license("LGPL-2.1-or-later") license("LGPL-2.1-or-later")
version("1.0.3", sha256="d3fa92de3cd5ba8697abdbb52080248b2c252a81cf40a8ec639be301518d0ce3") version("1.0.3.1", sha256="6492b2beb26c3179cdd19abc90dc47a685be471c594d5ab664283e1d3586acdc")
version(
"1.0.3",
sha256="d3fa92de3cd5ba8697abdbb52080248b2c252a81cf40a8ec639be301518d0ce3",
deprecated=True,
)
depends_on("c", type="build") # generated depends_on("c", type="build") # generated
depends_on("libtool", type="build") depends_on("libtool", type="build")
patch("Makefile.patch", when="@1.0.3.1")
def url_for_version(self, version):
pattern = re.compile(r"^[0-9]+\.[0-9]+\.[0-9]+")
full_vers = str(version)
cropped_vers = pattern.search(full_vers).group()
return f"https://downloads.sourceforge.net/project/cvector/cvector/CVector-{cropped_vers}/CVector-{full_vers}.tar.gz"
def edit(self, spec, prefix): def edit(self, spec, prefix):
mf = FileFilter("Makefile") mf = FileFilter("Makefile")
mf.filter(r"^CC.+", "CC = {0}".format(spack_cc)) mf.filter(r"^CC.+", "CC = {0}".format(spack_cc))