musl 1.1.23-1 (x86_64) 2019-7509
9999
Status | published | ||||||||||||||||||
Submitter | nobodydead [@T] gmail.com | ||||||||||||||||||
Platform | rolling | ||||||||||||||||||
Repository | main | ||||||||||||||||||
URL | https://abf.openmandriva.org/build_lists/615773 | ||||||||||||||||||
Packages |
|
||||||||||||||||||
Build Date | 2019-10-11 19:03:17 +0000 UTC | ||||||||||||||||||
Last Updated | 2019-10-12 10:49:07.204370937 +0000 UTC |
$ git show --format=fuller --patch-with-stat --summary 64e33eac36ecf08a7d3002129368c65872efc286 commit 64e33eac36ecf08a7d3002129368c65872efc286 Author: Bernhard Rosenkränzer <bero@lindev.ch> AuthorDate: Sat Sep 28 20:03:10 2019 +0200 Commit: Bernhard Rosenkränzer <bero@lindev.ch> CommitDate: Sat Sep 28 20:03:10 2019 +0200 Fix cross-compiled versions --- musl.spec | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/musl.spec b/musl.spec index d9e2a41..cc63f6c 100644 --- a/musl.spec +++ b/musl.spec @@ -1,12 +1,12 @@ # Debug package generation isn't compatible with musl at the moment %define debug_package %{nil} -%global targets aarch64-linux armv7hl-linux i586-linux i686-linux x86_64-linux x32-linux aarch64-linuxmusl armv7hl-linuxmusl i586-linuxmusl i686-linuxmusl x86_64-linuxmusl x32-linuxmusl +%global targets aarch64-linux armv7hnl-linux i686-linux x86_64-linux x32-linux riscv64-linux aarch64-linuxmusl armv7hnl-linuxmusl i686-linuxmusl x86_64-linuxmusl x32-linuxmusl riscv64-linuxmusl aarch64-android armv7l-android armv8l-android %global long_targets %( for i in %{targets}; do CPU=$(echo $i |cut -d- -f1) OS=$(echo $i |cut -d- -f2) - echo -n "$(rpm --macros %%{_usrlibrpm}/macros:%%{_usrlibrpm}/platform/${CPU}-${OS}/macros --target=${CPU} -E %%{_target_platform}) " + echo -n "$(rpm --target=${CPU}-${OS} -E %%{_target_platform}) " done ) @@ -65,7 +65,7 @@ for i in %{long_targets}; do cat <<EOF %%package -n cross-${i}-musl Summary: Musl libc for crosscompiling to ${i} targets -BuildRequires: cross-${i}-gcc +BuildRequires: cross-${i}-gcc-bootstrap BuildRequires: cross-${i}-binutils Group: Development/Other EOF @@ -81,13 +81,13 @@ EOF Musl libc for crosscompiling to ${i} targets. EOF echo -# echo "%%files -n cross-${i}-musl" -# if $main_libc; then -# echo "%{_prefix}/${i}/lib/*" -# echo "%{_prefix}/${i}/include/*" -# else -# echo "%{_prefix}/${i}/musl" -# fi + echo "%%files -n cross-${i}-musl" + if $main_libc; then + echo "%{_prefix}/${i}/lib/*" + echo "%{_prefix}/${i}/include/*" + else + echo "%{_prefix}/${i}/musl" + fi done ) @@ -111,8 +111,14 @@ for i in %{long_targets}; do else # Set up for crosscompiling... if [ "`basename %{__cc}`" = "clang" ]; then - export CROSS_COMPILE="${i}-" - export CC="%{__cc} -target ${i}" + # FIXME remove once Clang supports RISC-V properly + if echo $i |grep -q riscv; then + export CROSS_COMPILE="${i}-" + export CC="${i}-gcc" + else + export CROSS_COMPILE="${i}-" + export CC="%{__cc} -target ${i}" + fi else export CROSS_COMPILE="${i}-" export CC="${i}-gcc"
Not Available
benbullard79 [@T] cox.net | These look ready to move, need to get them out of way of Qt/KF | 1629d 20hrs |
benbullard79 [@T] cox.net | No Comment. | 1629d 20hrs |
benbullard79 [@T] cox.net | No Comment. | 1629d 19hrs |
benbullard79 [@T] cox.net | No Comment. | 1629d 19hrs |