Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: avoid breaking usrmerge, disable multilib #131

Merged
merged 1 commit into from
Feb 3, 2025
Merged

fix: avoid breaking usrmerge, disable multilib #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions gcc/pkg.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ steps:
--build=${BUILD} \
--host=${HOST} \
--prefix=/usr \
--libdir=/usr/lib \
--disable-multilib \
--disable-nls \
--enable-shared \
Expand Down Expand Up @@ -72,6 +73,8 @@ steps:
cd build
make DESTDIR=/rootfs install-strip
ln -sv gcc /rootfs/usr/bin/cc
mv /rootfs/usr/lib64/* /rootfs/usr/lib/
rm -rf /rootfs/usr/lib64
finalize:
- from: /rootfs
to: /
7 changes: 7 additions & 0 deletions musl/pkg.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@ steps:
- |
cd build
make DESTDIR=/rootfs install
ARCH=$(uname -m)
mkdir -p /rootfs/usr/bin /rootfs/usr/lib
rm -rf /rootfs/lib
ln -sf /usr/lib/ld-musl-${ARCH}.so.1 /rootfs/usr/bin/ldd
mv -f /rootfs/usr/lib/libc.so /rootfs/usr/lib/ld-musl-${ARCH}.so.1
ln -sf ld-musl-${ARCH}.so.1 /rootfs/usr/lib/libc.musl-${ARCH}.so.1
ln -sf /usr/lib/ld-musl-${ARCH}.so.1 /rootfs/usr/lib/libc.so
finalize:
- from: /rootfs
to: /