chadmed/gentoo-asahi-releng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tools-musl: add armv7a-hardfloat-linux-musleabi

Browse source
This commit is contained in:
Anthony G. Basile 2014-02-24 15:59:23 +00:00
parent 13469f8665
commit 80cb3a95e5
3 changed files with 28 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools-musl/portage/make.conf
View file

@ -1,5 +1,5 @@
CHOST=ALTARCH-gentoo-linux-musl CHOST=MY_CHOST
CFLAGS="-Os -pipe -fomit-frame-pointer" CFLAGS="-Os -pipe -fomit-frame-pointerMY_CFLAGS"
CXXFLAGS="${CFLAGS}" CXXFLAGS="${CFLAGS}"
USE="-hardened -fortran -mudflap" USE="-hardened -fortran -mudflap"

6
tools-musl/portage/package.accept_keywords
View file

@ -1,3 +1,3 @@
=sys-apps/getent-0 ~amd64 ~x86 =sys-apps/getent-0 ~amd64 ~arm ~x86
=sys-libs/musl-0.9.15 ~amd64 ~x86 =sys-libs/musl-0.9.15 ~amd64 ~arm ~x86
=app-text/openjade-1.3.2-r6 ~amd64 ~x86 =app-text/openjade-1.3.2-r6 ~amd64 ~arm ~x86

43
tools-musl/run.sh
View file

@ -4,10 +4,23 @@ TEST_ARCH=$(file -b /usr/lib/libc.so | sed -e 's/^.*shared object, //' -e 's/,.*
if [[ "${TEST_ARCH}" == "Intel 80386" ]]; then if [[ "${TEST_ARCH}" == "Intel 80386" ]]; then
MY_ARCH="i686" MY_ARCH="i686"
ALTARCH="i386" MY_CHOST="i686-gentoo-linux-musl"
MY_CFLAGS=""
MY_PROF="x86"
MY_PATH="i386"
elif [[ "${TEST_ARCH}" == "x86-64" ]]; then elif [[ "${TEST_ARCH}" == "x86-64" ]]; then
MY_ARCH="amd64" MY_ARCH="amd64"
ALTARCH="x86_64" MY_CHOST="x86_64-gentoo-linux-musl"
MY_CFLAGS=""
MY_PROF="amd64"
MY_PATH="x86_64"
elif [[ "${TEST_ARCH}" == "ARM" ]]; then
# Need better logic for alternative subarches and hard/softfloat
MY_ARCH="armv7a_hardfp"
MY_CHOST="armv7a-hardfloat-linux-musleabi"
MY_CFLAGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
MY_PROF="arm/armv7a"
MY_PATH="armhf"
else else
echo "Unsupported arch $TEST_ARCH" echo "Unsupported arch $TEST_ARCH"
exit exit
@ -19,32 +32,22 @@ PWD="$(pwd)"
prepare_etc () { prepare_etc () {
mkdir -p "${ROOTFS}"/etc mkdir -p "${ROOTFS}"/etc
cp -a "${PWD}"/portage/ "${ROOTFS}"/etc/ cp -a "${PWD}"/portage/ "${ROOTFS}"/etc/
sed -i "s/MY_CHOST/${MY_CHOST}/" "${ROOTFS}"/etc/portage/make.conf
if [[ "$MY_ARCH" == "amd64" ]]; then sed -i "s/MY_CFLAGS/${MY_CFLAGS}/" "${ROOTFS}"/etc/portage/make.conf
sed -i "s/ALTARCH/${ALTARCH}/" "${ROOTFS}"/etc/portage/make.conf ln -sf ../../usr/portage/profiles/hardened/linux/musl/"${MY_PROF}" "${ROOTFS}"/etc/portage/make.profile
ln -sf ../../usr/portage/profiles/hardened/linux/musl/amd64 "${ROOTFS}"/etc/portage/make.profile
elif [[ "$MY_ARCH" == "i686" ]]; then
sed -i "s/ALTARCH/${MY_ARCH}/" "${ROOTFS}"/etc/portage/make.conf
ln -sf ../../usr/portage/profiles/hardened/linux/musl/x86 "${ROOTFS}"/etc/portage/make.profile
fi
} }
prepare_usr_etc() { prepare_usr_etc() {
mkdir -p "${ROOTFS}"/usr/etc mkdir -p "${ROOTFS}"/usr/etc
local PATH_ARCH cat <<-EOF > "${ROOTFS}"/usr/etc/ld-musl-${MY_PATH}.path
[[ "$MY_ARCH" == "amd64" ]] && PATH_ARCH="x86_64"
[[ "$MY_ARCH" == "i686" ]] && PATH_ARCH="i686"
cat <<-EOF > "${ROOTFS}"/usr/etc/ld-musl-${ALTARCH}.path
/lib /lib
/usr/lib /usr/lib
/usr/lib/gcc/${PATH_ARCH}-gentoo-linux-musl/4.7.3 /usr/lib/gcc/${MY_CHOST}/4.7.3
/usr/${PATH_ARCH}-gentoo-linux-musl/lib /usr/${MY_CHOST}/lib
EOF EOF
ln -sf ld-musl-${ALTARCH}.path "${ROOTFS}"/usr/etc/ld-musl.path ln -sf ld-musl-${MY_PATH}.path "${ROOTFS}"/usr/etc/ld-musl.path
} }
prepare_overlay() { prepare_overlay() {
@ -55,7 +58,7 @@ prepare_overlay() {
emerge_system() { emerge_system() {
ROOT="${ROOTFS}" emerge --keep-going --with-bdeps=y -uvq @system ROOT="${ROOTFS}" emerge --keep-going --with-bdeps=y -uvq @system
ROOT="${ROOTFS}" emerge --keep-going --with-bdeps=y -uvq sandbox FEATURES="-sandbox" ROOT="${ROOTFS}" emerge --keep-going --with-bdeps=y -uvq sandbox
} }
mk_top_level_dirs() { mk_top_level_dirs() {