Date: Thu, 16 Jul 1998 09:44:57 -0600 From: Warner Losh <imp@village.org> To: current@FreeBSD.ORG Subject: Proposed fix for ___error problem. Message-ID: <199807161544.JAA25102@harmony.village.org>
next in thread | raw e-mail | index | archive | help
OK. I have found that a -current from approx Oct exhibits this error
when I do a 'make buildworld -m /usr/src/share/mk'. So I got into
digging into this problem and discovered that I can fix it and the
MACHINE_ARCH problem fairly well for legacy systems.
Enclosed please find a patch to do both of these things. First, if
MACHINE_ARCH isn't defined, I define it to be ${MACHINE} in
bsd.own.mk. Next, I've moved the format selection from bsd.lib.mk to
bsd.own.mk because it is defined too late to give ${LIBDIR} a
meaningful value on aout machine (it should be /usr/lib/aout, but
instead winds up defaulting to /usr/lib).
I've tested these patches on my Jul 4 current machine as well as my
Octish current machine. If people could attempt to do a make
buildworld like I quoted above (substituting the path of the source
tree for /usr/src) and let me know if they encounter problems with
this on their machine. I'm most interested in 2.2.x machines since I
don't have one of those I can easily do a buildworld on to test this
out.
Also, can people please comment on the changes themselves?
Warner
Index: bsd.lib.mk
===================================================================
RCS file: /home/imp/FreeBSD/CVS/src/share/mk/bsd.lib.mk,v
retrieving revision 1.74
diff -u -r1.74 bsd.lib.mk
--- bsd.lib.mk 1998/06/05 18:38:54 1.74
+++ bsd.lib.mk 1998/07/16 15:37:59
@@ -6,13 +6,6 @@
.include "${.CURDIR}/../Makefile.inc"
.endif
-# Default executable format
-.if ${MACHINE} == "alpha"
-BINFORMAT?= elf
-.else
-BINFORMAT?= aout
-.endif
-
.if exists(${.CURDIR}/shlib_version)
SHLIB_MAJOR != . ${.CURDIR}/shlib_version ; echo $$major
.if ${BINFORMAT} == aout
Index: bsd.own.mk
===================================================================
RCS file: /home/imp/FreeBSD/CVS/src/share/mk/bsd.own.mk,v
retrieving revision 1.14
diff -u -r1.14 bsd.own.mk
--- bsd.own.mk 1998/05/26 20:12:54 1.14
+++ bsd.own.mk 1998/07/16 15:38:03
@@ -122,6 +122,15 @@
BINMODE?= 555
NOBINMODE?= 444
+MACHINE_ARCH?=${MACHINE}
+
+# Default executable format
+.if ${MACHINE} == "alpha"
+BINFORMAT?= elf
+.else
+BINFORMAT?= aout
+.endif
+
.if ${BINFORMAT} == aout
LIBDIR?= /usr/lib/aout
.else
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199807161544.JAA25102>