pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: pkg/31955
The following reply was made to PR pkg/31955; it has been noted by GNATS.
From: Peter Bex <Peter.Bex%xs4all.nl@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc:
Subject: Re: pkg/31955
Date: Fri, 12 Jan 2007 21:01:02 +0100
--r7U+bLA8boMOj+mD
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
The problem with this approach is that you'd have to create identical
files for every alias for an architecture uname can output on any
system supported by pkgsrc, resulting in a big number of files that
are all the same.
A better approach would be to replace known arch strings in the uname
output, like lib9/Makefile already does for all x86 architectures.
It replaces i.86 by 386. We could do the same for 'macppc' -> 'ppc'
and also 'amd64' -> 'x86_64', since it doesn't build on amd64 either.
See the attached patch for concrete example.
--r7U+bLA8boMOj+mD
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="9base.diff"
Index: patches/patch-ao
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/9base/patches/patch-ao,v
retrieving revision 1.2
diff -u -r1.2 patch-ao
--- patches/patch-ao 6 Dec 2005 18:50:36 -0000 1.2
+++ patches/patch-ao 12 Jan 2007 20:00:36 -0000
@@ -1,7 +1,21 @@
$NetBSD: patch-ao,v 1.2 2005/12/06 18:50:36 rillig Exp $
---- lib9/Makefile.orig 2005-11-14 10:22:41.000000000 +0000
+--- lib9/Makefile.orig 2005-11-14 11:22:41.000000000 +0100
+++ lib9/Makefile
+@@ -2,11 +2,11 @@
+
+ # this works in gnu make
+ SYSNAME:=${shell uname}
+-OBJTYPE:=${shell uname -m | sed 's;i.86;386;; s;/.*;;; s; ;;g'}
++OBJTYPE:=${shell uname -m | sed 's;i.86;386;; s;macppc;ppc;;
s;amd64;x86_64;; s;/.*;;; s; ;;g'}
+
+ # this works in bsd make
+ SYSNAME!=uname
+-OBJTYPE!=uname -m | sed 's;i.86;386;; s;/.*;;; s; ;;g'
++OBJTYPE!=uname -m | sed 's;i.86;386;; s;macppc;ppc;; s;amd64;x86_64;;
s;/.*;;; s; ;;g'
+
+ # the gnu rules will mess up bsd but not vice versa,
+ # hence the gnu rules come first.
@@ -189,9 +189,8 @@ all: ${LIB}
@echo built lib9
--r7U+bLA8boMOj+mD--
Home |
Main Index |
Thread Index |
Old Index