Date: Sun, 08 Sep 2013 21:59:55 +0200 From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@des.no> To: Konstantin Belousov <kostikbel@gmail.com> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r255385 - in head/etc: . etc.amd64 Message-ID: <86ioybozic.fsf@nine.des.no> In-Reply-To: <20130908143854.GA41229@kib.kiev.ua> (Konstantin Belousov's message of "Sun, 8 Sep 2013 17:38:54 %2B0300") References: <201309080946.r889kNSX050568@svn.freebsd.org> <20130908110410.GZ41229@kib.kiev.ua> <86zjrnedp5.fsf@nine.des.no> <20130908143854.GA41229@kib.kiev.ua>
next in thread | previous in thread | raw e-mail | index | archive | help
How about this, which eliminates the unneeded mappings and installs
libmap32.conf on powerpc64 as well?
Index: etc/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- etc/Makefile (revision 255393)
+++ etc/Makefile (working copy)
@@ -50,8 +50,8 @@
syslog.conf \
termcap.small
=20
-.if ${MACHINE} =3D=3D "amd64"
-BIN1+=3D etc.${MACHINE}/libmap32.conf
+.if ${TARGET_ARCH} =3D=3D "amd64" || ${TARGET_ARCH} =3D=3D "powerpc64"
+BIN1+=3D libmap32.conf
.endif
=20
.if exists(${.CURDIR}/etc.${MACHINE}/ttys)
Index: etc/libmap32.conf
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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
--=20
Dag-Erling Sm=C3=B8rgrav - des@des.no
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86ioybozic.fsf>