From owner-p4-projects@FreeBSD.ORG Fri Mar 19 16:09:43 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 30F1716A4D0; Fri, 19 Mar 2004 16:09:43 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0B7E816A4CE for ; Fri, 19 Mar 2004 16:09:43 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0037443D2D for ; Fri, 19 Mar 2004 16:09:42 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2K09gGe017811 for ; Fri, 19 Mar 2004 16:09:42 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2K09fYs017808 for perforce@freebsd.org; Fri, 19 Mar 2004 16:09:41 -0800 (PST) (envelope-from peter@freebsd.org) Date: Fri, 19 Mar 2004 16:09:41 -0800 (PST) Message-Id: <200403200009.i2K09fYs017808@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49316 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2004 00:09:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=49316 Change 49316 by peter@peter_overcee on 2004/03/19 16:08:49 back out to vendor in preperation for doing it a different way Affected files ... .. //depot/projects/hammer/Makefile.inc1#45 edit .. //depot/projects/hammer/lib/Makefile#33 edit .. //depot/projects/hammer/lib/libc/Makefile#14 edit .. //depot/projects/hammer/lib/libc/alpha/gen/Makefile.inc#5 edit .. //depot/projects/hammer/lib/libc/compat-43/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/db/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/db/btree/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/db/db/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/db/hash/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/db/man/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/db/mpool/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/db/recno/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/gdtoa/Makefile.inc#6 edit .. //depot/projects/hammer/lib/libc/gen/Makefile.inc#12 edit .. //depot/projects/hammer/lib/libc/gmon/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/locale/Makefile.inc#17 edit .. //depot/projects/hammer/lib/libc/net/Makefile.inc#8 edit .. //depot/projects/hammer/lib/libc/nls/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/posix1e/Makefile.inc#8 edit .. //depot/projects/hammer/lib/libc/quad/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/regex/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/regex/grot/Makefile#3 edit .. //depot/projects/hammer/lib/libc/rpc/Makefile.inc#7 edit .. //depot/projects/hammer/lib/libc/sparc64/fpu/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/sparc64/sys/Makefile.inc#5 edit .. //depot/projects/hammer/lib/libc/stdio/Makefile.inc#11 edit .. //depot/projects/hammer/lib/libc/stdlib/Makefile.inc#11 edit .. //depot/projects/hammer/lib/libc/stdtime/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/string/Makefile.inc#8 edit .. //depot/projects/hammer/lib/libc/uuid/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/xdr/Makefile.inc#5 edit .. //depot/projects/hammer/lib/libc/yp/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc32/Makefile#2 delete .. //depot/projects/hammer/libexec/Makefile#22 edit .. //depot/projects/hammer/libexec/rtld-elf/Makefile#9 edit .. //depot/projects/hammer/libexec/rtld-elf32/Makefile#4 delete .. //depot/projects/hammer/share/mk/bsd.lib.mk#17 edit Differences ... ==== //depot/projects/hammer/Makefile.inc1#45 (text+ko) ==== @@ -256,8 +256,8 @@ mkdir -p ${WORLDTMP}/legacy/${_dir} .endfor .for _dir in \ - lib lib32 usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \ - usr/lib32 usr/libexec usr/share/misc usr/share/bsnmp/defs usr/share/bsnmp/mibs + lib usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \ + usr/libexec usr/share/misc usr/share/bsnmp/defs usr/share/bsnmp/mibs mkdir -p ${WORLDTMP}/${_dir} .endfor mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ ==== //depot/projects/hammer/lib/Makefile#33 (text+ko) ==== @@ -32,7 +32,7 @@ ${_libngatm} libopie libpam libpanel libpcap \ ${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} libufs libugidfw \ - ${_libusbhid} ${_libvgl} libwrap libxpg4 liby libz ${_libc32} + ${_libusbhid} ${_libvgl} libwrap libxpg4 liby libz .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) _csu=csu/${MACHINE_ARCH}-elf @@ -49,11 +49,6 @@ .endif .endif -# build libc_pic.a for rtld-elf-32 on amd64 -.if ${MACHINE_ARCH} == "amd64" -_libc32= libc32 -.endif - .if !defined(NOATM) _libatm= libatm _libngatm= libngatm ==== //depot/projects/hammer/lib/libc/Makefile#14 (text+ko) ==== @@ -10,15 +10,11 @@ LIB=c # If you bump SHLIB_MAJOR, remove the kluge from gen/gethostname.c. # If you bump SHLIB_MAJOR, see standards/55112. -.if !defined(${NOSHLIB}) SHLIB_MAJOR= 5 SHLIBDIR?= /lib -.endif WARNS?= 2 -TARGET?=${MACHINE_ARCH} -LIBCSRC?=${.CURDIR} -CFLAGS+=-I${LIBCSRC}/include -I${LIBCSRC}/../../include -CFLAGS+=-I${LIBCSRC}/${TARGET} +CFLAGS+=-I${.CURDIR}/include -I${.CURDIR}/../../include +CFLAGS+=-I${.CURDIR}/${MACHINE_ARCH} CLEANFILES+=tags INSTALL_PIC_ARCHIVE= yes PRECIOUSLIB= yes @@ -34,36 +30,36 @@ # # If there is a machine dependent makefile, use it: # -.if exists(${LIBCSRC}/${TARGET}/Makefile.inc) -.include "${LIBCSRC}/${TARGET}/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_ARCH}/Makefile.inc) +.include "${.CURDIR}/${MACHINE_ARCH}/Makefile.inc" .endif -.include "${LIBCSRC}/db/Makefile.inc" -.include "${LIBCSRC}/compat-43/Makefile.inc" -.include "${LIBCSRC}/gdtoa/Makefile.inc" -.include "${LIBCSRC}/gen/Makefile.inc" -.if ${TARGET} != "powerpc" -.include "${LIBCSRC}/gmon/Makefile.inc" +.include "${.CURDIR}/db/Makefile.inc" +.include "${.CURDIR}/compat-43/Makefile.inc" +.include "${.CURDIR}/gdtoa/Makefile.inc" +.include "${.CURDIR}/gen/Makefile.inc" +.if ${MACHINE_ARCH} != "powerpc" +.include "${.CURDIR}/gmon/Makefile.inc" .endif -.include "${LIBCSRC}/locale/Makefile.inc" -.include "${LIBCSRC}/net/Makefile.inc" -.include "${LIBCSRC}/nls/Makefile.inc" -.include "${LIBCSRC}/posix1e/Makefile.inc" +.include "${.CURDIR}/locale/Makefile.inc" +.include "${.CURDIR}/net/Makefile.inc" +.include "${.CURDIR}/nls/Makefile.inc" +.include "${.CURDIR}/posix1e/Makefile.inc" .if !defined(NO_QUAD) -.include "${LIBCSRC}/quad/Makefile.inc" +.include "${.CURDIR}/quad/Makefile.inc" .endif -.include "${LIBCSRC}/regex/Makefile.inc" -.include "${LIBCSRC}/stdio/Makefile.inc" -.include "${LIBCSRC}/stdlib/Makefile.inc" -.include "${LIBCSRC}/stdtime/Makefile.inc" -.include "${LIBCSRC}/string/Makefile.inc" -.include "${LIBCSRC}/sys/Makefile.inc" -.include "${LIBCSRC}/rpc/Makefile.inc" -.include "${LIBCSRC}/uuid/Makefile.inc" -.include "${LIBCSRC}/xdr/Makefile.inc" +.include "${.CURDIR}/regex/Makefile.inc" +.include "${.CURDIR}/stdio/Makefile.inc" +.include "${.CURDIR}/stdlib/Makefile.inc" +.include "${.CURDIR}/stdtime/Makefile.inc" +.include "${.CURDIR}/string/Makefile.inc" +.include "${.CURDIR}/sys/Makefile.inc" +.include "${.CURDIR}/rpc/Makefile.inc" +.include "${.CURDIR}/uuid/Makefile.inc" +.include "${.CURDIR}/xdr/Makefile.inc" .if !defined(NO_YP_LIBC) CFLAGS+= -DYP -.include "${LIBCSRC}/yp/Makefile.inc" +.include "${.CURDIR}/yp/Makefile.inc" .endif .if !defined(NO_HESIOD_LIBC) CFLAGS+= -DHESIOD @@ -90,14 +86,14 @@ KSRCS= bcmp.c ffs.c ffsl.c fls.c flsl.c index.c mcount.c rindex.c \ strcat.c strcmp.c strcpy.c strlen.c strncpy.c -libkern: libkern.gen libkern.${TARGET} +libkern: libkern.gen libkern.${MACHINE_ARCH} libkern.gen: ${KQSRCS} ${KSRCS} - cp -p ${LIBCSRC}/quad/quad.h ${.ALLSRC} ${DESTDIR}/sys/libkern + cp -p ${.CURDIR}/quad/quad.h ${.ALLSRC} ${DESTDIR}/sys/libkern -libkern.${TARGET}:: ${KMSRCS} +libkern.${MACHINE_ARCH}:: ${KMSRCS} .if defined(KMSRCS) && !empty(KMSRCS) - cp -p ${.ALLSRC} ${DESTDIR}/sys/libkern/${TARGET} + cp -p ${.ALLSRC} ${DESTDIR}/sys/libkern/${MACHINE_ARCH} .endif .include ==== //depot/projects/hammer/lib/libc/alpha/gen/Makefile.inc#5 (text+ko) ==== @@ -14,34 +14,34 @@ CLEANFILES+= __remqu.S __remq.S __remlu.S __reml.S -__divqu.S: ${LIBCSRC}/alpha/gen/divrem.m4 +__divqu.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__divqu -DOP=div -DS=false -DWORDSIZE=64 \ ${.ALLSRC} > ${.TARGET} -__divq.S: ${LIBCSRC}/alpha/gen/divrem.m4 +__divq.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__divq -DOP=div -DS=true -DWORDSIZE=64 \ ${.ALLSRC} > ${.TARGET} -__divlu.S: ${LIBCSRC}/alpha/gen/divrem.m4 +__divlu.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__divlu -DOP=div -DS=false -DWORDSIZE=32 \ ${.ALLSRC} > ${.TARGET} -__divl.S: ${LIBCSRC}/alpha/gen/divrem.m4 +__divl.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__divl -DOP=div -DS=true -DWORDSIZE=32 \ ${.ALLSRC} > ${.TARGET} -__remqu.S: ${LIBCSRC}/alpha/gen/divrem.m4 +__remqu.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__remqu -DOP=rem -DS=false -DWORDSIZE=64 \ ${.ALLSRC} > ${.TARGET} -__remq.S: ${LIBCSRC}/alpha/gen/divrem.m4 +__remq.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__remq -DOP=rem -DS=true -DWORDSIZE=64 \ ${.ALLSRC} > ${.TARGET} -__remlu.S: ${LIBCSRC}/alpha/gen/divrem.m4 +__remlu.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__remlu -DOP=rem -DS=false -DWORDSIZE=32 \ ${.ALLSRC} > ${.TARGET} -__reml.S: ${LIBCSRC}/alpha/gen/divrem.m4 +__reml.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__reml -DOP=rem -DS=true -DWORDSIZE=32 \ ${.ALLSRC} > ${.TARGET} ==== //depot/projects/hammer/lib/libc/compat-43/Makefile.inc#4 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libc/compat-43/Makefile.inc,v 1.12 2002/11/18 09:50:54 ru Exp $ # compat-43 sources -.PATH: ${LIBCSRC}/${TARGET}/compat-43 ${LIBCSRC}/compat-43 +.PATH: ${.CURDIR}/${MACHINE_ARCH}/compat-43 ${.CURDIR}/compat-43 SRCS+= creat.c gethostid.c getwd.c killpg.c sethostid.c setpgrp.c \ setrgid.c setruid.c sigcompat.c ==== //depot/projects/hammer/lib/libc/db/Makefile.inc#4 (text+ko) ==== @@ -3,9 +3,9 @@ # CFLAGS+=-D__DBINTERFACE_PRIVATE -.include "${LIBCSRC}/db/btree/Makefile.inc" -.include "${LIBCSRC}/db/db/Makefile.inc" -.include "${LIBCSRC}/db/hash/Makefile.inc" -.include "${LIBCSRC}/db/man/Makefile.inc" -.include "${LIBCSRC}/db/mpool/Makefile.inc" -.include "${LIBCSRC}/db/recno/Makefile.inc" +.include "${.CURDIR}/db/btree/Makefile.inc" +.include "${.CURDIR}/db/db/Makefile.inc" +.include "${.CURDIR}/db/hash/Makefile.inc" +.include "${.CURDIR}/db/man/Makefile.inc" +.include "${.CURDIR}/db/mpool/Makefile.inc" +.include "${.CURDIR}/db/recno/Makefile.inc" ==== //depot/projects/hammer/lib/libc/db/btree/Makefile.inc#4 (text+ko) ==== @@ -1,7 +1,7 @@ # from @(#)Makefile.inc 8.2 (Berkeley) 7/14/94 # $FreeBSD: src/lib/libc/db/btree/Makefile.inc,v 1.4 2002/11/18 09:50:54 ru Exp $ -.PATH: ${LIBCSRC}/db/btree +.PATH: ${.CURDIR}/db/btree SRCS+= bt_close.c bt_conv.c bt_debug.c bt_delete.c bt_get.c bt_open.c \ bt_overflow.c bt_page.c bt_put.c bt_search.c bt_seq.c bt_split.c \ ==== //depot/projects/hammer/lib/libc/db/db/Makefile.inc#4 (text+ko) ==== @@ -1,6 +1,6 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD: src/lib/libc/db/db/Makefile.inc,v 1.4 2002/11/18 09:50:54 ru Exp $ -.PATH: ${LIBCSRC}/db/db +.PATH: ${.CURDIR}/db/db SRCS+= db.c ==== //depot/projects/hammer/lib/libc/db/hash/Makefile.inc#4 (text+ko) ==== @@ -1,7 +1,7 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD: src/lib/libc/db/hash/Makefile.inc,v 1.5 2002/11/18 09:50:54 ru Exp $ -.PATH: ${LIBCSRC}/db/hash +.PATH: ${.CURDIR}/db/hash SRCS+= hash.c hash_bigkey.c hash_buf.c hash_func.c hash_log2.c \ hash_page.c ndbm.c ==== //depot/projects/hammer/lib/libc/db/man/Makefile.inc#4 (text+ko) ==== @@ -1,7 +1,7 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD: src/lib/libc/db/man/Makefile.inc,v 1.11 2002/11/18 09:50:54 ru Exp $ -.PATH: ${LIBCSRC}/db/man +.PATH: ${.CURDIR}/db/man MAN+= btree.3 dbm.3 dbopen.3 hash.3 mpool.3 recno.3 ==== //depot/projects/hammer/lib/libc/db/mpool/Makefile.inc#4 (text+ko) ==== @@ -1,6 +1,6 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD: src/lib/libc/db/mpool/Makefile.inc,v 1.4 2002/11/18 09:50:55 ru Exp $ -.PATH: ${LIBCSRC}/db/mpool +.PATH: ${.CURDIR}/db/mpool SRCS+= mpool.c ==== //depot/projects/hammer/lib/libc/db/recno/Makefile.inc#4 (text+ko) ==== @@ -1,7 +1,7 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD: src/lib/libc/db/recno/Makefile.inc,v 1.4 2002/11/18 09:50:55 ru Exp $ -.PATH: ${LIBCSRC}/db/recno +.PATH: ${.CURDIR}/db/recno SRCS+= rec_close.c rec_delete.c rec_get.c rec_open.c rec_put.c rec_search.c \ rec_seq.c rec_utils.c ==== //depot/projects/hammer/lib/libc/gdtoa/Makefile.inc#6 (text+ko) ==== @@ -1,21 +1,21 @@ # $FreeBSD: src/lib/libc/gdtoa/Makefile.inc,v 1.6 2004/01/18 10:32:49 das Exp $ # netlib gdtoa sources -.PATH: ${LIBCSRC}/gdtoa +.PATH: ${.CURDIR}/gdtoa MISRCS+=_hdtoa.c _ldtoa.c glue.c GDTOASRCS=dmisc.c dtoa.c gdtoa.c gethex.c gmisc.c \ hd_init.c hexnan.c misc.c smisc.c \ strtoIg.c strtod.c strtodg.c strtof.c strtord.c sum.c ulp.c -.if exists(${LIBCSRC}/${TARGET}/stdlib/gdtoa.mk) -.include "${LIBCSRC}/${TARGET}/stdlib/gdtoa.mk" +.if exists(${.CURDIR}/${MACHINE_ARCH}/stdlib/gdtoa.mk) +.include "${.CURDIR}/${MACHINE_ARCH}/stdlib/gdtoa.mk" .endif -CFLAGS+=-I${LIBCSRC}/../../contrib/gdtoa +CFLAGS+=-I${.CURDIR}/../../contrib/gdtoa .for src in ${GDTOASRCS} MISRCS+=gdtoa_${src} CLEANFILES+=gdtoa_${src} gdtoa_${src}: - ln -sf ${LIBCSRC}/../../contrib/gdtoa/${src} ${.TARGET} + ln -sf ${.CURDIR}/../../contrib/gdtoa/${src} ${.TARGET} .endfor ==== //depot/projects/hammer/lib/libc/gen/Makefile.inc#12 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.109 2004/01/15 17:27:28 ru Exp $ # machine-independent gen sources -.PATH: ${LIBCSRC}/${TARGET}/gen ${LIBCSRC}/gen +.PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen SRCS+= __xuname.c _pthread_stubs.c _rand48.c _spinlock_stub.c _thread_init.c \ alarm.c arc4random.c assert.c basename.c check_utility_compat.c \ @@ -33,8 +33,8 @@ valloc.c vis.c wait.c wait3.c waitpid.c wordexp.c # machine-dependent gen sources -.if exists(${LIBCSRC}/${TARGET}/gen/Makefile.inc) -.include "${LIBCSRC}/${TARGET}/gen/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_ARCH}/gen/Makefile.inc) +.include "${.CURDIR}/${MACHINE_ARCH}/gen/Makefile.inc" .endif MAN+= alarm.3 arc4random.3 \ ==== //depot/projects/hammer/lib/libc/gmon/Makefile.inc#4 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libc/gmon/Makefile.inc,v 1.9 2002/11/18 09:50:55 ru Exp $ # gmon sources -.PATH: ${LIBCSRC}/gmon +.PATH: ${.CURDIR}/gmon SRCS+= gmon.c mcount.c ==== //depot/projects/hammer/lib/libc/locale/Makefile.inc#17 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.53 2003/12/07 06:33:52 tjr Exp $ # locale sources -.PATH: ${LIBCSRC}/${TARGET}/locale ${LIBCSRC}/locale +.PATH: ${.CURDIR}/${MACHINE_ARCH}/locale ${.CURDIR}/locale SRCS+= big5.c btowc.c collate.c collcmp.c euc.c fix_grouping.c frune.c \ gb18030.c gb2312.c gbk.c isctype.c iswctype.c \ ==== //depot/projects/hammer/lib/libc/net/Makefile.inc#8 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.50 2003/11/14 18:53:22 bms Exp $ # machine-independent net sources -.PATH: ${LIBCSRC}/${TARGET}/net ${LIBCSRC}/net +.PATH: ${.CURDIR}/${MACHINE_ARCH}/net ${.CURDIR}/net SRCS+= addr2ascii.c ascii2addr.c base64.c ether_addr.c getaddrinfo.c \ gethostbydns.c gethostbyht.c gethostbynis.c gethostnamadr.c \ @@ -35,8 +35,8 @@ sed -e '/YY_BUF_SIZE/s/16384/1024/' >${.TARGET} # machine-dependent net sources -.if exists(${LIBCSRC}/${TARGET}/net/Makefile.inc) -.include "${LIBCSRC}/${TARGET}/net/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_ARCH}/net/Makefile.inc) +.include "${.CURDIR}/${MACHINE_ARCH}/net/Makefile.inc" .endif MAN+= addr2ascii.3 byteorder.3 ethers.3 getaddrinfo.3 gethostbyname.3 \ ==== //depot/projects/hammer/lib/libc/nls/Makefile.inc#4 (text+ko) ==== @@ -1,7 +1,7 @@ # from $NetBSD: Makefile.inc,v 1.7 1995/02/27 13:06:20 cgd Exp $ # $FreeBSD: src/lib/libc/nls/Makefile.inc,v 1.8 2002/11/18 09:50:55 ru Exp $ -.PATH: ${LIBCSRC}/nls +.PATH: ${.CURDIR}/nls SRCS+= msgcat.c ==== //depot/projects/hammer/lib/libc/posix1e/Makefile.inc#8 (text+ko) ==== @@ -2,7 +2,7 @@ MAINTAINER= rwatson@FreeBSD.org -.PATH: ${LIBCSRC}/posix1e +.PATH: ${.CURDIR}/posix1e SRCS+= acl_calc_mask.c \ acl_copy.c \ ==== //depot/projects/hammer/lib/libc/quad/Makefile.inc#4 (text+ko) ==== @@ -2,9 +2,9 @@ # $FreeBSD: src/lib/libc/quad/Makefile.inc,v 1.9 2002/11/18 09:50:56 ru Exp $ # Quad support, if needed -.PATH: ${LIBCSRC}/${TARGET}/quad ${LIBCSRC}/quad +.PATH: ${.CURDIR}/${MACHINE_ARCH}/quad ${.CURDIR}/quad -.if ${TARGET} == "i386" +.if ${MACHINE_ARCH} == "i386" SRCS+= cmpdi2.c divdi3.c moddi3.c qdivrem.c ucmpdi2.c udivdi3.c umoddi3.c ==== //depot/projects/hammer/lib/libc/regex/Makefile.inc#4 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libc/regex/Makefile.inc,v 1.7 2002/11/18 09:50:56 ru Exp $ # regex sources -.PATH: ${LIBCSRC}/regex +.PATH: ${.CURDIR}/regex CFLAGS+=-DPOSIX_MISTAKE ==== //depot/projects/hammer/lib/libc/regex/grot/Makefile#3 (text+ko) ==== @@ -5,7 +5,7 @@ # Do not take -DPOSIX_MISTAKE out. REGCFLAGS isn't important to you (it's # for my use in some special contexts). -PATHS= ${LIBCSRC}/.. ${LIBCSRC}/../../locale ${LIBCSRC}/../../../../include +PATHS= ${.CURDIR}/.. ${.CURDIR}/../../locale ${.CURDIR}/../../../../include .PATH: ${PATHS} CFLAGS+= -DPOSIX_MISTAKE -DREDEBUG $(REGCFLAGS) ==== //depot/projects/hammer/lib/libc/rpc/Makefile.inc#7 (text+ko) ==== @@ -1,7 +1,7 @@ # @(#)Makefile 5.11 (Berkeley) 9/6/90 # $FreeBSD: src/lib/libc/rpc/Makefile.inc,v 1.26 2004/01/11 17:14:54 ru Exp $ -.PATH: ${LIBCSRC}/rpc ${LIBCSRC}/. +.PATH: ${.CURDIR}/rpc ${.CURDIR}/. SRCS+= auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \ clnt_dg.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c \ clnt_vc.c rpc_dtablesize.c getnetconfig.c getnetpath.c getrpcent.c \ @@ -26,7 +26,7 @@ SRCS+= crypt_clnt.c crypt_xdr.c crypt.h CFLAGS+= -DBROKEN_DES -DPORTMAP -DDES_BUILTIN -CFLAGS+= -I${LIBCSRC}/rpc +CFLAGS+= -I${.CURDIR}/rpc CLEANFILES+= crypt_clnt.c crypt_xdr.c crypt.h ==== //depot/projects/hammer/lib/libc/sparc64/fpu/Makefile.inc#4 (text+ko) ==== @@ -1,8 +1,8 @@ # $FreeBSD: src/lib/libc/sparc64/fpu/Makefile.inc,v 1.5 2002/11/18 09:50:56 ru Exp $ -.PATH: ${LIBCSRC}/sparc64/fpu +.PATH: ${.CURDIR}/sparc64/fpu -CFLAGS+= -I${LIBCSRC}/sparc64/sys +CFLAGS+= -I${.CURDIR}/sparc64/sys SRCS+= fpu.c fpu_add.c fpu_compare.c fpu_div.c fpu_explode.c fpu_implode.c \ fpu_mul.c fpu_qp.c fpu_reg.S fpu_sqrt.c fpu_subr.c ==== //depot/projects/hammer/lib/libc/sparc64/sys/Makefile.inc#5 (text+ko) ==== @@ -10,7 +10,7 @@ __sparc_utrap_setup.c \ sigcode.S -CFLAGS+= -I${LIBCSRC}/sparc64/fpu +CFLAGS+= -I${.CURDIR}/sparc64/fpu MDASM+= brk.S cerror.S exect.S pipe.S ptrace.S sbrk.S setlogin.S sigaction.S ==== //depot/projects/hammer/lib/libc/stdio/Makefile.inc#11 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.32 2003/01/10 06:22:28 tjr Exp $ # stdio sources -.PATH: ${LIBCSRC}/stdio +.PATH: ${.CURDIR}/stdio SRCS+= _flock_stub.c asprintf.c clrerr.c fclose.c fdopen.c feof.c ferror.c \ fflush.c fgetc.c fgetln.c fgetpos.c fgets.c fgetwc.c fgetws.c \ ==== //depot/projects/hammer/lib/libc/stdlib/Makefile.inc#11 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libc/stdlib/Makefile.inc,v 1.47 2004/02/24 08:07:26 ache Exp $ # machine-independent stdlib sources -.PATH: ${LIBCSRC}/${TARGET}/stdlib ${LIBCSRC}/stdlib +.PATH: ${.CURDIR}/${MACHINE_ARCH}/stdlib ${.CURDIR}/stdlib MISRCS+=_Exit.c abort.c abs.c atexit.c atof.c atoi.c atol.c atoll.c \ bsearch.c calloc.c div.c exit.c getenv.c getopt.c getopt_long.c \ @@ -14,8 +14,8 @@ system.c tdelete.c tfind.c tsearch.c twalk.c # machine-dependent stdlib sources -.if exists(${LIBCSRC}/${TARGET}/stdlib/Makefile.inc) -.include "${LIBCSRC}/${TARGET}/stdlib/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_ARCH}/stdlib/Makefile.inc) +.include "${.CURDIR}/${MACHINE_ARCH}/stdlib/Makefile.inc" .endif MAN+= abort.3 abs.3 alloca.3 atexit.3 atof.3 atoi.3 atol.3 bsearch.3 \ ==== //depot/projects/hammer/lib/libc/stdtime/Makefile.inc#4 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.inc,v 1.2 1994/09/13 21:26:01 wollman Exp # $FreeBSD: src/lib/libc/stdtime/Makefile.inc,v 1.14 2002/11/18 09:50:56 ru Exp $ -.PATH: ${LIBCSRC}/stdtime ${LIBCSRC}/../locale +.PATH: ${.CURDIR}/stdtime ${.CURDIR}/../locale SRCS+= asctime.c difftime.c localtime.c strftime.c strptime.c timelocal.c \ time32.c ==== //depot/projects/hammer/lib/libc/string/Makefile.inc#8 (text+ko) ==== @@ -1,9 +1,9 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.34 2004/01/13 16:05:47 des Exp $ -.PATH: ${LIBCSRC}/${TARGET}/string ${LIBCSRC}/string +.PATH: ${.CURDIR}/${MACHINE_ARCH}/string ${.CURDIR}/string -CFLAGS+= -I${LIBCSRC}/locale +CFLAGS+= -I${.CURDIR}/locale # machine-independent string sources MISRCS+=bcmp.c bcopy.c bzero.c ffs.c ffsl.c fls.c flsl.c index.c memccpy.c \ @@ -22,8 +22,8 @@ # machine-dependent string sources -.if exists(${LIBCSRC}/${TARGET}/string/Makefile.inc) -.include "${LIBCSRC}/${TARGET}/string/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_ARCH}/string/Makefile.inc) +.include "${.CURDIR}/${MACHINE_ARCH}/string/Makefile.inc" .endif MAN+= bcmp.3 bcopy.3 bstring.3 bzero.3 ffs.3 index.3 memccpy.3 memchr.3 \ ==== //depot/projects/hammer/lib/libc/uuid/Makefile.inc#4 (text+ko) ==== @@ -2,7 +2,7 @@ # DCE 1.1 UUID implementation sources -.PATH: ${LIBCSRC}/uuid +.PATH: ${.CURDIR}/uuid SRCS+= uuid_compare.c uuid_create.c uuid_create_nil.c uuid_equal.c \ uuid_from_string.c uuid_hash.c uuid_is_nil.c uuid_to_string.c ==== //depot/projects/hammer/lib/libc/xdr/Makefile.inc#5 (text+ko) ==== @@ -1,7 +1,7 @@ # @(#)Makefile 5.11 (Berkeley) 9/6/90 # $FreeBSD: src/lib/libc/xdr/Makefile.inc,v 1.14 2002/11/18 09:50:57 ru Exp $ -.PATH: ${LIBCSRC}/xdr ${LIBCSRC}/. +.PATH: ${.CURDIR}/xdr ${.CURDIR}/. SRCS+= xdr.c xdr_array.c xdr_float.c xdr_mem.c \ xdr_rec.c xdr_reference.c xdr_stdio.c ==== //depot/projects/hammer/lib/libc/yp/Makefile.inc#4 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libc/yp/Makefile.inc,v 1.9 2002/11/18 09:50:57 ru Exp $ # yp sources -.PATH: ${LIBCSRC}/yp +.PATH: ${.CURDIR}/yp SRCS+= xdryp.c yp.h yp_xdr.c yplib.c CLEANFILES+= yp.h yp_xdr.c ==== //depot/projects/hammer/libexec/Makefile#22 (text+ko) ==== @@ -27,7 +27,6 @@ rpc.sprayd \ rshd \ ${_rtld-elf} \ - ${_rtld-elf32} \ save-entropy \ ${_smrsh} \ talkd \ @@ -46,9 +45,6 @@ .if !defined(NOPIC) _rtld-elf= rtld-elf -.if ${MACHINE_ARCH} == "amd64" -_rtld-elf32= rtld-elf32 -.endif .endif .if !defined(NO_SENDMAIL) ==== //depot/projects/hammer/libexec/rtld-elf/Makefile#9 (text+ko) ==== @@ -5,10 +5,8 @@ xmalloc.c debug.c reloc.c libmap.c MAN= rtld.1 CSTD?= gnu99 -TARGET?= ${MACHINE_ARCH} -RTLDSRC?= ${.CURDIR} CFLAGS+= -Wall -DFREEBSD_ELF -DIN_RTLD -CFLAGS+= -I${RTLDSRC}/${TARGET} -I${RTLDSRC} +CFLAGS+= -I${.CURDIR}/${MACHINE_ARCH} -I${.CURDIR} LDFLAGS+= -nostdlib -e .rtld_start INSTALLFLAGS= -fschg -C -b BINDIR= /libexec @@ -16,8 +14,8 @@ MLINKS= rtld.1 ld-elf.so.1.1 \ rtld.1 ld.so.1 -.if exists(${RTLDSRC}/${TARGET}/Makefile.inc) -.include "${RTLDSRC}/${TARGET}/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_ARCH}/Makefile.inc) +.include "${.CURDIR}/${MACHINE_ARCH}/Makefile.inc" .endif # If LDSCRIPT is defined, we build the dynamic linker as an @@ -50,6 +48,6 @@ beforeinstall: -chflags noschg ${DESTDIR}/usr/libexec/${PROG} -.PATH: ${RTLDSRC} ${RTLDSRC}/${TARGET} +.PATH: ${.CURDIR}/${MACHINE_ARCH} .include ==== //depot/projects/hammer/share/mk/bsd.lib.mk#17 (text+ko) ====