On 09/09/2013 07:02, Dag-Erling Smørgrav wrote:
Author: des
Date: Mon Sep 9 06:02:30 2013
New Revision: 255413
URL: http://svnweb.freebsd.org/changeset/base/255413
Log:
Remove unneeded mappings from libmap32.conf. Move it up one level and
install it on powerpc64 in addition to amd64.
Reviewed by: kib
Approved by: re (blanket)
Added:
head/etc/libmap32.conf
- copied, changed from r255393, head/etc/etc.amd64/libmap32.conf
Deleted:
head/etc/etc.amd64/libmap32.conf
Modified:
head/etc/Makefile
Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile Mon Sep 9 05:01:18 2013 (r255412)
+++ head/etc/Makefile Mon Sep 9 06:02:30 2013 (r255413)
@@ -50,8 +50,8 @@ BIN1= crontab \
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)
Hi des,
This appears to break "make distribution" (in this example, called as
part of ezjail-admin update -i) :
===> libheimipcs (install)
cd /usr/src/libexec/rtld-elf; PROG=ld-elf32.so.1 MACHINE=i386
MACHINE_ARCH=i386 MACHINE_CPU="i686 mmx sse sse2"
MAKEOBJDIRPREFIX=/usr/obj/lib32 _SHLIBDIRPREFIX=/usr/obj/usr/src/lib32
VERSION="FreeBSD 10.0-CURRENT amd64 1000054"
PATH=/usr/obj/usr/src/tmp/legacy/usr/sbin:/usr/obj/usr/src/tmp/legacy/usr/bin:/usr/obj/usr/src/tmp/legacy/usr/games:/usr/obj/usr/src/tmp/legacy/bin:/usr/obj/usr/src/tmp/usr/sbin:/usr/obj/usr/src/tmp/usr/bin:/usr/obj/usr/src/tmp/usr/games:/usr/obj/usr/src/tmp/legacy/usr/sbin:/usr/obj/usr/src/tmp/legacy/usr/bin:/usr/obj/usr/src/tmp/legacy/usr/games:/usr/obj/usr/src/tmp/legacy/bin:/usr/obj/usr/src/tmp/usr/sbin:/usr/obj/usr/src/tmp/usr/bin:/usr/obj/usr/src/tmp/usr/games:/tmp/install.soOoCtKH
LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 LIBPRIVATEDIR=/usr/lib32/private
COMPILER_TYPE=clang make AS="as --32" LD="ld -m elf_i386_fbsd -Y
P,/usr/obj/usr/src/lib32/usr/lib32" CC="cc -m32 -march=i686 -mmmx -msse
-msse2 -DCOMPAT_32BIT -isystem /usr/obj/usr/src/lib32/usr/include/
-L/usr/obj/usr/src/lib32/usr/lib32 -B/usr/obj/usr/src/lib32/usr/lib32"
CXX="c++ -m32 -march=i686 -mmmx -msse -msse2 -DCOMPAT_32BIT -isystem
/usr/obj/usr/src/lib32/usr/include/ -L/usr/obj/usr/src/lib32/usr/lib32
-B/usr/obj/usr/src/lib32/usr/lib32" -DCOMPAT_32BIT -DLIBRARIES_ONLY
-DNO_CPU_CFLAGS -DNO_CTF -DNO_LINT -DWITHOUT_BIND -DWITHOUT_MAN
-DWITHOUT_INFO -DWITHOUT_HTML -DNO_INCS install
install -s -o root -g wheel -m 555 -C -b -fschg -S ld-elf32.so.1
/usr/jails/fulljail/libexec/ld-elf32.so.1
/usr/jails/fulljail/usr/libexec/ld-elf32.so.1 -> /libexec/ld-elf32.so.1
cd /usr/src/usr.bin/ldd; PROG=ldd32 MACHINE=i386 MACHINE_ARCH=i386
MACHINE_CPU="i686 mmx sse sse2" MAKEOBJDIRPREFIX=/usr/obj/lib32
_SHLIBDIRPREFIX=/usr/obj/usr/src/lib32 VERSION="FreeBSD 10.0-CURRENT
amd64 1000054"
PATH=/usr/obj/usr/src/tmp/legacy/usr/sbin:/usr/obj/usr/src/tmp/legacy/usr/bin:/usr/obj/usr/src/tmp/legacy/usr/games:/usr/obj/usr/src/tmp/legacy/bin:/usr/obj/usr/src/tmp/usr/sbin:/usr/obj/usr/src/tmp/usr/bin:/usr/obj/usr/src/tmp/usr/games:/usr/obj/usr/src/tmp/legacy/usr/sbin:/usr/obj/usr/src/tmp/legacy/usr/bin:/usr/obj/usr/src/tmp/legacy/usr/games:/usr/obj/usr/src/tmp/legacy/bin:/usr/obj/usr/src/tmp/usr/sbin:/usr/obj/usr/src/tmp/usr/bin:/usr/obj/usr/src/tmp/usr/games:/tmp/install.soOoCtKH
LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 LIBPRIVATEDIR=/usr/lib32/private
COMPILER_TYPE=clang make AS="as --32" LD="ld -m elf_i386_fbsd -Y
P,/usr/obj/usr/src/lib32/usr/lib32" CC="cc -m32 -march=i686 -mmmx -msse
-msse2 -DCOMPAT_32BIT -isystem /usr/obj/usr/src/lib32/usr/include/
-L/usr/obj/usr/src/lib32/usr/lib32 -B/usr/obj/usr/src/lib32/usr/lib32"
CXX="c++ -m32 -march=i686 -mmmx -msse -msse2 -DCOMPAT_32BIT -isystem
/usr/obj/usr/src/lib32/usr/include/ -L/usr/obj/usr/src/lib32/usr/lib32
-B/usr/obj/usr/src/lib32/usr/lib32" -DCOMPAT_32BIT -DLIBRARIES_ONLY
-DNO_CPU_CFLAGS -DNO_CTF -DNO_LINT -DWITHOUT_BIND -DWITHOUT_MAN
-DWITHOUT_INFO -DWITHOUT_HTML -DNO_INCS install
install -s -o root -g wheel -m 555 ldd32 /usr/jails/fulljail/usr/bin/ldd32
make: "/usr/src/etc/Makefile" line 53: Malformed conditional
(${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64")
make: Fatal errors encountered -- cannot continue
make: stopped in /usr/src/etc
Error: The command 'make distribution' failed.
Refer to the error report(s) above.
└[~]> uname -a
FreeBSD fbsd10-dev.localdomain 10.0-CURRENT FreeBSD 10.0-CURRENT #0
r255414M: Mon Sep 9 15:46:28 BST 2013
toor@fbsd10-dev.localdomain:/usr/obj/usr/src/sys/GENERIC amd64
Regards,
Jase.
--
Jase Thew
j...@freebsd.org
FreeBSD Ports Committer
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
