moc, gcc, neovim, ffmpeg
This commit is contained in:
18
src/main.cc
18
src/main.cc
@@ -129,16 +129,6 @@ void install_package(const std::string &name) {
|
||||
src_path);
|
||||
Util::shell_command("make -j " + jobs, src_path);
|
||||
Util::shell_command("make install", src_path);
|
||||
} else if (step_type == "perl_configure_make") {
|
||||
std::string configure_flags;
|
||||
try {
|
||||
configure_flags = step.get_one("configure_flags").value;
|
||||
} catch (std::out_of_range &) {
|
||||
}
|
||||
|
||||
Util::shell_command("./Configure " + configure_flags, src_path);
|
||||
Util::shell_command("make -j " + jobs, src_path);
|
||||
Util::shell_command("make install", src_path);
|
||||
} else if (step_type == "make") {
|
||||
std::string make_flags;
|
||||
try {
|
||||
@@ -153,7 +143,7 @@ void install_package(const std::string &name) {
|
||||
|
||||
Util::shell_command("make " + make_flags + " -j " + jobs, src_path);
|
||||
Util::shell_command("make install " + install_flags, src_path);
|
||||
} else if (step_type == "cmake_ninja") {
|
||||
} else if (step_type == "cmake") {
|
||||
std::string configure_flags;
|
||||
try {
|
||||
configure_flags = step.get_one("configure_flags").value;
|
||||
@@ -161,11 +151,11 @@ void install_package(const std::string &name) {
|
||||
}
|
||||
|
||||
Util::shell_command("mkdir -p build", src_path);
|
||||
Util::shell_command("cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/usr " +
|
||||
Util::shell_command("cmake -DCMAKE_INSTALL_PREFIX=/usr " +
|
||||
configure_flags + " ..",
|
||||
src_path + "/build");
|
||||
Util::shell_command("ninja -j" + jobs, src_path + "/build");
|
||||
Util::shell_command("ninja install", src_path + "/build");
|
||||
Util::shell_command("make -j" + jobs, src_path + "/build");
|
||||
Util::shell_command("make install", src_path + "/build");
|
||||
} else if (step_type == "meson") {
|
||||
std::string configure_flags;
|
||||
try {
|
||||
|
||||
Reference in New Issue
Block a user