svn commit: r315175 - in head/gnu: lib/csu lib/libdialog lib/libgcov lib/libgomp lib/libreadline lib/libregex lib/libssp lib/libssp/libssp_nonshared lib/libstdc++ usr.bin/cc usr.bin/cc/include usr....
Warner Losh
imp at FreeBSD.org
Sun Mar 12 18:59:19 UTC 2017
Author: imp
Date: Sun Mar 12 18:59:16 2017
New Revision: 315175
URL: https://svnweb.freebsd.org/changeset/base/315175
Log:
Convert gnu to using SRCTOP
Prefer SRCTOP over CURDIR/../../contrib, etc. However, retain the "up
one level" instances of ../ because they are really relative to this
part of the tree and not a means to find the root of the tree. As
such, it's better to leave them since that further the goal of being
able to move directories if watned to in the future.
Differential Revision: https://reviews.freebsd.org/D9932
Sponsored by: Netflix
Silence On: arch@ (twice)
Modified:
head/gnu/lib/csu/Makefile
head/gnu/lib/libdialog/Makefile
head/gnu/lib/libgcov/Makefile
head/gnu/lib/libgomp/Makefile
head/gnu/lib/libreadline/Makefile.inc
head/gnu/lib/libregex/Makefile
head/gnu/lib/libssp/Makefile
head/gnu/lib/libssp/libssp_nonshared/Makefile
head/gnu/lib/libstdc++/Makefile
head/gnu/usr.bin/cc/Makefile.inc
head/gnu/usr.bin/cc/include/Makefile
head/gnu/usr.bin/dialog/Makefile
head/gnu/usr.bin/diff3/Makefile
head/gnu/usr.bin/gperf/Makefile
Modified: head/gnu/lib/csu/Makefile
==============================================================================
--- head/gnu/lib/csu/Makefile Sun Mar 12 18:59:09 2017 (r315174)
+++ head/gnu/lib/csu/Makefile Sun Mar 12 18:59:16 2017 (r315175)
@@ -3,9 +3,9 @@
.include <src.opts.mk>
MK_SSP= no
-GCCDIR= ${.CURDIR}/../../../contrib/gcc
-GCCLIB= ${.CURDIR}/../../../contrib/gcclibs
-CCDIR= ${.CURDIR}/../../usr.bin/cc
+GCCDIR= ${SRCTOP}/contrib/gcc
+GCCLIB= ${SRCTOP}/contrib/gcclibs
+CCDIR= ${SRCTOP}/gnu/usr.bin/cc
.include "${CCDIR}/Makefile.tgt"
.include "${CCDIR}/cc_tools/Makefile.hdrs"
Modified: head/gnu/lib/libdialog/Makefile
==============================================================================
--- head/gnu/lib/libdialog/Makefile Sun Mar 12 18:59:09 2017 (r315174)
+++ head/gnu/lib/libdialog/Makefile Sun Mar 12 18:59:16 2017 (r315175)
@@ -1,6 +1,6 @@
# $FreeBSD$
-DIALOG= ${.CURDIR}/../../../contrib/dialog
+DIALOG= ${SRCTOP}/contrib/dialog
LIB= dialog
SHLIB_MAJOR= 8
Modified: head/gnu/lib/libgcov/Makefile
==============================================================================
--- head/gnu/lib/libgcov/Makefile Sun Mar 12 18:59:09 2017 (r315174)
+++ head/gnu/lib/libgcov/Makefile Sun Mar 12 18:59:16 2017 (r315175)
@@ -5,9 +5,9 @@ MK_SSP= no
.include <src.opts.mk>
-GCCDIR= ${.CURDIR}/../../../contrib/gcc
-GCCLIB= ${.CURDIR}/../../../contrib/gcclibs
-CCDIR= ${.CURDIR}/../../usr.bin/cc
+GCCDIR= ${SRCTOP}/contrib/gcc
+GCCLIB= ${SRCTOP}/contrib/gcclibs
+CCDIR= ${SRCTOP}/gnu/usr.bin/cc
.include "${CCDIR}/Makefile.tgt"
.include "${CCDIR}/cc_tools/Makefile.hdrs"
Modified: head/gnu/lib/libgomp/Makefile
==============================================================================
--- head/gnu/lib/libgomp/Makefile Sun Mar 12 18:59:09 2017 (r315174)
+++ head/gnu/lib/libgomp/Makefile Sun Mar 12 18:59:16 2017 (r315175)
@@ -1,7 +1,7 @@
# $FreeBSD$
-GCCDIR= ${.CURDIR}/../../../contrib/gcc
-GCCLIB= ${.CURDIR}/../../../contrib/gcclibs
+GCCDIR= ${SRCTOP}/contrib/gcc
+GCCLIB= ${SRCTOP}/contrib/gcclibs
SRCDIR= ${GCCLIB}/libgomp
.PATH: ${SRCDIR} ${SRCDIR}/config/posix
Modified: head/gnu/lib/libreadline/Makefile.inc
==============================================================================
--- head/gnu/lib/libreadline/Makefile.inc Sun Mar 12 18:59:09 2017 (r315174)
+++ head/gnu/lib/libreadline/Makefile.inc Sun Mar 12 18:59:16 2017 (r315175)
@@ -3,7 +3,7 @@
SHLIB_MAJOR=8
RL_LIBRARY_VERSION=5.2
-SRCDIR= ${.CURDIR}/../../../../contrib/libreadline
+SRCDIR= ${SRCTOP}/contrib/libreadline
.PATH: ${SRCDIR} ${.CURDIR}/..
LOCAL_CFLAGS= -DRL_LIBRARY_VERSION='"$(RL_LIBRARY_VERSION)"'
Modified: head/gnu/lib/libregex/Makefile
==============================================================================
--- head/gnu/lib/libregex/Makefile Sun Mar 12 18:59:09 2017 (r315174)
+++ head/gnu/lib/libregex/Makefile Sun Mar 12 18:59:16 2017 (r315175)
@@ -3,7 +3,7 @@
LIB= gnuregex
SHLIB_MAJOR= 5
-REGEXDIR= ${.CURDIR}/../../../contrib/libgnuregex
+REGEXDIR= ${SRCTOP}/contrib/libgnuregex
.PATH: ${REGEXDIR}
SRCS= gnuregex.c
Modified: head/gnu/lib/libssp/Makefile
==============================================================================
--- head/gnu/lib/libssp/Makefile Sun Mar 12 18:59:09 2017 (r315174)
+++ head/gnu/lib/libssp/Makefile Sun Mar 12 18:59:16 2017 (r315175)
@@ -7,8 +7,8 @@ MK_SSP= no
.include <bsd.own.mk>
-GCCDIR= ${.CURDIR}/../../../contrib/gcc
-GCCLIB= ${.CURDIR}/../../../contrib/gcclibs
+GCCDIR= ${SRCTOP}/contrib/gcc
+GCCLIB= ${SRCTOP}/contrib/gcclibs
SRCDIR= ${GCCLIB}/libssp
.PATH: ${SRCDIR} ${SRCDIR}/ssp
Modified: head/gnu/lib/libssp/libssp_nonshared/Makefile
==============================================================================
--- head/gnu/lib/libssp/libssp_nonshared/Makefile Sun Mar 12 18:59:09 2017 (r315174)
+++ head/gnu/lib/libssp/libssp_nonshared/Makefile Sun Mar 12 18:59:16 2017 (r315175)
@@ -1,7 +1,7 @@
# $FreeBSD$
-GCCDIR= ${.CURDIR}/../../../../contrib/gcc
-GCCLIB= ${.CURDIR}/../../../../contrib/gcclibs
+GCCDIR= ${SRCTOP}/contrib/gcc
+GCCLIB= ${SRCTOP}/contrib/gcclibs
.PATH: ${GCCLIB}/libssp ${GCCLIB}/libssp/ssp
Modified: head/gnu/lib/libstdc++/Makefile
==============================================================================
--- head/gnu/lib/libstdc++/Makefile Sun Mar 12 18:59:09 2017 (r315174)
+++ head/gnu/lib/libstdc++/Makefile Sun Mar 12 18:59:16 2017 (r315175)
@@ -3,9 +3,9 @@
.include <src.opts.mk>
GCCVER= 4.2
-GCCDIR= ${.CURDIR}/../../../contrib/gcc
-GCCLIB= ${.CURDIR}/../../../contrib/gcclibs
-SRCDIR= ${.CURDIR}/../../../contrib/libstdc++
+GCCDIR= ${SRCTOP}/contrib/gcc
+GCCLIB= ${SRCTOP}/contrib/gcclibs
+SRCDIR= ${SRCTOP}/contrib/libstdc++
SUPDIR= ${SRCDIR}/libsupc++
.PATH: ${SRCDIR}/src ${SRCDIR}/libmath ${SRCDIR}/config/io \
Modified: head/gnu/usr.bin/cc/Makefile.inc
==============================================================================
--- head/gnu/usr.bin/cc/Makefile.inc Sun Mar 12 18:59:09 2017 (r315174)
+++ head/gnu/usr.bin/cc/Makefile.inc Sun Mar 12 18:59:16 2017 (r315175)
@@ -8,8 +8,8 @@
__CC_MAKEFILE_INC__= ${MFILE}
GCCVER= 4.2
-GCCDIR= ${.CURDIR}/../../../../contrib/gcc
-GCCLIB= ${.CURDIR}/../../../../contrib/gcclibs
+GCCDIR= ${SRCTOP}/contrib/gcc
+GCCLIB= ${SRCTOP}/contrib/gcclibs
.include "Makefile.tgt"
Modified: head/gnu/usr.bin/cc/include/Makefile
==============================================================================
--- head/gnu/usr.bin/cc/include/Makefile Sun Mar 12 18:59:09 2017 (r315174)
+++ head/gnu/usr.bin/cc/include/Makefile Sun Mar 12 18:59:16 2017 (r315175)
@@ -6,7 +6,7 @@
INCSDIR=${INCLUDEDIR}/gcc/${GCCVER}
-.PATH: ${GCCDIR}/config/${GCC_CPU} ${.CURDIR}/../../../../contrib/llvm/tools/clang/lib/Headers
+.PATH: ${GCCDIR}/config/${GCC_CPU} ${SRCTOP}/contrib/llvm/tools/clang/lib/Headers
.if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64"
INCS= ammintrin.h emmintrin.h mmintrin.h mm3dnow.h pmmintrin.h \
Modified: head/gnu/usr.bin/dialog/Makefile
==============================================================================
--- head/gnu/usr.bin/dialog/Makefile Sun Mar 12 18:59:09 2017 (r315174)
+++ head/gnu/usr.bin/dialog/Makefile Sun Mar 12 18:59:16 2017 (r315175)
@@ -1,6 +1,6 @@
# $FreeBSD$
-DIALOG= ${.CURDIR}/../../../contrib/dialog
+DIALOG= ${SRCTOP}/contrib/dialog
PROG= dialog
LIBADD= dialog ncursesw m
Modified: head/gnu/usr.bin/diff3/Makefile
==============================================================================
--- head/gnu/usr.bin/diff3/Makefile Sun Mar 12 18:59:09 2017 (r315174)
+++ head/gnu/usr.bin/diff3/Makefile Sun Mar 12 18:59:16 2017 (r315175)
@@ -1,9 +1,9 @@
# $FreeBSD$
-DIFFSRC=${.CURDIR}/../../../contrib/diff/src
+DIFFSRC=${SRCTOP}/contrib/diff/src
.PATH: ${DIFFSRC} \
- ${.CURDIR}/../../../contrib/diff/lib \
- ${.CURDIR}/../../../contrib/diff/man
+ ${SRCTOP}/contrib/diff/lib \
+ ${SRCTOP}/contrib/diff/man
PROG= diff3
SRCS= diff3.c version-etc.c \
@@ -12,9 +12,9 @@ SRCS= diff3.c version-etc.c \
# Important for ctype macros!
CFLAGS+=-funsigned-char
-CFLAGS+=-I${.CURDIR}/../../../contrib/diff/
-CFLAGS+=-I${.CURDIR}/../../../contrib/diff/src
-CFLAGS+=-I${.CURDIR}/../../../contrib/diff/lib
+CFLAGS+=-I${SRCTOP}/contrib/diff/
+CFLAGS+=-I${SRCTOP}/contrib/diff/src
+CFLAGS+=-I${SRCTOP}/contrib/diff/lib
CFLAGS+=-DHAVE_CONFIG_H
CFLAGS+=-DDEFAULT_DIFF_PROGRAM=\"/usr/bin/diff\"
Modified: head/gnu/usr.bin/gperf/Makefile
==============================================================================
--- head/gnu/usr.bin/gperf/Makefile Sun Mar 12 18:59:09 2017 (r315174)
+++ head/gnu/usr.bin/gperf/Makefile Sun Mar 12 18:59:16 2017 (r315175)
@@ -1,7 +1,7 @@
# $FreeBSD$
.include <bsd.own.mk>
-GPERFDIR= ${.CURDIR}/../../../contrib/gperf
+GPERFDIR= ${SRCTOP}/contrib/gperf
.PATH: ${GPERFDIR}/src ${GPERFDIR}/lib ${GPERFDIR}/doc
More information about the svn-src-all
mailing list