d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert gnu to using SRCTOP

Browse Source 
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)
This commit is contained in:
Warner Losh 2017-03-12 18:59:16 +00:00
parent 23583802cf
commit ffec315183
14 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/lib/csu/Makefile
View File

@ -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"

2
gnu/lib/libdialog/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
DIALOG= ${.CURDIR}/../../../contrib/dialog
DIALOG= ${SRCTOP}/contrib/dialog
LIB= dialog
SHLIB_MAJOR= 8

6
gnu/lib/libgcov/Makefile
View File

@ -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"

4
gnu/lib/libgomp/Makefile
View File

@ -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

2
gnu/lib/libreadline/Makefile.inc
View File

@ -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)"'

2
gnu/lib/libregex/Makefile
View File

@ -3,7 +3,7 @@
LIB= gnuregex
SHLIB_MAJOR= 5
REGEXDIR= ${.CURDIR}/../../../contrib/libgnuregex
REGEXDIR= ${SRCTOP}/contrib/libgnuregex
.PATH: ${REGEXDIR}
SRCS= gnuregex.c

4
gnu/lib/libssp/Makefile
View File

@ -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

4
gnu/lib/libssp/libssp_nonshared/Makefile
View File

@ -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

6
gnu/lib/libstdc++/Makefile
View File

@ -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 \

4
gnu/usr.bin/cc/Makefile.inc
View File

@ -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"

2
gnu/usr.bin/cc/include/Makefile
View File

@ -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 \

2
gnu/usr.bin/dialog/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
DIALOG= ${.CURDIR}/../../../contrib/dialog
DIALOG= ${SRCTOP}/contrib/dialog
PROG= dialog
LIBADD= dialog ncursesw m

12
gnu/usr.bin/diff3/Makefile
View File

@ -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\"

2
gnu/usr.bin/gperf/Makefile
View File

@ -1,7 +1,7 @@
# $FreeBSD$
.include <bsd.own.mk>
GPERFDIR= ${.CURDIR}/../../../contrib/gperf
GPERFDIR= ${SRCTOP}/contrib/gperf
.PATH: ${GPERFDIR}/src ${GPERFDIR}/lib ${GPERFDIR}/doc