Use (/usr/lib/mes, /usr/include/mes), (/usr/lib, /usr/include)
Mes is now self-contained in; /usr/lib/mes /usr/include/mes /usr/lib/x86-mes musl adheres to FHS /usr/include /usr/lib
This commit is contained in:
parent
1b47720cbc
commit
fc5fc39569
|
@ -14,8 +14,8 @@ sysa=/sysa
|
|||
DISTFILES=/sysa/distfiles
|
||||
PREFIX=/usr
|
||||
BINDIR=${PREFIX}/bin
|
||||
LIBDIR=${LIBDIR}/mes
|
||||
INCDIR=${PREFIX}/include
|
||||
LIBDIR=${PREFIX}/lib/mes
|
||||
INCDIR=${PREFIX}/include/mes
|
||||
SRCDIR=${PREFIX}/src
|
||||
TMPDIR=/tmp # tmpdir is needed for patch to work
|
||||
PATH=${BINDIR}
|
||||
|
|
|
@ -17,7 +17,7 @@ DISTFILES=/sysa/distfiles
|
|||
PREFIX=/usr
|
||||
BINDIR=${PREFIX}/bin
|
||||
LIBDIR=${PREFIX}/lib
|
||||
INCDIR=${PREFIX}/include
|
||||
INCDIR=${PREFIX}/include/mes
|
||||
SRCDIR=${PREFIX}/src
|
||||
TMPDIR=/tmp # tmpdir is needed for patch to work
|
||||
|
||||
|
|
|
@ -28,68 +28,68 @@
|
|||
/usr/lib/mes/crti.o
|
||||
/usr/lib/mes/crtn.o
|
||||
/usr/lib/mes/tcc/libtcc1.a
|
||||
/usr/include/alloca.h
|
||||
/usr/include/argz.h
|
||||
/usr/include/ar.h
|
||||
/usr/include/assert.h
|
||||
/usr/include/ctype.h
|
||||
/usr/include/dirent.h
|
||||
/usr/include/dirstream.h
|
||||
/usr/include/dlfcn.h
|
||||
/usr/include/endian.h
|
||||
/usr/include/errno.h
|
||||
/usr/include/fcntl.h
|
||||
/usr/include/features.h
|
||||
/usr/include/float.h
|
||||
/usr/include/getopt.h
|
||||
/usr/include/grp.h
|
||||
/usr/include/inttypes.h
|
||||
/usr/include/libgen.h
|
||||
/usr/include/limits.h
|
||||
/usr/include/locale.h
|
||||
/usr/include/math.h
|
||||
/usr/include/memory.h
|
||||
/usr/include/pwd.h
|
||||
/usr/include/setjmp.h
|
||||
/usr/include/signal.h
|
||||
/usr/include/stdarg.h
|
||||
/usr/include/stdbool.h
|
||||
/usr/include/stddef.h
|
||||
/usr/include/stdint.h
|
||||
/usr/include/stdio.h
|
||||
/usr/include/stdlib.h
|
||||
/usr/include/stdnoreturn.h
|
||||
/usr/include/string.h
|
||||
/usr/include/strings.h
|
||||
/usr/include/termio.h
|
||||
/usr/include/time.h
|
||||
/usr/include/unistd.h
|
||||
/usr/include/arch/kernel-stat.h
|
||||
/usr/include/arch/syscall.h
|
||||
/usr/include/linux/syscall.h
|
||||
/usr/include/linux/x86/syscall.h
|
||||
/usr/include/mes/builtins.h
|
||||
/usr/include/mes/cc.h
|
||||
/usr/include/mes/config.h
|
||||
/usr/include/mes/constants.h
|
||||
/usr/include/mes/lib.h
|
||||
/usr/include/mes/lib-cc.h
|
||||
/usr/include/mes/lib-mini.h
|
||||
/usr/include/mes/mes.h
|
||||
/usr/include/mes/symbols.h
|
||||
/usr/include/sys/cdefs.h
|
||||
/usr/include/sys/dir.h
|
||||
/usr/include/sys/file.h
|
||||
/usr/include/sys/ioctl.h
|
||||
/usr/include/sys/mman.h
|
||||
/usr/include/sys/param.h
|
||||
/usr/include/sys/resource.h
|
||||
/usr/include/sys/select.h
|
||||
/usr/include/sys/stat.h
|
||||
/usr/include/sys/timeb.h
|
||||
/usr/include/sys/time.h
|
||||
/usr/include/sys/times.h
|
||||
/usr/include/sys/types.h
|
||||
/usr/include/sys/ucontext.h
|
||||
/usr/include/sys/user.h
|
||||
/usr/include/sys/wait.h
|
||||
/usr/include/mes/alloca.h
|
||||
/usr/include/mes/argz.h
|
||||
/usr/include/mes/ar.h
|
||||
/usr/include/mes/assert.h
|
||||
/usr/include/mes/ctype.h
|
||||
/usr/include/mes/dirent.h
|
||||
/usr/include/mes/dirstream.h
|
||||
/usr/include/mes/dlfcn.h
|
||||
/usr/include/mes/endian.h
|
||||
/usr/include/mes/errno.h
|
||||
/usr/include/mes/fcntl.h
|
||||
/usr/include/mes/features.h
|
||||
/usr/include/mes/float.h
|
||||
/usr/include/mes/getopt.h
|
||||
/usr/include/mes/grp.h
|
||||
/usr/include/mes/inttypes.h
|
||||
/usr/include/mes/libgen.h
|
||||
/usr/include/mes/limits.h
|
||||
/usr/include/mes/locale.h
|
||||
/usr/include/mes/math.h
|
||||
/usr/include/mes/memory.h
|
||||
/usr/include/mes/pwd.h
|
||||
/usr/include/mes/setjmp.h
|
||||
/usr/include/mes/signal.h
|
||||
/usr/include/mes/stdarg.h
|
||||
/usr/include/mes/stdbool.h
|
||||
/usr/include/mes/stddef.h
|
||||
/usr/include/mes/stdint.h
|
||||
/usr/include/mes/stdio.h
|
||||
/usr/include/mes/stdlib.h
|
||||
/usr/include/mes/stdnoreturn.h
|
||||
/usr/include/mes/string.h
|
||||
/usr/include/mes/strings.h
|
||||
/usr/include/mes/termio.h
|
||||
/usr/include/mes/time.h
|
||||
/usr/include/mes/unistd.h
|
||||
/usr/include/mes/arch/kernel-stat.h
|
||||
/usr/include/mes/arch/syscall.h
|
||||
/usr/include/mes/linux/syscall.h
|
||||
/usr/include/mes/linux/x86/syscall.h
|
||||
/usr/include/mes/mes/builtins.h
|
||||
/usr/include/mes/mes/cc.h
|
||||
/usr/include/mes/mes/config.h
|
||||
/usr/include/mes/mes/constants.h
|
||||
/usr/include/mes/mes/lib.h
|
||||
/usr/include/mes/mes/lib-cc.h
|
||||
/usr/include/mes/mes/lib-mini.h
|
||||
/usr/include/mes/mes/mes.h
|
||||
/usr/include/mes/mes/symbols.h
|
||||
/usr/include/mes/sys/cdefs.h
|
||||
/usr/include/mes/sys/dir.h
|
||||
/usr/include/mes/sys/file.h
|
||||
/usr/include/mes/sys/ioctl.h
|
||||
/usr/include/mes/sys/mman.h
|
||||
/usr/include/mes/sys/param.h
|
||||
/usr/include/mes/sys/resource.h
|
||||
/usr/include/mes/sys/select.h
|
||||
/usr/include/mes/sys/stat.h
|
||||
/usr/include/mes/sys/timeb.h
|
||||
/usr/include/mes/sys/time.h
|
||||
/usr/include/mes/sys/times.h
|
||||
/usr/include/mes/sys/types.h
|
||||
/usr/include/mes/sys/ucontext.h
|
||||
/usr/include/mes/sys/user.h
|
||||
/usr/include/mes/sys/wait.h
|
||||
|
|
|
@ -1,6 +1,9 @@
|
|||
#!/bin/sh
|
||||
# SPDX-FileCopyrightText: 2023 Richard Masters <grick23@gmail.com>
|
||||
# SPDX-License-Identifier: MIT
|
||||
|
||||
set -ex
|
||||
|
||||
mkdir build src
|
||||
cd src
|
||||
ungz --file ${DISTFILES}/${pkg}.tar.gz --output ${pkg}.tar
|
||||
|
@ -10,9 +13,7 @@ cd build
|
|||
untar --file ../src/${pkg}.tar
|
||||
cd ${pkg}
|
||||
|
||||
mkdir build_generic
|
||||
mkdir build_generic/include
|
||||
mkdir build_generic/include/generated
|
||||
mkdir -p build_generic/include/generated
|
||||
catm build_generic/include/generated/ext4_config.h ../../config/ext4_config.h
|
||||
|
||||
cd blockdev/linux
|
||||
|
|
|
@ -15,7 +15,7 @@ src_configure() {
|
|||
--disable-shared \
|
||||
--prefix="${PREFIX}" \
|
||||
--libdir="${LIBDIR}" \
|
||||
--includedir="${PREFIX}/include/"
|
||||
--includedir="${PREFIX}/include"
|
||||
|
||||
# configure script creates this file
|
||||
if test -f /dev/null; then
|
||||
|
|
|
@ -18,7 +18,7 @@ src_configure() {
|
|||
--disable-shared \
|
||||
--prefix="${PREFIX}" \
|
||||
--libdir="${LIBDIR}" \
|
||||
--includedir="${PREFIX}/include/musl"
|
||||
--includedir="${PREFIX}/include/"
|
||||
|
||||
# configure script creates this file
|
||||
if test -f /dev/null; then
|
||||
|
|
|
@ -31,7 +31,7 @@ src_prepare() {
|
|||
sed -i 's/sv_setptrobj/Perl_sv_setref_iv/' ext/POSIX/POSIX.xs
|
||||
|
||||
# We are using non-standard locations
|
||||
sed -i "s#/usr/include/errno.h#${PREFIX}/include/musl/bits/errno.h#" ext/Errno/Errno_pm.PL
|
||||
sed -i "s#/usr/include/errno.h#${PREFIX}/include/bits/errno.h#" ext/Errno/Errno_pm.PL
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
|
|
|
@ -25,7 +25,7 @@ DISTFILES=/sysa/distfiles
|
|||
PREFIX=/usr
|
||||
BINDIR=${PREFIX}/bin
|
||||
LIBDIR=${PREFIX}/lib/mes
|
||||
INCDIR=${PREFIX}/include
|
||||
INCDIR=${PREFIX}/include/mes
|
||||
SRCDIR=${PREFIX}/src
|
||||
TMPDIR=/tmp # tmpdir is needed for patch to work
|
||||
|
||||
|
|
|
@ -76,7 +76,7 @@ ${MES} --no-auto-compile -e main ${BINDIR}/mescc.scm -- \
|
|||
-D CONFIG_SYSROOT=\"/\" \
|
||||
-D CONFIG_TCC_CRTPREFIX=\"${LIBDIR}\" \
|
||||
-D CONFIG_TCC_ELFINTERP=\"/mes/loader\" \
|
||||
-D CONFIG_TCC_SYSINCLUDEPATHS=\"${PREFIX}/mes/include:${PREFIX}/include\"
|
||||
-D CONFIG_TCC_SYSINCLUDEPATHS=\"${PREFIX}/include/mes\" \
|
||||
-D TCC_LIBGCC=\"${LIBDIR}/libc.a\" \
|
||||
-D CONFIG_TCC_LIBTCC1_MES=0 \
|
||||
-D CONFIG_TCCBOOT=1 \
|
||||
|
@ -157,7 +157,7 @@ tcc-mes \
|
|||
-D CONFIG_TCC_CRTPREFIX=\"${LIBDIR}\" \
|
||||
-D CONFIG_TCC_ELFINTERP=\"/mes/loader\" \
|
||||
-D CONFIG_TCC_LIBPATHS=\"${LIBDIR}:${LIBDIR}/tcc\" \
|
||||
-D CONFIG_TCC_SYSINCLUDEPATHS=\"${PREFIX}/include\" \
|
||||
-D CONFIG_TCC_SYSINCLUDEPATHS=\"${PREFIX}/include/mes\" \
|
||||
-D TCC_LIBGCC=\"${LIBDIR}/libc.a\" \
|
||||
-D TCC_LIBTCC1=\"libtcc1.a\" \
|
||||
-D CONFIG_TCCBOOT=1 \
|
||||
|
@ -206,13 +206,13 @@ tcc-boot0 \
|
|||
-D HAVE_LONG_LONG=1 \
|
||||
-D HAVE_SETJMP=1 \
|
||||
-I . \
|
||||
-I ${PREFIX}/include \
|
||||
-I ${PREFIX}/include/mes \
|
||||
-D TCC_TARGET_${TCC_TARGET_ARCH}=1 \
|
||||
-D CONFIG_TCCDIR=\"${LIBDIR}/tcc\" \
|
||||
-D CONFIG_TCC_CRTPREFIX=\"${LIBDIR}\" \
|
||||
-D CONFIG_TCC_ELFINTERP=\"/mes/loader\" \
|
||||
-D CONFIG_TCC_LIBPATHS=\"${LIBDIR}:${LIBDIR}/tcc\" \
|
||||
-D CONFIG_TCC_SYSINCLUDEPATHS=\"${PREFIX}/include\" \
|
||||
-D CONFIG_TCC_SYSINCLUDEPATHS=\"${PREFIX}/include/mes\" \
|
||||
-D TCC_LIBGCC=\"${LIBDIR}/libc.a\" \
|
||||
-D TCC_LIBTCC1=\"libtcc1.a\" \
|
||||
-D CONFIG_TCCBOOT=1 \
|
||||
|
@ -258,13 +258,13 @@ tcc-boot1 \
|
|||
-D HAVE_LONG_LONG=1 \
|
||||
-D HAVE_SETJMP=1 \
|
||||
-I . \
|
||||
-I ${PREFIX}/include \
|
||||
-I ${PREFIX}/include/mes \
|
||||
-D TCC_TARGET_${TCC_TARGET_ARCH}=1 \
|
||||
-D CONFIG_TCCDIR=\"${LIBDIR}/tcc\" \
|
||||
-D CONFIG_TCC_CRTPREFIX=\"${LIBDIR}\" \
|
||||
-D CONFIG_TCC_ELFINTERP=\"/mes/loader\" \
|
||||
-D CONFIG_TCC_LIBPATHS=\"${LIBDIR}:${LIBDIR}/tcc\" \
|
||||
-D CONFIG_TCC_SYSINCLUDEPATHS=\"${PREFIX}/include\" \
|
||||
-D CONFIG_TCC_SYSINCLUDEPATHS=\"${PREFIX}/include/mes\" \
|
||||
-D TCC_LIBGCC=\"${LIBDIR}/libc.a\" \
|
||||
-D TCC_LIBTCC1=\"libtcc1.a\" \
|
||||
-D CONFIG_TCCBOOT=1 \
|
||||
|
|
|
@ -45,7 +45,7 @@ tcc-0.9.26 \
|
|||
-D CONFIG_TCC_CRTPREFIX=\"${LIBDIR}\" \
|
||||
-D CONFIG_TCC_ELFINTERP=\"/mes/loader\" \
|
||||
-D CONFIG_TCC_LIBPATHS=\"${LIBDIR}:${LIBDIR}/tcc\" \
|
||||
-D CONFIG_TCC_SYSINCLUDEPATHS=\"${PREFIX}/include\" \
|
||||
-D CONFIG_TCC_SYSINCLUDEPATHS=\"${PREFIX}/include/mes\" \
|
||||
-D TCC_LIBGCC=\"${LIBDIR}/libc.a\" \
|
||||
-D CONFIG_TCC_STATIC=1 \
|
||||
-D CONFIG_USE_LIBGCC=1 \
|
||||
|
|
|
@ -20,7 +20,7 @@ src_compile() {
|
|||
-D CONFIG_TCC_CRTPREFIX=\""${LIBDIR}"\" \
|
||||
-D CONFIG_TCC_ELFINTERP=\"/mes/loader\" \
|
||||
-D CONFIG_TCC_LIBPATHS=\""${LIBDIR}:${LIBDIR}/tcc"\" \
|
||||
-D CONFIG_TCC_SYSINCLUDEPATHS=\""${PREFIX}/include"\" \
|
||||
-D CONFIG_TCC_SYSINCLUDEPATHS=\""${PREFIX}/include/mes"\" \
|
||||
-D TCC_LIBGCC=\""${LIBDIR}/libc.a"\" \
|
||||
-D CONFIG_TCC_STATIC=1 \
|
||||
-D CONFIG_USE_LIBGCC=1 \
|
||||
|
|
|
@ -24,7 +24,7 @@ src_compile() {
|
|||
-D CONFIG_TCC_CRTPREFIX=\""${LIBDIR}"\" \
|
||||
-D CONFIG_TCC_ELFINTERP=\"/musl/loader\" \
|
||||
-D CONFIG_TCC_LIBPATHS=\""${LIBDIR}:${LIBDIR}/tcc"\" \
|
||||
-D CONFIG_TCC_SYSINCLUDEPATHS=\""${PREFIX}/include/musl"\" \
|
||||
-D CONFIG_TCC_SYSINCLUDEPATHS=\""${PREFIX}/include"\" \
|
||||
-D TCC_LIBGCC=\""${LIBDIR}/libc.a"\" \
|
||||
-D CONFIG_TCC_STATIC=1 \
|
||||
-D CONFIG_USE_LIBGCC=1 \
|
||||
|
|
|
@ -19,7 +19,7 @@ src_compile() {
|
|||
-D CONFIG_TCC_CRTPREFIX=\""${LIBDIR}"\" \
|
||||
-D CONFIG_TCC_ELFINTERP=\"/musl/loader\" \
|
||||
-D CONFIG_TCC_LIBPATHS=\""${LIBDIR}:${LIBDIR}/tcc"\" \
|
||||
-D CONFIG_TCC_SYSINCLUDEPATHS=\""${PREFIX}/include/musl"\" \
|
||||
-D CONFIG_TCC_SYSINCLUDEPATHS=\""${PREFIX}/include"\" \
|
||||
-D TCC_LIBGCC=\""${LIBDIR}/libc.a"\" \
|
||||
-D CONFIG_TCC_STATIC=1 \
|
||||
-D CONFIG_USE_LIBGCC=1 \
|
||||
|
|
Loading…
Reference in New Issue