Skip to content

Commit f12ca9d

Browse files
fosslinuxfosslinux
committed
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
1 parent 6c6ced7 commit f12ca9d

File tree

13 files changed

+86
-85
lines changed

13 files changed

+86
-85
lines changed

‎sysa/after-preseeded.kaem

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ sysa=/sysa
1414
DISTFILES=/sysa/distfiles
1515
PREFIX=/usr
1616
BINDIR=${PREFIX}/bin
17-
LIBDIR=${LIBDIR}/mes
18-
INCDIR=${PREFIX}/include
17+
LIBDIR=${PREFIX}/lib/mes
18+
INCDIR=${PREFIX}/include/mes
1919
SRCDIR=${PREFIX}/src
2020
TMPDIR=/tmp # tmpdir is needed for patch to work
2121
PATH=${BINDIR}

‎sysa/after.kaem

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ DISTFILES=/sysa/distfiles
1717
PREFIX=/usr
1818
BINDIR=${PREFIX}/bin
1919
LIBDIR=${PREFIX}/lib
20-
INCDIR=${PREFIX}/include
20+
INCDIR=${PREFIX}/include/mes
2121
SRCDIR=${PREFIX}/src
2222
TMPDIR=/tmp # tmpdir is needed for patch to work
2323

‎sysa/lwext4-1.0.0-lb1/files/early-artifacts-needed-after-fiwix.txt

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -28,68 +28,68 @@
2828
/usr/lib/mes/crti.o
2929
/usr/lib/mes/crtn.o
3030
/usr/lib/mes/tcc/libtcc1.a
31-
/usr/include/alloca.h
32-
/usr/include/argz.h
33-
/usr/include/ar.h
34-
/usr/include/assert.h
35-
/usr/include/ctype.h
36-
/usr/include/dirent.h
37-
/usr/include/dirstream.h
38-
/usr/include/dlfcn.h
39-
/usr/include/endian.h
40-
/usr/include/errno.h
41-
/usr/include/fcntl.h
42-
/usr/include/features.h
43-
/usr/include/float.h
44-
/usr/include/getopt.h
45-
/usr/include/grp.h
46-
/usr/include/inttypes.h
47-
/usr/include/libgen.h
48-
/usr/include/limits.h
49-
/usr/include/locale.h
50-
/usr/include/math.h
51-
/usr/include/memory.h
52-
/usr/include/pwd.h
53-
/usr/include/setjmp.h
54-
/usr/include/signal.h
55-
/usr/include/stdarg.h
56-
/usr/include/stdbool.h
57-
/usr/include/stddef.h
58-
/usr/include/stdint.h
59-
/usr/include/stdio.h
60-
/usr/include/stdlib.h
61-
/usr/include/stdnoreturn.h
62-
/usr/include/string.h
63-
/usr/include/strings.h
64-
/usr/include/termio.h
65-
/usr/include/time.h
66-
/usr/include/unistd.h
67-
/usr/include/arch/kernel-stat.h
68-
/usr/include/arch/syscall.h
69-
/usr/include/linux/syscall.h
70-
/usr/include/linux/x86/syscall.h
71-
/usr/include/mes/builtins.h
72-
/usr/include/mes/cc.h
73-
/usr/include/mes/config.h
74-
/usr/include/mes/constants.h
75-
/usr/include/mes/lib.h
76-
/usr/include/mes/lib-cc.h
77-
/usr/include/mes/lib-mini.h
78-
/usr/include/mes/mes.h
79-
/usr/include/mes/symbols.h
80-
/usr/include/sys/cdefs.h
81-
/usr/include/sys/dir.h
82-
/usr/include/sys/file.h
83-
/usr/include/sys/ioctl.h
84-
/usr/include/sys/mman.h
85-
/usr/include/sys/param.h
86-
/usr/include/sys/resource.h
87-
/usr/include/sys/select.h
88-
/usr/include/sys/stat.h
89-
/usr/include/sys/timeb.h
90-
/usr/include/sys/time.h
91-
/usr/include/sys/times.h
92-
/usr/include/sys/types.h
93-
/usr/include/sys/ucontext.h
94-
/usr/include/sys/user.h
95-
/usr/include/sys/wait.h
31+
/usr/include/mes/alloca.h
32+
/usr/include/mes/argz.h
33+
/usr/include/mes/ar.h
34+
/usr/include/mes/assert.h
35+
/usr/include/mes/ctype.h
36+
/usr/include/mes/dirent.h
37+
/usr/include/mes/dirstream.h
38+
/usr/include/mes/dlfcn.h
39+
/usr/include/mes/endian.h
40+
/usr/include/mes/errno.h
41+
/usr/include/mes/fcntl.h
42+
/usr/include/mes/features.h
43+
/usr/include/mes/float.h
44+
/usr/include/mes/getopt.h
45+
/usr/include/mes/grp.h
46+
/usr/include/mes/inttypes.h
47+
/usr/include/mes/libgen.h
48+
/usr/include/mes/limits.h
49+
/usr/include/mes/locale.h
50+
/usr/include/mes/math.h
51+
/usr/include/mes/memory.h
52+
/usr/include/mes/pwd.h
53+
/usr/include/mes/setjmp.h
54+
/usr/include/mes/signal.h
55+
/usr/include/mes/stdarg.h
56+
/usr/include/mes/stdbool.h
57+
/usr/include/mes/stddef.h
58+
/usr/include/mes/stdint.h
59+
/usr/include/mes/stdio.h
60+
/usr/include/mes/stdlib.h
61+
/usr/include/mes/stdnoreturn.h
62+
/usr/include/mes/string.h
63+
/usr/include/mes/strings.h
64+
/usr/include/mes/termio.h
65+
/usr/include/mes/time.h
66+
/usr/include/mes/unistd.h
67+
/usr/include/mes/arch/kernel-stat.h
68+
/usr/include/mes/arch/syscall.h
69+
/usr/include/mes/linux/syscall.h
70+
/usr/include/mes/linux/x86/syscall.h
71+
/usr/include/mes/mes/builtins.h
72+
/usr/include/mes/mes/cc.h
73+
/usr/include/mes/mes/config.h
74+
/usr/include/mes/mes/constants.h
75+
/usr/include/mes/mes/lib.h
76+
/usr/include/mes/mes/lib-cc.h
77+
/usr/include/mes/mes/lib-mini.h
78+
/usr/include/mes/mes/mes.h
79+
/usr/include/mes/mes/symbols.h
80+
/usr/include/mes/sys/cdefs.h
81+
/usr/include/mes/sys/dir.h
82+
/usr/include/mes/sys/file.h
83+
/usr/include/mes/sys/ioctl.h
84+
/usr/include/mes/sys/mman.h
85+
/usr/include/mes/sys/param.h
86+
/usr/include/mes/sys/resource.h
87+
/usr/include/mes/sys/select.h
88+
/usr/include/mes/sys/stat.h
89+
/usr/include/mes/sys/timeb.h
90+
/usr/include/mes/sys/time.h
91+
/usr/include/mes/sys/times.h
92+
/usr/include/mes/sys/types.h
93+
/usr/include/mes/sys/ucontext.h
94+
/usr/include/mes/sys/user.h
95+
/usr/include/mes/sys/wait.h

‎sysa/lwext4-1.0.0-lb1/lwext4-1.0.0-lb1.kaem

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
#!/bin/sh
12
# SPDX-FileCopyrightText: 2023 Richard Masters <[email protected]>
23
# SPDX-License-Identifier: MIT
34

5+
set -ex
6+
47
mkdir build src
58
cd src
69
ungz --file ${DISTFILES}/${pkg}.tar.gz --output ${pkg}.tar
@@ -10,9 +13,7 @@ cd build
1013
untar --file ../src/${pkg}.tar
1114
cd ${pkg}
1215

13-
mkdir build_generic
14-
mkdir build_generic/include
15-
mkdir build_generic/include/generated
16+
mkdir -p build_generic/include/generated
1617
catm build_generic/include/generated/ext4_config.h ../../config/ext4_config.h
1718

1819
cd blockdev/linux

‎sysa/musl-1.1.24/binutils-rebuild.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ src_configure() {
1515
--disable-shared \
1616
--prefix="${PREFIX}" \
1717
--libdir="${LIBDIR}" \
18-
--includedir="${PREFIX}/include/"
18+
--includedir="${PREFIX}/include"
1919

2020
# configure script creates this file
2121
if test -f /dev/null; then

‎sysa/musl-1.1.24/musl-1.1.24.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ src_configure() {
1818
--disable-shared \
1919
--prefix="${PREFIX}" \
2020
--libdir="${LIBDIR}" \
21-
--includedir="${PREFIX}/include/musl"
21+
--includedir="${PREFIX}/include/"
2222

2323
# configure script creates this file
2424
if test -f /dev/null; then

‎sysa/perl-5.6.2/perl-5.6.2.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ src_prepare() {
3131
sed -i 's/sv_setptrobj/Perl_sv_setref_iv/' ext/POSIX/POSIX.xs
3232

3333
# We are using non-standard locations
34-
sed -i "s#/usr/include/errno.h#${PREFIX}/include/musl/bits/errno.h#" ext/Errno/Errno_pm.PL
34+
sed -i "s#/usr/include/errno.h#${PREFIX}/include/bits/errno.h#" ext/Errno/Errno_pm.PL
3535
}
3636

3737
src_compile() {

‎sysa/run-after-fiwix.kaem

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ DISTFILES=/sysa/distfiles
2525
PREFIX=/usr
2626
BINDIR=${PREFIX}/bin
2727
LIBDIR=${PREFIX}/lib/mes
28-
INCDIR=${PREFIX}/include
28+
INCDIR=${PREFIX}/include/mes
2929
SRCDIR=${PREFIX}/src
3030
TMPDIR=/tmp # tmpdir is needed for patch to work
3131

‎sysa/tcc-0.9.26/tcc-0.9.26.kaem

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ ${MES} --no-auto-compile -e main ${BINDIR}/mescc.scm -- \
7676
-D CONFIG_SYSROOT=\"/\" \
7777
-D CONFIG_TCC_CRTPREFIX=\"${LIBDIR}\" \
7878
-D CONFIG_TCC_ELFINTERP=\"/mes/loader\" \
79-
-D CONFIG_TCC_SYSINCLUDEPATHS=\"${PREFIX}/mes/include:${PREFIX}/include\"
79+
-D CONFIG_TCC_SYSINCLUDEPATHS=\"${PREFIX}/include/mes\" \
8080
-D TCC_LIBGCC=\"${LIBDIR}/libc.a\" \
8181
-D CONFIG_TCC_LIBTCC1_MES=0 \
8282
-D CONFIG_TCCBOOT=1 \
@@ -157,7 +157,7 @@ tcc-mes \
157157
-D CONFIG_TCC_CRTPREFIX=\"${LIBDIR}\" \
158158
-D CONFIG_TCC_ELFINTERP=\"/mes/loader\" \
159159
-D CONFIG_TCC_LIBPATHS=\"${LIBDIR}:${LIBDIR}/tcc\" \
160-
-D CONFIG_TCC_SYSINCLUDEPATHS=\"${PREFIX}/include\" \
160+
-D CONFIG_TCC_SYSINCLUDEPATHS=\"${PREFIX}/include/mes\" \
161161
-D TCC_LIBGCC=\"${LIBDIR}/libc.a\" \
162162
-D TCC_LIBTCC1=\"libtcc1.a\" \
163163
-D CONFIG_TCCBOOT=1 \
@@ -206,13 +206,13 @@ tcc-boot0 \
206206
-D HAVE_LONG_LONG=1 \
207207
-D HAVE_SETJMP=1 \
208208
-I . \
209-
-I ${PREFIX}/include \
209+
-I ${PREFIX}/include/mes \
210210
-D TCC_TARGET_${TCC_TARGET_ARCH}=1 \
211211
-D CONFIG_TCCDIR=\"${LIBDIR}/tcc\" \
212212
-D CONFIG_TCC_CRTPREFIX=\"${LIBDIR}\" \
213213
-D CONFIG_TCC_ELFINTERP=\"/mes/loader\" \
214214
-D CONFIG_TCC_LIBPATHS=\"${LIBDIR}:${LIBDIR}/tcc\" \
215-
-D CONFIG_TCC_SYSINCLUDEPATHS=\"${PREFIX}/include\" \
215+
-D CONFIG_TCC_SYSINCLUDEPATHS=\"${PREFIX}/include/mes\" \
216216
-D TCC_LIBGCC=\"${LIBDIR}/libc.a\" \
217217
-D TCC_LIBTCC1=\"libtcc1.a\" \
218218
-D CONFIG_TCCBOOT=1 \
@@ -258,13 +258,13 @@ tcc-boot1 \
258258
-D HAVE_LONG_LONG=1 \
259259
-D HAVE_SETJMP=1 \
260260
-I . \
261-
-I ${PREFIX}/include \
261+
-I ${PREFIX}/include/mes \
262262
-D TCC_TARGET_${TCC_TARGET_ARCH}=1 \
263263
-D CONFIG_TCCDIR=\"${LIBDIR}/tcc\" \
264264
-D CONFIG_TCC_CRTPREFIX=\"${LIBDIR}\" \
265265
-D CONFIG_TCC_ELFINTERP=\"/mes/loader\" \
266266
-D CONFIG_TCC_LIBPATHS=\"${LIBDIR}:${LIBDIR}/tcc\" \
267-
-D CONFIG_TCC_SYSINCLUDEPATHS=\"${PREFIX}/include\" \
267+
-D CONFIG_TCC_SYSINCLUDEPATHS=\"${PREFIX}/include/mes\" \
268268
-D TCC_LIBGCC=\"${LIBDIR}/libc.a\" \
269269
-D TCC_LIBTCC1=\"libtcc1.a\" \
270270
-D CONFIG_TCCBOOT=1 \

‎sysa/tcc-0.9.27/tcc-0.9.27.kaem

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ tcc-0.9.26 \
4545
-D CONFIG_TCC_CRTPREFIX=\"${LIBDIR}\" \
4646
-D CONFIG_TCC_ELFINTERP=\"/mes/loader\" \
4747
-D CONFIG_TCC_LIBPATHS=\"${LIBDIR}:${LIBDIR}/tcc\" \
48-
-D CONFIG_TCC_SYSINCLUDEPATHS=\"${PREFIX}/include\" \
48+
-D CONFIG_TCC_SYSINCLUDEPATHS=\"${PREFIX}/include/mes\" \
4949
-D TCC_LIBGCC=\"${LIBDIR}/libc.a\" \
5050
-D CONFIG_TCC_STATIC=1 \
5151
-D CONFIG_USE_LIBGCC=1 \

0 commit comments

Comments
 (0)