PERFORCE change 156610 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=156610

Change 156610 by rwatson at rwatson_freebsd_capabilities on 2009/01/24 16:04:10

	Build ld-elf-cap.so using regular ld-elf.so sources.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#2 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#2 (text+ko) ====

@@ -1,27 +1,27 @@
-# $FreeBSD: src/libexec/rtld-elf/Makefile,v 1.42 2008/06/25 21:33:28 ru Exp $
+# $FreeBSD$
+# $P4: //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#2 $
 
 WITHOUT_SSP=
 
 .include <bsd.own.mk>
 
-PROG?=		ld-elf.so.1
+PROG?=		ld-elf-cap.so.1
 SRCS=		rtld_start.S \
 		reloc.c rtld.c rtld_lock.c map_object.c \
 		malloc.c xmalloc.c debug.c libmap.c
-MAN=		rtld.1
+NO_MAN=
 CSTD?=		gnu99
 CFLAGS+=	-Wall -DFREEBSD_ELF -DIN_RTLD
-CFLAGS+=	-I${.CURDIR}/${MACHINE_ARCH} -I${.CURDIR}
+CFLAGS+=	-I${.CURDIR}/../rtld-elf/${MACHINE_ARCH} -I${.CURDIR}/../rtld-elf
 LDFLAGS+=	-nostdlib -e .rtld_start
 INSTALLFLAGS=	-C -b
 PRECIOUSPROG=
 BINDIR=		/libexec
 SYMLINKS=	${BINDIR}/${PROG} /usr/libexec/${PROG}
-MLINKS=		rtld.1 ld-elf.so.1.1 \
-		rtld.1 ld.so.1
 
 CFLAGS+=	-fpic -DPIC
 LDFLAGS+=	-shared -Wl,-Bsymbolic
+
 DPADD=		${LIBC_PIC}
 LDADD=		-lc_pic
 
@@ -29,20 +29,20 @@
 .if ${MK_SYMVER} == "yes"
 LIBCDIR=	${.CURDIR}/../../lib/libc
 VERSION_DEF=	${LIBCDIR}/Versions.def
-SYMBOL_MAPS=	${.CURDIR}/Symbol.map
+SYMBOL_MAPS=	${.CURDIR}/../rtld-elf/Symbol.map
 VERSION_MAP=	Version.map
 LDFLAGS+=	-Wl,--version-script=${VERSION_MAP}
 
 ${PROG}:	${VERSION_MAP}
 
-.if exists(${.CURDIR}/${MACHINE_ARCH}/Symbol.map)
-SYMBOL_MAPS+=	${.CURDIR}/${MACHINE_ARCH}/Symbol.map
+.if exists(${.CURDIR}/../rtld-elf/${MACHINE_ARCH}/Symbol.map)
+SYMBOL_MAPS+=	${.CURDIR}/../rtld-elf/${MACHINE_ARCH}/Symbol.map
 .endif
 .endif
 .endif
 
-.if exists(${.CURDIR}/${MACHINE_ARCH}/Makefile.inc)
-.include "${.CURDIR}/${MACHINE_ARCH}/Makefile.inc"
+.if exists(${.CURDIR}/../rtld-elf/${MACHINE_ARCH}/Makefile.inc)
+.include "${.CURDIR}/../rtld-elf/${MACHINE_ARCH}/Makefile.inc"
 .endif
 
 # Since moving rtld-elf to /libexec, we need to create a symlink.
@@ -52,7 +52,9 @@
 	-chflags noschg ${DESTDIR}/usr/libexec/${PROG}
 .endif
 
-.PATH: ${.CURDIR}/${MACHINE_ARCH}
+.PATH: ../rtld-elf
+.PATH: ${.CURDIR}/../rtld-elf/${MACHINE_ARCH}
+
 
 .include <bsd.symver.mk>
 .include <bsd.prog.mk>