wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-07 23:53:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

cross-*-musl*: apply kernel-libc-headers patches.

Browse source
This commit is contained in:
Juan RP 2015-05-31 16:27:42 +02:00
parent 15bbed5455
commit add9dfc183
4 changed files with 39 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
srcpkgs/cross-arm-linux-musleabihf/template
View file

@ -3,7 +3,7 @@
_binutils_version=2.25 _binutils_version=2.25
_gcc_version=4.9.2 _gcc_version=4.9.2
_musl_version=1.1.9 _musl_version=1.1.9
_linux_version=3.18.5 _linux_version=3.18.6
_triplet=arm-linux-musleabihf _triplet=arm-linux-musleabihf
_fpuflags="--with-arch=armv6 --with-fpu=vfp --with-float=hard" _fpuflags="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet} pkgname=cross-${_triplet}
version=0.17 version=0.17
revision=3 revision=4
short_desc="Cross toolchain for ARMv6 LE Hard Float target (musl)" short_desc="Cross toolchain for ARMv6 LE Hard Float target (musl)"
maintainer="Juan RP <xtraeme@voidlinux.eu>" maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.voidlinux.eu" homepage="http://www.voidlinux.eu"
@ -25,7 +25,7 @@ distfiles="
checksum=" checksum="
22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923 22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923
2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd
e4442436e59c74169e98d38d2e2a434c7b73f8eda0aa8f20e454eaf52270fc90 c4c1a4841173aa572d79b7530db92ce493dbefe8049e6f461a46dd897df253f5
00bf7173caf972c88cd07cb0d420c082a2f35efcccc1a81f8909bec2d030283e" 00bf7173caf972c88cd07cb0d420c082a2f35efcccc1a81f8909bec2d030283e"
lib32disabled=yes lib32disabled=yes
@ -39,10 +39,10 @@ nostrip_files="libgcc.a libgcov.a libgcc_eh.a"
depends="${pkgname}-libc-${version}_${revision}" depends="${pkgname}-libc-${version}_${revision}"
_apply_patch() { _apply_patch() {
local pname="$(basename $1)" local args="$1" pname="$(basename $2)"
if [ ! -f ".${pname}_done" ]; then if [ ! -f ".${pname}_done" ]; then
patch -Np1 -i ${1} patch -N $args -i ${2}
touch .${pname}_done touch .${pname}_done
fi fi
} }
@ -71,7 +71,7 @@ _gcc_bootstrap() {
[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0 [ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
cd ${wrksrc}/gcc-${_gcc_version} cd ${wrksrc}/gcc-${_gcc_version}
_apply_patch ${FILESDIR}/gcc-${_gcc_version}-musl.diff _apply_patch -p1 ${FILESDIR}/gcc-${_gcc_version}-musl.diff
msg_normal "Building cross gcc bootstrap\n" msg_normal "Building cross gcc bootstrap\n"
@ -99,6 +99,9 @@ _linux_headers() {
msg_normal "Building Linux API headers for ARM\n" msg_normal "Building Linux API headers for ARM\n"
cd linux-${_linux_version} cd linux-${_linux_version}
for f in ${XBPS_SRCPKGDIR}/kernel-libc-headers/patches/*.patch; do
_apply_patch -p0 $f
done
make ARCH=arm headers_check make ARCH=arm headers_check
make ARCH=arm INSTALL_HDR_PATH=${_sysroot}/usr headers_install make ARCH=arm INSTALL_HDR_PATH=${_sysroot}/usr headers_install

16
srcpkgs/cross-armv7l-linux-musleabihf/template
View file

@ -3,7 +3,7 @@
_binutils_version=2.25 _binutils_version=2.25
_gcc_version=4.9.2 _gcc_version=4.9.2
_musl_version=1.1.9 _musl_version=1.1.9
_linux_version=3.18.5 _linux_version=3.18.6
_triplet=armv7l-linux-musleabihf _triplet=armv7l-linux-musleabihf
_fpuflags="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard" _fpuflags="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet} pkgname=cross-${_triplet}
version=0.17 version=0.17
revision=3 revision=4
short_desc="Cross toolchain for ARMv7 LE Hard Float target (musl)" short_desc="Cross toolchain for ARMv7 LE Hard Float target (musl)"
maintainer="Juan RP <xtraeme@voidlinux.eu>" maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.voidlinux.eu" homepage="http://www.voidlinux.eu"
@ -25,7 +25,7 @@ distfiles="
checksum=" checksum="
22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923 22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923
2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd
e4442436e59c74169e98d38d2e2a434c7b73f8eda0aa8f20e454eaf52270fc90 c4c1a4841173aa572d79b7530db92ce493dbefe8049e6f461a46dd897df253f5
00bf7173caf972c88cd07cb0d420c082a2f35efcccc1a81f8909bec2d030283e" 00bf7173caf972c88cd07cb0d420c082a2f35efcccc1a81f8909bec2d030283e"
lib32disabled=yes lib32disabled=yes
@ -39,10 +39,10 @@ nostrip_files="libgcc.a libgcov.a libgcc_eh.a"
depends="${pkgname}-libc-${version}_${revision}" depends="${pkgname}-libc-${version}_${revision}"
_apply_patch() { _apply_patch() {
local pname="$(basename $1)" local args="$1" pname="$(basename $2)"
if [ ! -f ".${pname}_done" ]; then if [ ! -f ".${pname}_done" ]; then
patch -Np1 -i ${1} patch -N $args -i ${2}
touch .${pname}_done touch .${pname}_done
fi fi
} }
@ -71,7 +71,7 @@ _gcc_bootstrap() {
[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0 [ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
cd ${wrksrc}/gcc-${_gcc_version} cd ${wrksrc}/gcc-${_gcc_version}
_apply_patch ${FILESDIR}/gcc-${_gcc_version}-musl.diff _apply_patch -p1 ${FILESDIR}/gcc-${_gcc_version}-musl.diff
msg_normal "Building cross gcc bootstrap\n" msg_normal "Building cross gcc bootstrap\n"
@ -100,6 +100,10 @@ _linux_headers() {
cd linux-${_linux_version} cd linux-${_linux_version}
for f in ${XBPS_SRCPKGDIR}/kernel-libc-headers/patches/*.patch; do
_apply_patch -p0 $f
done
make ARCH=arm headers_check make ARCH=arm headers_check
make ARCH=arm INSTALL_HDR_PATH=${_sysroot}/usr headers_install make ARCH=arm INSTALL_HDR_PATH=${_sysroot}/usr headers_install

16
srcpkgs/cross-i686-linux-musl/template
View file

@ -3,7 +3,7 @@
_binutils_version=2.25 _binutils_version=2.25
_gcc_version=4.9.2 _gcc_version=4.9.2
_musl_version=1.1.6 _musl_version=1.1.6
_linux_version=3.18.5 _linux_version=3.18.6
_triplet=i686-linux-musl _triplet=i686-linux-musl
_sysroot="/usr/${_triplet}" _sysroot="/usr/${_triplet}"
@ -11,7 +11,7 @@ _archflags="-march=i686"
pkgname=cross-${_triplet} pkgname=cross-${_triplet}
version=0.17 version=0.17
revision=5 revision=6
short_desc="Cross toolchain for i686 target (musl)" short_desc="Cross toolchain for i686 target (musl)"
maintainer="Juan RP <xtraeme@voidlinux.eu>" maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.voidlinux.eu" homepage="http://www.voidlinux.eu"
@ -24,7 +24,7 @@ distfiles="
checksum=" checksum="
22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923 22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923
2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd
e4442436e59c74169e98d38d2e2a434c7b73f8eda0aa8f20e454eaf52270fc90 c4c1a4841173aa572d79b7530db92ce493dbefe8049e6f461a46dd897df253f5
5a0160c55c540d5b90158617a57647f1b03209f58d9ee70dbce19d1115b4f1b4" 5a0160c55c540d5b90158617a57647f1b03209f58d9ee70dbce19d1115b4f1b4"
lib32disabled=yes lib32disabled=yes
@ -38,10 +38,10 @@ depends="${pkgname}-libc-${version}_${revision}"
only_for_archs="i686 x86_64 x86_64-musl" only_for_archs="i686 x86_64 x86_64-musl"
_apply_patch() { _apply_patch() {
local pname="$(basename $1)" local args="$1" pname="$(basename $2)"
if [ ! -f ".${pname}_done" ]; then if [ ! -f ".${pname}_done" ]; then
patch -Np1 -i ${1} patch -N $args -i ${2}
touch .${pname}_done touch .${pname}_done
fi fi
} }
@ -71,7 +71,7 @@ _gcc_bootstrap() {
[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0 [ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
cd ${wrksrc}/gcc-${_gcc_version} cd ${wrksrc}/gcc-${_gcc_version}
_apply_patch ${FILESDIR}/gcc-${_gcc_version}-musl.diff _apply_patch -p1 ${FILESDIR}/gcc-${_gcc_version}-musl.diff
msg_normal "Building cross gcc bootstrap\n" msg_normal "Building cross gcc bootstrap\n"
@ -100,6 +100,10 @@ _linux_headers() {
cd linux-${_linux_version} cd linux-${_linux_version}
for f in ${XBPS_SRCPKGDIR}/kernel-libc-headers/patches/*.patch; do
_apply_patch -p0 $f
done
make ARCH=x86 headers_check make ARCH=x86 headers_check
make ARCH=x86 INSTALL_HDR_PATH=${_sysroot}/usr headers_install make ARCH=x86 INSTALL_HDR_PATH=${_sysroot}/usr headers_install

16
srcpkgs/cross-x86_64-linux-musl/template
View file

@ -3,14 +3,14 @@
_binutils_version=2.25 _binutils_version=2.25
_gcc_version=4.9.2 _gcc_version=4.9.2
_musl_version=1.1.6 _musl_version=1.1.6
_linux_version=3.18.5 _linux_version=3.18.6
_triplet=x86_64-linux-musl _triplet=x86_64-linux-musl
_sysroot="/usr/${_triplet}" _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet} pkgname=cross-${_triplet}
version=0.17 version=0.17
revision=3 revision=4
short_desc="Cross toolchain for x86_64 with musl" short_desc="Cross toolchain for x86_64 with musl"
maintainer="Juan RP <xtraeme@voidlinux.eu>" maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.voidlinux.eu" homepage="http://www.voidlinux.eu"
@ -23,7 +23,7 @@ distfiles="
checksum=" checksum="
22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923 22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923
2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd
e4442436e59c74169e98d38d2e2a434c7b73f8eda0aa8f20e454eaf52270fc90 c4c1a4841173aa572d79b7530db92ce493dbefe8049e6f461a46dd897df253f5
5a0160c55c540d5b90158617a57647f1b03209f58d9ee70dbce19d1115b4f1b4" 5a0160c55c540d5b90158617a57647f1b03209f58d9ee70dbce19d1115b4f1b4"
lib32disabled=yes lib32disabled=yes
@ -37,10 +37,10 @@ depends="${pkgname}-libc-${version}_${revision}"
only_for_archs="i686 i686-musl x86_64" only_for_archs="i686 i686-musl x86_64"
_apply_patch() { _apply_patch() {
local pname="$(basename $1)" local args="$1" pname="$(basename $2)"
if [ ! -f ".${pname}_done" ]; then if [ ! -f ".${pname}_done" ]; then
patch -Np1 -i ${1} patch -N $args -i ${2}
touch .${pname}_done touch .${pname}_done
fi fi
} }
@ -70,7 +70,7 @@ _gcc_bootstrap() {
[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0 [ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
cd ${wrksrc}/gcc-${_gcc_version} cd ${wrksrc}/gcc-${_gcc_version}
_apply_patch ${FILESDIR}/gcc-${_gcc_version}-musl.diff _apply_patch -p1 ${FILESDIR}/gcc-${_gcc_version}-musl.diff
msg_normal "Building cross gcc bootstrap\n" msg_normal "Building cross gcc bootstrap\n"
@ -99,6 +99,10 @@ _linux_headers() {
cd linux-${_linux_version} cd linux-${_linux_version}
for f in ${XBPS_SRCPKGDIR}/kernel-libc-headers/patches/*.patch; do
_apply_patch -p0 $f
done
make ARCH=x86 headers_check make ARCH=x86 headers_check
make ARCH=x86 INSTALL_HDR_PATH=${_sysroot}/usr headers_install make ARCH=x86 INSTALL_HDR_PATH=${_sysroot}/usr headers_install