Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 3 additions & 21 deletions scripts/cibuildpkg.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,6 @@ def log_group(title: str) -> Iterator[None]:
print(f"::endgroup::\n{ok_str}", flush=True)


def make_args(*, parallel: bool) -> list[str]:
"""
Arguments for GNU make.
"""
args = []

if parallel:
args.append("-j")

return args


def prepend_env(env, name: str, new: str, separator: str = " ") -> None:
old = env.get(name)
if old:
Expand Down Expand Up @@ -171,7 +159,7 @@ def _build_with_make(self, package: Package, for_builder: bool) -> None:

# Build package
with chdir(package_source_path):
make_command = ["make"] + make_args(parallel=package.build_parallel)
make_command = ["make", "-j", "4"]
install_command = ["make", "install"]

# Add PREFIX to both make and install commands
Expand Down Expand Up @@ -279,9 +267,7 @@ def _build_with_autoconf(self, package: Package, for_builder: bool) -> None:
+ package.build_arguments,
env=env,
)
run(
["make"] + make_args(parallel=package.build_parallel) + ["V=1"], env=env
)
run(["make", "-j", "4", "V=1"], env=env)
run(["make", "install"], env=env)

def _build_with_cmake(self, package: Package, for_builder: bool) -> None:
Expand Down Expand Up @@ -315,11 +301,7 @@ def _build_with_cmake(self, package: Package, for_builder: bool) -> None:
["cmake", package_source_path] + cmake_args + package.build_arguments,
env=env,
)
run(
["cmake", "--build", ".", "--verbose"]
+ make_args(parallel=package.build_parallel),
env=env,
)
run(["cmake", "--build", ".", "--verbose", "-j", "4"], env=env)
run(["cmake", "--install", "."], env=env)

def _build_with_meson(self, package: Package, for_builder: bool) -> None:
Expand Down
Loading