diff options
| author | davidovski <david@davidovski.xyz> | 2022-01-13 22:30:27 +0000 |
|---|---|---|
| committer | davidovski <david@davidovski.xyz> | 2022-01-13 22:30:27 +0000 |
| commit | 2d198085c851ebdd68527299fa59b1fdb3a75b2d (patch) | |
| tree | 7ca5b9739c631598d1d47a0fbfed90425f47455e | |
| parent | 66b2a8343e22d876fb9f8c78ab100b70bac462d7 (diff) | |
fixed a few minor bugs
| -rw-r--r-- | repo/core/bzip2.xibuild | 6 | ||||
| -rw-r--r-- | repo/core/flex.xibuild | 2 | ||||
| -rw-r--r-- | repo/core/gcc.xibuild | 8 | ||||
| -rw-r--r-- | repo/extra/xibuild.xibuild | 4 |
4 files changed, 13 insertions, 7 deletions
diff --git a/repo/core/bzip2.xibuild b/repo/core/bzip2.xibuild index 72a364c..f60aece 100644 --- a/repo/core/bzip2.xibuild +++ b/repo/core/bzip2.xibuild @@ -8,15 +8,15 @@ DESC="a selection of programs for compressing and decompressing bzip2 files" build () { - curl https://www.linuxfromscratch.org/patches/lfs/development/bzip2-1.0.8-install_docs-1.patch > bzip2-1.0.8-install_docs-1.patch + #curl https://www.linuxfromscratch.org/patches/lfs/development/bzip2-1.0.8-install_docs-1.patch > bzip2-1.0.8-install_docs-1.patch - patch -Np1 -i bzip2-1.0.8-install_docs-1.patch + #patch -Np1 -i bzip2-1.0.8-install_docs-1.patch # ensure symbolic links are relative sed -i 's@\(ln -s -f \)$(PREFIX)/bin/@\1@' Makefile - sed -i "s@(PREFIX)/man@(PREFIX)/share/man@g" Makefile + #sed -i "s@(PREFIX)/man@(PREFIX)/share/man@g" Makefile make -f Makefile-libbz2_so make clean diff --git a/repo/core/flex.xibuild b/repo/core/flex.xibuild index 69f103c..f5291cc 100644 --- a/repo/core/flex.xibuild +++ b/repo/core/flex.xibuild @@ -13,7 +13,7 @@ build () { } package () { - ln -v flex $PKG_DEST/usr/bin/lex + ln -v /usr/bin/flex $PKG_DEST/usr/bin/lex } diff --git a/repo/core/gcc.xibuild b/repo/core/gcc.xibuild index 37132d1..ab9830d 100644 --- a/repo/core/gcc.xibuild +++ b/repo/core/gcc.xibuild @@ -36,9 +36,11 @@ build () { ulimit -s 32768 - chown -Rv tester . - su tester -c "PATH=$PATH make $MAKEFLAGS -k check" - ../contrib/test_summary | grep -A7 Summ + if id -u tester; then + chown -Rv tester . + su tester -c "PATH=$PATH make $MAKEFLAGS -k check" + ../contrib/test_summary | grep -A7 Summ + fi } diff --git a/repo/extra/xibuild.xibuild b/repo/extra/xibuild.xibuild index 0b001b0..71649fd 100644 --- a/repo/extra/xibuild.xibuild +++ b/repo/extra/xibuild.xibuild @@ -9,5 +9,9 @@ package () { mkdir -pv $PKG_DEST/usr/bin cp -v xibuild $PKG_DEST/usr/bin/ cp xibuild $PKG_DEST/usr/bin/ + + mkdir -pv $PKG_DEST/home/xibuild + cp -r * $PKG_DEST/home/xibuild } + |