Skip to content

/usr merge #43

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

Closed
mattst88 wants to merge 3 commits into from
+12 −13
Closed

/usr merge #43

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
110951a
crossdev: usrmerge for Linux GNU targets
mattst88 May 21, 2026
446cf14
crossdev: usrmerge for non-GNU targets
mattst88 May 21, 2026
9f46d9d
crossdev: usrmerge for riscv lib64/lib32
mattst88 May 21, 2026
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
25 changes: 12 additions & 13 deletions crossdev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1713,9 +1713,12 @@ if [[ ${CTARGET} == *-gnu* ]] ; then
# Identify if it is really Hurd or not
case ${CTARGET} in
*-linux*)
# Same as non-Hurd patch
xmkdir -p "${EPREFIX}"/usr/${CTARGET}/lib
xmkdir -p "${EPREFIX}"/usr/${CTARGET}/usr/lib
xmkdir -p "${EPREFIX}"/usr/${CTARGET}/usr/bin
ln -s usr/lib "${EPREFIX}"/usr/${CTARGET}/lib
ln -s usr/bin "${EPREFIX}"/usr/${CTARGET}/bin
ln -s usr/bin "${EPREFIX}"/usr/${CTARGET}/sbin
ln -s bin "${EPREFIX}"/usr/${CTARGET}/usr/sbin
;;
i[3-7]86*-gnu*)
# Hurd is special as it defaults upstream to implicit inverse usr-merge
Expand Down Expand Up @@ -1747,8 +1750,12 @@ if [[ ${CTARGET} == *-gnu* ]] ; then
;;
esac
else
xmkdir -p "${EPREFIX}"/usr/${CTARGET}/lib
xmkdir -p "${EPREFIX}"/usr/${CTARGET}/usr/lib
xmkdir -p "${EPREFIX}"/usr/${CTARGET}/usr/bin
ln -s usr/lib "${EPREFIX}"/usr/${CTARGET}/lib
ln -s usr/bin "${EPREFIX}"/usr/${CTARGET}/bin
ln -s usr/bin "${EPREFIX}"/usr/${CTARGET}/sbin
ln -s bin "${EPREFIX}"/usr/${CTARGET}/usr/sbin
fi

###
Expand All @@ -1757,28 +1764,20 @@ fi
### step 2: set up the compat symlink of the default abi for non-multilib
case ${CTARGET} in
riscv*)
xmkdir -p "${EPREFIX}"/usr/${CTARGET}/lib64
xmkdir -p "${EPREFIX}"/usr/${CTARGET}/lib64/lp64
xmkdir -p "${EPREFIX}"/usr/${CTARGET}/lib64/lp64d
xmkdir -p "${EPREFIX}"/usr/${CTARGET}/usr/lib64
xmkdir -p "${EPREFIX}"/usr/${CTARGET}/usr/lib64/lp64
xmkdir -p "${EPREFIX}"/usr/${CTARGET}/usr/lib64/lp64d
xmkdir -p "${EPREFIX}"/usr/${CTARGET}/lib32
xmkdir -p "${EPREFIX}"/usr/${CTARGET}/lib32/ilp32
xmkdir -p "${EPREFIX}"/usr/${CTARGET}/lib32/ilp32d
xmkdir -p "${EPREFIX}"/usr/${CTARGET}/usr/lib32
xmkdir -p "${EPREFIX}"/usr/${CTARGET}/usr/lib32/ilp32
xmkdir -p "${EPREFIX}"/usr/${CTARGET}/usr/lib32/ilp32d
ln -s usr/lib64 "${EPREFIX}"/usr/${CTARGET}/lib64
ln -s usr/lib32 "${EPREFIX}"/usr/${CTARGET}/lib32
;;&
riscv64*)
rmdir "${EPREFIX}"/usr/${CTARGET}/lib64/${DEFAULT_ABI}
ln -s . "${EPREFIX}"/usr/${CTARGET}/lib64/${DEFAULT_ABI}
rmdir "${EPREFIX}"/usr/${CTARGET}/usr/lib64/${DEFAULT_ABI}
ln -s . "${EPREFIX}"/usr/${CTARGET}/usr/lib64/${DEFAULT_ABI}
;;
riscv32*)
rmdir "${EPREFIX}"/usr/${CTARGET}/lib32/${DEFAULT_ABI}
ln -s ../lib "${EPREFIX}"/usr/${CTARGET}/lib32/${DEFAULT_ABI}
rmdir "${EPREFIX}"/usr/${CTARGET}/usr/lib32/${DEFAULT_ABI}
ln -s ../lib "${EPREFIX}"/usr/${CTARGET}/usr/lib32/${DEFAULT_ABI}
;;
Expand Down
Loading