diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template index a950e073038..3bbf2de1d2b 100644 --- a/srcpkgs/cross-powerpc64le-linux-gnu/template +++ b/srcpkgs/cross-powerpc64le-linux-gnu/template @@ -1,7 +1,7 @@ # Template file for 'cross-powerpc64le-linux-gnu' _binutils_version=2.32 _gcc_version=8.2.0 -_glibc_version=2.28 +_glibc_version=2.29 _linux_version=4.19 _triplet="powerpc64le-linux-gnu" @@ -21,7 +21,7 @@ distfiles=" ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 196c3c04ba2613f893283977e6011b2345d1cd1af9abeac58e916b1aab3e0080 - b1900051afad76f7a4f73e71413df4826dce085ef8ddb785a945b66d7d513082 + f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" lib32disabled=yes @@ -29,8 +29,8 @@ nocross=yes nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="perl flex gcc-ada libada-devel" -makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel" +hostmakedepends="flex gcc-ada libada-devel perl python3" +makedepends="isl15-devel libmpc-devel zlib-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a" depends="${pkgname}-libc-${version}_${revision}" @@ -141,9 +141,11 @@ _glibc_headers() { [ -f ${wrksrc}/.glibc_headers_done ] && return 0 cd ${wrksrc}/glibc-${_glibc_version} - for f in ${XBPS_SRCPKGDIR}/glibc/patches/*.patch; do - _apply_patch -p1 "$f" - done + if [ -d "${XBPS_SRCPKGDIR}/glibc/patches" ]; then + for f in ${XBPS_SRCPKGDIR}/glibc/patches/*.patch; do + _apply_patch -p1 "$f" + done + fi cd ${wrksrc} msg_normal "Building cross glibc headers\n" @@ -189,7 +191,7 @@ _glibc_build() { echo "libc_cv_forced_unwind=yes" > config.cache echo "libc_cv_c_cleanup=yes" >> config.cache - export CC="${_triplet}-gcc" LD="${_triplet}-ld" \ + export CC="${_triplet}-gcc" CXX="${_triplet}-g++" LD="${_triplet}-ld" \ AS="${_triplet}-as" CPP="${_triplet}-cpp" \ NM="${_triplet}-nm" export CFLAGS="-O2 -pipe -Wno-error" @@ -262,7 +264,7 @@ _gcc_build() { _args+=" --disable-vtable-verify" _args+=" --disable-sjlj-exceptions" - CC="gcc" CFLAGS="-O2 -pipe" \ + CC="gcc" CXX="g++" CFLAGS="-O2 -pipe" \ ../gcc-${_gcc_version}/configure ${_args} make ${makejobs}