pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/bootstrap bootstrap: Prefer native on Elbrus 2000



details:   https://anonhg.NetBSD.org/pkgsrc/rev/22be1962787d
branches:  trunk
changeset: 443028:22be1962787d
user:      js <js%pkgsrc.org@localhost>
date:      Sat Dec 05 16:50:52 2020 +0000

description:
bootstrap: Prefer native on Elbrus 2000

A lot of patches for Elbrus 2000 have not been upstreamed, which results
in important packages such as openssl failing to build, while the native
one is quite up-to-date and working.

Tested building devel/fossil with this, which results in a fully working
binary.

diffstat:

 bootstrap/bootstrap |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (23 lines):

diff -r 75442a4707fc -r 22be1962787d bootstrap/bootstrap
--- a/bootstrap/bootstrap       Sat Dec 05 16:24:02 2020 +0000
+++ b/bootstrap/bootstrap       Sat Dec 05 16:50:52 2020 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.295 2020/10/28 16:52:43 maya Exp $
+# $NetBSD: bootstrap,v 1.296 2020/12/05 16:50:52 js Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -1081,7 +1081,10 @@
        # like yum or apt that can leak into pkgsrc and cause issues as they
        # age, undergo ABI changes, or get added/removed behind our backs.
        # Let pkgsrc maintain all dependencies to avoid these problems.
-       if [ -z "$prefer_pkgsrc" ] && [ "$prefer_native" != "yes" ]; then
+       # The exception here is Elbrus 2000, for which a lot of patches have
+       # not been upstreamed, so that it is better to use native.
+       if [ -z "$prefer_pkgsrc" ] && [ "$prefer_native" != "yes" ] && \
+           [ "$machine_arch" != "e2k" ]; then
                prefer_pkgsrc="yes"
        fi
        ;;



Home | Main Index | Thread Index | Old Index