Index: build-cc ================================================================== --- build-cc +++ build-cc @@ -67,10 +67,11 @@ armel-generic-linux-uclibc mipsel-generic-linux-uclibc mips-generic-linux-musl x86_64-generic-linux-musl x86_64-generic-linux-gnu + powerpc-generic-linux-gnu ) untested_platforms=( powerpc-generic-linux-gnu powerpc-generic-linux-uclibc Index: scripts/common ================================================================== --- scripts/common +++ scripts/common @@ -62,10 +62,11 @@ function multilib () { local arch local mode local archs host libdir cflags local addprefix + local hostCode mode='cflags' if [ "$1" = '--libdir' ]; then mode='libdir' @@ -98,17 +99,17 @@ if [ -z "${arch}" ]; then mode='list' else cflags="" if [ "${arch}" != '_' ]; then - cflags="${arch}" + cflags="$(echo "${arch}" | sed 's@_@ @g')" fi fi case "${mode}" in list) - archs="$(${CC} -print-multi-lib | grep -v '^[^;]*/' | sed 's/^.*;//;s/^@/-/;s@^ *$@_@')" + archs="$(${CC} -print-multi-lib | grep -v '^[^;]*/' | sed 's/^.*;//;s/@/ -/g;s@^ *$@_@;s@^ *@@;s@ *$@@;s@ *@_@g')" if [ -z "${archs}" ]; then archs='_' fi echo "${archs}" @@ -132,10 +133,11 @@ if [ "${addprefix}" = '0' ]; then libdir="$(echo "${libdir}" | sed 's@^'"${PREFIX}"'/@/@')" fi echo "${libdir}" + echo "${libdir}" >> /tmp/libdir.log return 0 ;; host) if [ "${arch}" = '_' ]; then @@ -149,11 +151,12 @@ ;; -m64) host="$(echo "${CCNAME}" | sed 's@^i.86-@x86_64-@;s@-x32-@-@;s@^x32-@x86_64-@;s@^sparc-@sparcv9-@')" ;; *) - host="${CCNAME}.${arch}" + hostCode="$(echo "${arch}" | openssl dgst -md5 | sed 's@.*= *@@')" + host="$(echo "${CCNAME}" | sed 's@-generic-@-md5'"${hostCode}"'-@g')" ;; esac echo "${host}" @@ -179,6 +182,9 @@ arch=sparc ;; i?86) arch=i386 ;; + powerpc*) + arch=powerpc + ;; esac Index: scripts/post/02-glibc ================================================================== --- scripts/post/02-glibc +++ scripts/post/02-glibc @@ -1,10 +1,10 @@ #! /bin/bash # URLs and versions if [ -z "${GLIBC_VERS}" ]; then - GLIBC_VERS='2.22' + GLIBC_VERS='2.23' fi GLIBC_URL="http://ftp.gnu.org/gnu/glibc/glibc-${GLIBC_VERS}.tar.gz" GLIBC_TARBALL="src/glibc-${GLIBC_VERS}.tar.gz" GLIBC_DIR="glibc-${GLIBC_VERS}"