Author: ngie
Date: Sat Feb 4 17:17:38 2017
New Revision: 313240
URL: https://svnweb.freebsd.org/changeset/base/313240
Log:
MFC r312332,r312446,r312451:
r312332:
Use SRCTOP where possible and use :H to manipulate .CURDIR to get rid of
unnecessarily long relative path .PATH values with make
r312446 (by emaste):
libc: remove reference to nonexistent lib/locale directory
As far as I can tell this was introduced in r72406 and updated in several
subsequent revisions, but the lib/locale directory it referenced never
existed.
r312451:
Replace dot-dot relative pathing with SRCTOP-relative paths where possible
This reduces build output, need for recalculating paths, and makes it clearer
which paths are relative to what areas in the source tree. The change in
performance over a locally mounted UFS filesystem was negligible in my
testing,
but this may more positively impact other filesystems like NFS.
LIBC_SRCTOP was left alone so Juniper (and other users) can continue to
manipulate lib/libc/Makefile (and other Makefile.inc's under lib/libc) as
include Makefiles with custom options.
Discussed with: marcel, sjg
Modified:
stable/11/lib/libc/Makefile
stable/11/lib/libc/arm/aeabi/Makefile.inc
stable/11/lib/libc/capability/Makefile.inc
stable/11/lib/libc/gdtoa/Makefile.inc
stable/11/lib/libc/gen/Makefile.inc
stable/11/lib/libc/iconv/Makefile.inc
stable/11/lib/libc/md/Makefile.inc
stable/11/lib/libc/posix1e/Makefile.inc
stable/11/lib/libc/regex/grot/Makefile
stable/11/lib/libc/resolv/Makefile.inc
stable/11/lib/libc/stdlib/jemalloc/Makefile.inc
stable/11/lib/libc/stdtime/Makefile.inc
stable/11/lib/libc/string/Makefile.inc
stable/11/lib/libc/sys/Makefile.inc
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/lib/libc/Makefile
==============================================================================
--- stable/11/lib/libc/Makefile Sat Feb 4 17:10:19 2017 (r313239)
+++ stable/11/lib/libc/Makefile Sat Feb 4 17:17:38 2017 (r313240)
@@ -32,7 +32,7 @@ SHLIB_MAJOR= 7
SHLIB_LDSCRIPT=libc.ldscript
SHLIB_LDSCRIPT_LINKS=libxnet.so
WARNS?= 2
-CFLAGS+=-I${LIBC_SRCTOP}/include -I${LIBC_SRCTOP}/../../include
+CFLAGS+=-I${LIBC_SRCTOP}/include -I${SRCTOP}/include
CFLAGS+=-I${LIBC_SRCTOP}/${LIBC_ARCH}
.if ${MK_NLS} != "no"
CFLAGS+=-DNLS
Modified: stable/11/lib/libc/arm/aeabi/Makefile.inc
==============================================================================
--- stable/11/lib/libc/arm/aeabi/Makefile.inc Sat Feb 4 17:10:19 2017
(r313239)
+++ stable/11/lib/libc/arm/aeabi/Makefile.inc Sat Feb 4 17:17:38 2017
(r313240)
@@ -21,7 +21,7 @@ SRCS+= aeabi_vfp_double.S \
# libc. This causes issues when other parts of libc call these functions.
# We work around this by including these functions in libc but mark them as
# hidden so users of libc will not pick up these versions.
-.PATH: ${LIBC_SRCTOP}/../../contrib/compiler-rt/lib/builtins/arm
+.PATH: ${SRCTOP}/contrib/compiler-rt/lib/builtins/arm
SRCS+= aeabi_memcmp.S \
aeabi_memcpy.S \
Modified: stable/11/lib/libc/capability/Makefile.inc
==============================================================================
--- stable/11/lib/libc/capability/Makefile.inc Sat Feb 4 17:10:19 2017
(r313239)
+++ stable/11/lib/libc/capability/Makefile.inc Sat Feb 4 17:17:38 2017
(r313240)
@@ -1,7 +1,7 @@
# $FreeBSD$
# capability sources
-.PATH: ${LIBC_SRCTOP}/../../sys/kern ${LIBC_SRCTOP}/capability
+.PATH: ${SRCTOP}/sys/kern ${LIBC_SRCTOP}/capability
SRCS+= subr_capability.c
Modified: stable/11/lib/libc/gdtoa/Makefile.inc
==============================================================================
--- stable/11/lib/libc/gdtoa/Makefile.inc Sat Feb 4 17:10:19 2017
(r313239)
+++ stable/11/lib/libc/gdtoa/Makefile.inc Sat Feb 4 17:17:38 2017
(r313240)
@@ -10,11 +10,11 @@ GDTOASRCS+=dmisc.c dtoa.c gdtoa.c gethex
SYM_MAPS+=${LIBC_SRCTOP}/gdtoa/Symbol.map
-CFLAGS+=-I${LIBC_SRCTOP}/../../contrib/gdtoa
+CFLAGS+=-I${SRCTOP}/contrib/gdtoa
.for src in ${GDTOASRCS}
MISRCS+=gdtoa_${src}
CLEANFILES+=gdtoa_${src}
-gdtoa_${src}: ${LIBC_SRCTOP}/../../contrib/gdtoa/${src} .NOMETA
+gdtoa_${src}: ${SRCTOP}/contrib/gdtoa/${src} .NOMETA
ln -sf ${.ALLSRC} ${.TARGET}
.endfor
Modified: stable/11/lib/libc/gen/Makefile.inc
==============================================================================
--- stable/11/lib/libc/gen/Makefile.inc Sat Feb 4 17:10:19 2017
(r313239)
+++ stable/11/lib/libc/gen/Makefile.inc Sat Feb 4 17:17:38 2017
(r313240)
@@ -150,11 +150,11 @@ SRCS+= fts-compat.c \
unvis-compat.c
.endif
-.PATH: ${LIBC_SRCTOP}/../../contrib/libc-pwcache
+.PATH: ${SRCTOP}/contrib/libc-pwcache
SRCS+= pwcache.c pwcache.h
-.PATH: ${LIBC_SRCTOP}/../../contrib/libc-vis
-CFLAGS+= -I${LIBC_SRCTOP}/../../contrib/libc-vis
+.PATH: ${SRCTOP}/contrib/libc-vis
+CFLAGS+= -I${SRCTOP}/contrib/libc-vis
SRCS+= unvis.c vis.c
MISRCS+=modf.c
Modified: stable/11/lib/libc/iconv/Makefile.inc
==============================================================================
--- stable/11/lib/libc/iconv/Makefile.inc Sat Feb 4 17:10:19 2017
(r313239)
+++ stable/11/lib/libc/iconv/Makefile.inc Sat Feb 4 17:17:38 2017
(r313240)
@@ -22,5 +22,5 @@ SRCS+= iconv_compat.c
SYM_MAPS+= ${LIBC_SRCTOP}/iconv/Symbol.map
.if ${MK_ICONV} == yes
-.include "${LIBC_SRCTOP}/../libc_nonshared/Makefile.iconv"
+.include "${SRCTOP}/lib/libc_nonshared/Makefile.iconv"
.endif
Modified: stable/11/lib/libc/md/Makefile.inc
==============================================================================
--- stable/11/lib/libc/md/Makefile.inc Sat Feb 4 17:10:19 2017
(r313239)
+++ stable/11/lib/libc/md/Makefile.inc Sat Feb 4 17:17:38 2017
(r313240)
@@ -1,5 +1,5 @@
# $FreeBSD$
-.PATH: ${LIBC_SRCTOP}/../libmd
+.PATH: ${SRCTOP}/lib/libmd
SRCS+= md5c.c
Modified: stable/11/lib/libc/posix1e/Makefile.inc
==============================================================================
--- stable/11/lib/libc/posix1e/Makefile.inc Sat Feb 4 17:10:19 2017
(r313239)
+++ stable/11/lib/libc/posix1e/Makefile.inc Sat Feb 4 17:17:38 2017
(r313240)
@@ -5,7 +5,7 @@
CFLAGS+=-D_ACL_PRIVATE
# Copy kern/subr_acl_nfs4.c to the libc object directory.
-subr_acl_nfs4.c: ${LIBC_SRCTOP}/../../sys/kern/subr_acl_nfs4.c
+subr_acl_nfs4.c: ${SRCTOP}/sys/kern/subr_acl_nfs4.c
cat ${.ALLSRC} > ${.TARGET}
SRCS+= acl_branding.c \
Modified: stable/11/lib/libc/regex/grot/Makefile
==============================================================================
--- stable/11/lib/libc/regex/grot/Makefile Sat Feb 4 17:10:19 2017
(r313239)
+++ stable/11/lib/libc/regex/grot/Makefile Sat Feb 4 17:17:38 2017
(r313240)
@@ -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= ${.CURDIR}/.. ${.CURDIR}/../../locale ${.CURDIR}/../../../../include
+PATHS= ${LIBC_SRCTOP}/regex ${LIBC_SRCTOP}/locale ${SRCTOP}/include
.PATH: ${PATHS}
CFLAGS+= -static -DPOSIX_MISTAKE -DREDEBUG $(REGCFLAGS)
Modified: stable/11/lib/libc/resolv/Makefile.inc
==============================================================================
--- stable/11/lib/libc/resolv/Makefile.inc Sat Feb 4 17:10:19 2017
(r313239)
+++ stable/11/lib/libc/resolv/Makefile.inc Sat Feb 4 17:17:38 2017
(r313240)
@@ -9,4 +9,4 @@ SRCS+= herror.c h_errno.c mtctxres.c res
SYM_MAPS+= ${LIBC_SRCTOP}/resolv/Symbol.map
-CFLAGS+=-I${LIBC_SRCTOP}/../libmd
+CFLAGS+=-I${SRCTOP}/lib/libmd
Modified: stable/11/lib/libc/stdlib/jemalloc/Makefile.inc
==============================================================================
--- stable/11/lib/libc/stdlib/jemalloc/Makefile.inc Sat Feb 4 17:10:19
2017 (r313239)
+++ stable/11/lib/libc/stdlib/jemalloc/Makefile.inc Sat Feb 4 17:17:38
2017 (r313240)
@@ -9,18 +9,18 @@ JEMALLOCSRCS:= jemalloc.c arena.c atomic
SYM_MAPS+=${LIBC_SRCTOP}/stdlib/jemalloc/Symbol.map
-CFLAGS+=-I${LIBC_SRCTOP}/../../contrib/jemalloc/include
+CFLAGS+=-I${SRCTOP}/contrib/jemalloc/include
.for src in ${JEMALLOCSRCS}
MISRCS+=jemalloc_${src}
CLEANFILES+=jemalloc_${src}
-jemalloc_${src}: ${LIBC_SRCTOP}/../../contrib/jemalloc/src/${src} .NOMETA
+jemalloc_${src}: ${SRCTOP}/contrib/jemalloc/src/${src} .NOMETA
ln -sf ${.ALLSRC} ${.TARGET}
.endfor
MAN+=jemalloc.3
CLEANFILES+=jemalloc.3
-jemalloc.3: ${LIBC_SRCTOP}/../../contrib/jemalloc/doc/jemalloc.3 .NOMETA
+jemalloc.3: ${SRCTOP}/contrib/jemalloc/doc/jemalloc.3 .NOMETA
ln -sf ${.ALLSRC} ${.TARGET}
MLINKS+= \
Modified: stable/11/lib/libc/stdtime/Makefile.inc
==============================================================================
--- stable/11/lib/libc/stdtime/Makefile.inc Sat Feb 4 17:10:19 2017
(r313239)
+++ stable/11/lib/libc/stdtime/Makefile.inc Sat Feb 4 17:17:38 2017
(r313240)
@@ -1,15 +1,14 @@
# Makefile.inc,v 1.2 1994/09/13 21:26:01 wollman Exp
# $FreeBSD$
-.PATH: ${LIBC_SRCTOP}/stdtime ${LIBC_SRCTOP}/../locale \
- ${LIBC_SRCTOP}/../../contrib/tzcode/stdtime
+.PATH: ${LIBC_SRCTOP}/stdtime ${SRCTOP}/contrib/tzcode/stdtime
SRCS+= asctime.c difftime.c localtime.c strftime.c strptime.c timelocal.c \
time32.c
SYM_MAPS+= ${LIBC_SRCTOP}/stdtime/Symbol.map
-CFLAGS+= -I${LIBC_SRCTOP}/../../contrib/tzcode/stdtime -I${LIBC_SRCTOP}/stdtime
+CFLAGS+= -I${SRCTOP}/contrib/tzcode/stdtime -I${LIBC_SRCTOP}/stdtime
CFLAGS.localtime.c= -fwrapv
Modified: stable/11/lib/libc/string/Makefile.inc
==============================================================================
--- stable/11/lib/libc/string/Makefile.inc Sat Feb 4 17:10:19 2017
(r313239)
+++ stable/11/lib/libc/string/Makefile.inc Sat Feb 4 17:17:38 2017
(r313240)
@@ -2,7 +2,7 @@
# $FreeBSD$
.PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/string ${LIBC_SRCTOP}/string
-.PATH: ${LIBC_SRCTOP}/../../sys/libkern
+.PATH: ${SRCTOP}/sys/libkern
CFLAGS+= -I${LIBC_SRCTOP}/locale
Modified: stable/11/lib/libc/sys/Makefile.inc
==============================================================================
--- stable/11/lib/libc/sys/Makefile.inc Sat Feb 4 17:10:19 2017
(r313239)
+++ stable/11/lib/libc/sys/Makefile.inc Sat Feb 4 17:17:38 2017
(r313240)
@@ -6,7 +6,7 @@
# Include the generated makefile containing the *complete* list
# of syscall names in MIASM.
-.include "${LIBC_SRCTOP}/../../sys/sys/syscall.mk"
+.include "${SRCTOP}/sys/sys/syscall.mk"
# Include machine dependent definitions.
#
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
