CVS commit: pkgsrc/bootstrap

["Jonathan Schleifer" <js%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   js
Date:           Sat Dec  5 16:50:53 UTC 2020

Modified Files:
        pkgsrc/bootstrap: bootstrap

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.295 -r1.296 pkgsrc/bootstrap/bootstrap

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/bootstrap/bootstrap
diff -u pkgsrc/bootstrap/bootstrap:1.295 pkgsrc/bootstrap/bootstrap:1.296
--- pkgsrc/bootstrap/bootstrap:1.295    Wed Oct 28 16:52:43 2020
+++ pkgsrc/bootstrap/bootstrap  Sat Dec  5 16:50:52 2020
@@ -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 @@ Linux)
        # 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
        ;;