diff --git a/srcpkgs/cross-powerpc-linux-musl/files/libssp-musl.patch b/srcpkgs/cross-powerpc-linux-musl/files/libssp-musl.patch new file mode 120000 index 00000000000..37a7489360f --- /dev/null +++ b/srcpkgs/cross-powerpc-linux-musl/files/libssp-musl.patch @@ -0,0 +1 @@ +../../gcc/files/libssp-musl.patch \ No newline at end of file diff --git a/srcpkgs/cross-powerpc-linux-musl/files/no-stack_chk_fail_local.patch b/srcpkgs/cross-powerpc-linux-musl/files/no-stack_chk_fail_local.patch deleted file mode 120000 index 730486bacb5..00000000000 --- a/srcpkgs/cross-powerpc-linux-musl/files/no-stack_chk_fail_local.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/no-stack_chk_fail_local.patch \ No newline at end of file diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template index c2fee07d5a0..b35fafc6630 100644 --- a/srcpkgs/cross-powerpc-linux-musl/template +++ b/srcpkgs/cross-powerpc-linux-musl/template @@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.33 -revision=1 +revision=2 short_desc="Cross toolchain for PowerPC (musl)" maintainer="Thomas Batten " @@ -91,10 +91,10 @@ _gcc_bootstrap() { cd ${wrksrc}/gcc-${_gcc_version} _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch _apply_patch -p0 ${FILESDIR}/musl-ada.patch - _apply_patch -p0 ${FILESDIR}/no-stack_chk_fail_local.patch _apply_patch -p0 ${FILESDIR}/0010-ldbl128-config.patch _apply_patch -p0 ${FILESDIR}/libgcc-ibm128-no-tag.patch _apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch + _apply_patch -p1 ${FILESDIR}/libssp-musl.patch _apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch _apply_patch -p0 ${FILESDIR}/gccgo-musl.patch @@ -197,9 +197,9 @@ _gcc_build() { [ ! -d gcc-build ] && mkdir gcc-build cd gcc-build - _args="--prefix=/usr" - _args+=" --target=${_triplet}" + _args="--target=${_triplet}" _args+=" --with-sysroot=${_sysroot}" + _args+=" --prefix=/usr" _args+=" --libexecdir=/usr/lib" _args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto" _args+=" --enable-lto" @@ -212,6 +212,7 @@ _gcc_build() { _args+=" --disable-libquadmath" _args+=" --disable-libmpx" _args+=" --disable-libmudflap" + _args+=" --enable-libssp" _args+=" --enable-shared" _args+=" --disable-symvers" _args+=" libat_cv_have_ifunc=no"