Author: bdrewery
Date: Tue Oct 31 00:07:37 2017
New Revision: 325189
URL: https://svnweb.freebsd.org/changeset/base/325189
Log:
Rename RELTOP since it will mean something else globally.
Sponsored by: Dell EMC Isilon
Modified:
head/gnu/usr.bin/binutils/Makefile.inc0
head/gnu/usr.bin/binutils/as/Makefile
head/gnu/usr.bin/binutils/ld/Makefile
head/gnu/usr.bin/binutils/objcopy/Makefile
head/gnu/usr.bin/binutils/objdump/Makefile
Modified: head/gnu/usr.bin/binutils/Makefile.inc0
==============================================================================
--- head/gnu/usr.bin/binutils/Makefile.inc0 Tue Oct 31 00:07:04 2017
(r325188)
+++ head/gnu/usr.bin/binutils/Makefile.inc0 Tue Oct 31 00:07:37 2017
(r325189)
@@ -21,12 +21,12 @@ TARGET_TUPLE?= ${BINUTILS_ARCH}-${TARGET_VENDOR}-${TAR
TARGET_BIG_ENDIAN=t
.endif
-# RELTOP is the relative path to this point in the source or object
+# GNURELTOP is the relative path to this point in the source or object
# tree, from any subdirectory of same. It gets extra "../" prefixes
# added to it as we descend into subdirectories.
-RELTOP:= ..
+GNURELTOP:= ..
-RELSRC= ${RELTOP}/../../../contrib/binutils
+RELSRC= ${GNURELTOP}/../../../contrib/binutils
SRCDIR= ${.CURDIR}/${RELSRC}
.if ${TARGET_CPUARCH} == "arm" || ${TARGET_CPUARCH} == "i386" || \
@@ -39,8 +39,8 @@ CFLAGS+= -DBFD_DEFAULT_TARGET_SIZE=64
CFLAGS+= -I.
CFLAGS+= -I${.CURDIR}
-CFLAGS+= -I${.CURDIR}/${RELTOP}/libbfd
-CFLAGS+= -I${.OBJDIR}/${RELTOP}/libbfd
+CFLAGS+= -I${.CURDIR}/${GNURELTOP}/libbfd
+CFLAGS+= -I${.OBJDIR}/${GNURELTOP}/libbfd
CFLAGS+= -I${SRCDIR}/include
ARCHS= ${TARGET_CPUARCH}
Modified: head/gnu/usr.bin/binutils/as/Makefile
==============================================================================
--- head/gnu/usr.bin/binutils/as/Makefile Tue Oct 31 00:07:04 2017
(r325188)
+++ head/gnu/usr.bin/binutils/as/Makefile Tue Oct 31 00:07:37 2017
(r325189)
@@ -95,9 +95,9 @@ CFLAGS+= -I${.CURDIR} -I${.CURDIR}/${TARGET_CPUARCH}-f
NO_SHARED?= yes
.endif
-DPADD= ${RELTOP}/libbfd/libbfd.a
-DPADD+= ${RELTOP}/libiberty/libiberty.a
-DPADD+= ${RELTOP}/libopcodes/libopcodes.a
+DPADD= ${GNURELTOP}/libbfd/libbfd.a
+DPADD+= ${GNURELTOP}/libiberty/libiberty.a
+DPADD+= ${GNURELTOP}/libopcodes/libopcodes.a
LDADD= ${DPADD}
.include <bsd.prog.mk>
Modified: head/gnu/usr.bin/binutils/ld/Makefile
==============================================================================
--- head/gnu/usr.bin/binutils/ld/Makefile Tue Oct 31 00:07:04 2017
(r325188)
+++ head/gnu/usr.bin/binutils/ld/Makefile Tue Oct 31 00:07:37 2017
(r325189)
@@ -41,8 +41,8 @@ CFLAGS+= -I${SRCDIR}/ld -I${SRCDIR}/bfd
.if ${MK_SHARED_TOOLCHAIN} == "no"
NO_SHARED?= yes
.endif
-DPADD= ${RELTOP}/libbfd/libbfd.a
-DPADD+= ${RELTOP}/libiberty/libiberty.a
+DPADD= ${GNURELTOP}/libbfd/libbfd.a
+DPADD+= ${GNURELTOP}/libiberty/libiberty.a
LDADD= ${DPADD}
CLEANDIRS+= ldscripts
CLEANFILES+= ldemul-list.h stringify.sed
Modified: head/gnu/usr.bin/binutils/objcopy/Makefile
==============================================================================
--- head/gnu/usr.bin/binutils/objcopy/Makefile Tue Oct 31 00:07:04 2017
(r325188)
+++ head/gnu/usr.bin/binutils/objcopy/Makefile Tue Oct 31 00:07:37 2017
(r325189)
@@ -7,11 +7,11 @@
PROG= objcopy
SRCS= objcopy.c not-strip.c
CFLAGS+= -D_GNU_SOURCE
-CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
+CFLAGS+= -I${.CURDIR}/${GNURELTOP}/libbinutils
CFLAGS+= -I${SRCDIR}/binutils -I${SRCDIR}/bfd
-DPADD= ${RELTOP}/libbinutils/libbinutils.a
-DPADD+= ${RELTOP}/libbfd/libbfd.a
-DPADD+= ${RELTOP}/libiberty/libiberty.a
+DPADD= ${GNURELTOP}/libbinutils/libbinutils.a
+DPADD+= ${GNURELTOP}/libbfd/libbfd.a
+DPADD+= ${GNURELTOP}/libiberty/libiberty.a
LDADD= ${DPADD}
.include <bsd.prog.mk>
Modified: head/gnu/usr.bin/binutils/objdump/Makefile
==============================================================================
--- head/gnu/usr.bin/binutils/objdump/Makefile Tue Oct 31 00:07:04 2017
(r325188)
+++ head/gnu/usr.bin/binutils/objdump/Makefile Tue Oct 31 00:07:37 2017
(r325189)
@@ -7,13 +7,13 @@
PROG= objdump
SRCS= objdump.c prdbg.c
CFLAGS+= -D_GNU_SOURCE
-CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
+CFLAGS+= -I${.CURDIR}/${GNURELTOP}/libbinutils
CFLAGS+= -I${SRCDIR}/binutils
CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
-DPADD= ${RELTOP}/libbinutils/libbinutils.a
-DPADD+= ${RELTOP}/libopcodes/libopcodes.a
-DPADD+= ${RELTOP}/libbfd/libbfd.a
-DPADD+= ${RELTOP}/libiberty/libiberty.a
+DPADD= ${GNURELTOP}/libbinutils/libbinutils.a
+DPADD+= ${GNURELTOP}/libopcodes/libopcodes.a
+DPADD+= ${GNURELTOP}/libbfd/libbfd.a
+DPADD+= ${GNURELTOP}/libiberty/libiberty.a
LDADD= ${DPADD}
.include <bsd.prog.mk>
_______________________________________________
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"
