Compare commits

..
9 Commits
7 changed files with 158 additions and 1 deletions
+1 -1
View File
@@ -21,7 +21,7 @@ def make_install(rem: list[str] | None = None, chdir: bool = True):
def _do_auto_pack(pc: pkgcomposer.PkgComposer, srcdir: str, dstdir: str, filter):
pc.makedir(srcdir)
pc.makedir(dstdir)
with os.scandir(srcdir) as entries:
for ent in entries:
if filter(ent):
+4
View File
@@ -59,3 +59,7 @@ def block_hook(hook: str):
def source_url(url: str):
sources.source_url(url)
def source_git(url: str, branch: str | None = None):
sources.source_git(url, branch)
+60
View File
@@ -0,0 +1,60 @@
import os
import subprocess
from . import arch, make, pkgcomposer
def _rust_triple(semios: str) -> str:
return semios.replace("-semios-linux", "-unknown-linux-musl")
def build(rem: list[str] = []):
cmdline = [
"cargo",
"build",
"--release",
"--target",
_rust_triple(arch.get_target()),
] + rem
os.environ["RUSTFLAGS"] = (
os.environ.get("RUSTFLAGS", "") + " -C target-feature=-crt-static"
)
subprocess.run(cmdline)
def _do_auto_pack(pc: pkgcomposer.PkgComposer, srcdir: str, dstdir: str, filter):
pc.makedir(dstdir)
with os.scandir(srcdir) as entries:
for ent in entries:
if filter(ent):
if ent.is_dir(follow_symlinks=False):
pc.makedir(f"{dstdir}/{ent.name}")
elif ent.is_file(follow_symlinks=False):
pc.addfile(ent.path, f"{dstdir}/{ent.name}")
elif ent.is_symlink() and not os.path.isabs(os.readlink(ent.path)):
pc.addfile(ent.path, f"{dstdir}/{ent.name}")
def _autopack_filter_lib(ent) -> bool:
if ent.is_dir(follow_symlinks=False):
return False
if ent.name.endswith(".so"):
return True
else:
return False
def _autopack_filter_bin(ent) -> bool:
return os.access(ent.path, os.X_OK) and ent.is_file(follow_symlinks=False)
def _auto_pack(profiles: list[str], pc: pkgcomposer.PkgComposer):
target_dir = f"target/{_rust_triple(arch.get_target())}/release"
if "lib" in profiles:
_do_auto_pack(pc, target_dir, "lib", _autopack_filter_lib)
if "bin" in profiles:
_do_auto_pack(pc, target_dir, "bin", _autopack_filter_bin)
def use_auto_pack(profiles: list[str]):
make.on_pack(lambda pc: _auto_pack(profiles, pc))
+18
View File
@@ -1,4 +1,5 @@
import os
import subprocess
import sys
import tarfile
import urllib.parse
@@ -109,3 +110,20 @@ def source_url(url: str):
tar.extractall(extract_dir)
with open("./target/sources.tag", "wt+") as file:
file.write(sources_dir)
def _git_repo_name(url: str) -> str:
return url.split("/")[-1].replace(".git", "")
def source_git(url: str, branch: str | None = None):
source_path = os.getcwd() + "/target/" + _git_repo_name(url)
if os.path.exists("./target/sources.tag"):
return
cmdline = ["git", "clone", "--depth=1"]
if branch:
cmdline += ["-b", branch]
cmdline += [url, source_path]
subprocess.run(cmdline, check=True)
with open("./target/sources.tag", "wt+") as file:
file.write(source_path)
@@ -0,0 +1,36 @@
--- a/lib/fnmatch.c
+++ b/lib/fnmatch.c
@@ -120,9 +120,6 @@
/* Avoid depending on library functions or files
whose names are inconsistent. */
-# if !defined _LIBC && !defined getenv
-extern char *getenv ();
-# endif
# ifndef errno
extern int errno;
--- a/src/getopt.c
+++ b/src/getopt.c
@@ -202,7 +202,7 @@ static char *posixly_correct;
whose names are inconsistent. */
#ifndef getenv
-extern char *getenv ();
+extern char *getenv (const char *);
#endif
static char *
--- a/src/getopt.h
+++ b/src/getopt.h
@@ -102,7 +102,7 @@ struct option
errors, only prototype getopt for the GNU C library. */
extern int getopt (int argc, char *const *argv, const char *shortopts);
#else /* not __GNU_LIBRARY__ */
-extern int getopt ();
+extern int getopt (int, char * const*, const char *);
#endif /* __GNU_LIBRARY__ */
extern int getopt_long (int argc, char *const *argv, const char *shortopts,
const struct option *longopts, int *longind);
+17
View File
@@ -0,0 +1,17 @@
import lib.cpp as cpp
from lib.make import *
version("4.4.1")
source_url("https://ftp.gnu.org/gnu/make/make-4.4.1.tar.gz")
def build():
cpp.configure(["--prefix=/"])
cpp.make()
cpp.make_install()
on_build(build)
package("gnu-make")
cpp.use_auto_pack(["bin"])
+22
View File
@@ -0,0 +1,22 @@
import os
from lib.make import *
version("1.59.2")
source_git("https://github.com/mirabilos/mksh-cvs2git.git", "mksh-R59c")
def build():
os.system("sh ./Build.sh")
on_build(build)
def pack_mksh(composer):
composer.makedir("bin")
composer.addfile("mksh", "bin/mksh")
package("mksh")
on_pack(pack_mksh)