clearlinux/autospec
2
0
Fork 0
mirror of https://github.com/clearlinux/autospec.git synced 2026-06-16 02:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rework cargo pattern use

Browse Source 
In cases where a package has both a Makefile and a Cargo.toml try and
use the make pattern (the options.conf flag for cargo vendor still
needs to be changed). When the cargo pattern is being used, use cargo
install as well. More complex cases likely should just be patched into
a Makefile and perhaps submitted upstream.

Signed-off-by: William Douglas <william.douglas@intel.com>
This commit is contained in:
William Douglas
2025-01-02 16:20:03 -08:00
committed by William Douglas
parent 5424026110
commit f4a13a5a93
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
autospec/buildreq.py
+1 -1
View File
@@ -763,7 +763,7 @@ class Requirements(object):
for dirpath, _, files in os.walk(dirn):
default_score = 2 if dirpath == dirn else 1
if "Cargo.toml" in files:
if "Cargo.toml" in files and 'Makefile' not in files:
config.set_build_pattern('cargo', default_score)
if "CMakeLists.txt" in files and "configure.ac" not in files:
autospec/specfiles.py
+5 -8
View File
@@ -2067,14 +2067,11 @@ class Specfile(object):
self.write_license_files()
if self.config.subdir:
self._write_strip("pushd " + self.config.subdir)
if self.config.install_macro:
self._write_strip(self.config.install_macro)
else:
self._write_strip("cargo install --path .")
self._write_strip("mkdir -p %{buildroot}/usr/bin")
self._write_strip('pushd "${HOME}/.cargo/bin/"')
self._write_strip("mv * %{buildroot}/usr/bin/")
self._write_strip("popd")
self._write_strip("cargo install --path .")
self._write_strip("mkdir -p %{buildroot}/usr/bin")
self._write_strip('pushd "${HOME}/.cargo/bin/"')
self._write_strip("mv * %{buildroot}/usr/bin/")
self._write_strip("popd")
if self.config.subdir:
self._write_strip("popd")
self.write_install_append()