Subject: Re: src/distrib/sets question
To: None <thorpej@wasabisystems.com>
From: Matt Fredette <fredette@theory.lcs.mit.edu>
List: tech-install
Date: 03/20/2002 22:42:42
> Ah, crtbegin/crtend should be listed in comp.elf or something, as
> should crtbeginS/crtendS (they're only used when a library or program
> is created).

Any objections to the following patch?

-- 
Matt Fredette

[snip]
Index: src/distrib/sets/makeflist
===================================================================
RCS file: /cvsroot/basesrc/distrib/sets/makeflist,v
retrieving revision 1.42
diff -u -r1.42 makeflist
--- src/distrib/sets/makeflist	2002/02/27 10:42:55	1.42
+++ src/distrib/sets/makeflist	2002/03/21 03:39:27
@@ -77,12 +77,15 @@
 # Determine shlib type.
 if [ "$object_fmt" = "ELF" ]; then
 	shlib=elf
-elif [ "$machine_cpu" = "sh3" ]; then
-	shlib=
 else
 	shlib=aout
 fi
 
+# Turn off shlibs for some ports.
+if [ "$machine_cpu" = "sh3" -o "$machine_arch" = "m68000" ]; then
+	shlib=no
+fi
+
 # Turn off lintlibs for some ports.
 lintlibs=
 if [ "$machine" = "sparc64" -o "$machine_cpu" = "sh3" -o \
@@ -98,8 +101,11 @@
 	fi
 	if [ -f $setd/lists/$setname/md.${machine} ]; then
 		cat $setd/lists/$setname/md.${machine}
+	fi
+	if [ -f $setd/lists/$setname/$setname.${object_fmt} ]; then
+		cat $setd/lists/$setname/$setname.${object_fmt}
 	fi
-	if [ "$shlib" != "" ]; then
+	if [ "$shlib" != "no" ]; then
 		if [ -f $setd/lists/$setname/shl.mi ]; then
 			cat $setd/lists/$setname/shl.mi
 		fi
Index: src/distrib/sets/lists/comp/shl.elf
===================================================================
RCS file: /cvsroot/basesrc/distrib/sets/lists/comp/shl.elf,v
retrieving revision 1.26
diff -u -r1.26 shl.elf
--- src/distrib/sets/lists/comp/shl.elf	2002/01/01 11:55:25	1.26
+++ src/distrib/sets/lists/comp/shl.elf	2002/03/21 03:39:31
@@ -1,8 +1,4 @@
 # $NetBSD: shl.elf,v 1.26 2002/01/01 11:55:25 augustss Exp $
-./usr/lib/crtbegin.o		comp-c-lib
-./usr/lib/crtbeginS.o		comp-c-lib
-./usr/lib/crtend.o		comp-c-lib
-./usr/lib/crtendS.o		comp-c-lib
 ./usr/lib/libasn1.so		comp-c-lib
 ./usr/lib/libbz2.so		comp-c-lib
 ./usr/lib/libc.so		comp-c-lib
--- /dev/null	Tue Mar 12 14:00:23 2002
+++ src/distrib/sets/lists/comp/comp.elf	Wed Mar 20 16:34:33 2002
@@ -0,0 +1,5 @@
+# $NetBSD$
+./usr/lib/crtbegin.o		comp-c-lib
+./usr/lib/crtbeginS.o		comp-c-lib
+./usr/lib/crtend.o		comp-c-lib
+./usr/lib/crtendS.o		comp-c-lib
[snip]