svn commit: r255385 - in head/etc: . etc.amd64

Dag-Erling Smørgrav des at des.no
Sun Sep 8 19:59:54 UTC 2013


How about this, which eliminates the unneeded mappings and installs
libmap32.conf on powerpc64 as well?

Index: etc/Makefile
===================================================================
--- etc/Makefile	(revision 255393)
+++ etc/Makefile	(working copy)
@@ -50,8 +50,8 @@
 	syslog.conf \
 	termcap.small
 
-.if ${MACHINE} == "amd64"
-BIN1+=	etc.${MACHINE}/libmap32.conf
+.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
+BIN1+=	libmap32.conf
 .endif
 
 .if exists(${.CURDIR}/etc.${MACHINE}/ttys)
Index: etc/libmap32.conf
===================================================================
--- etc/libmap32.conf	(revision 255393)
+++ etc/libmap32.conf	(working copy)
@@ -1,4 +1,2 @@
 # $FreeBSD$
-/lib			/lib32
-/usr/lib		/usr/lib32
 /usr/lib/private	/usr/lib32/private
Index: etc/etc.amd64/libmap32.conf
===================================================================
--- etc/etc.amd64/libmap32.conf	(revision 255393)
+++ etc/etc.amd64/libmap32.conf	(working copy)
@@ -1,4 +0,0 @@
-# $FreeBSD$
-/lib			/lib32
-/usr/lib		/usr/lib32
-/usr/lib/private	/usr/lib32/private

We should have a knob that says "this arch supports 32-bit emulation" so
we don't have to edit a million files when somebody implements 32-bit
emulation on a new arch (such as mips64 or arm64).

DES
-- 
Dag-Erling Smørgrav - des at des.no


More information about the svn-src-all mailing list