Page MenuHomeFreeBSD
Files F144270231

D19128.diff
No OneTemporary
Actions

D19128.diff
View Options

Index: head/base/binutils/Makefile
===================================================================
--- head/base/binutils/Makefile
+++ head/base/binutils/Makefile
@@ -10,14 +10,6 @@
MASTERDIR= ${.CURDIR}/../../devel/binutils
PLIST= ${.CURDIR}/pkg-plist
-.if !defined(CROSS_TOOLCHAIN)
-.error Please define CROSS_TOOLCHAIN before building
-.endif
-
-.if !defined(CROSS_SYSROOT)
-.error Please define CROSS_SYSROOT before building
-.endif
-
TARGETARCH= ${ARCH:S/amd64/x86_64/}
BUTARGET= ${TARGETARCH}-unknown-${OPSYS:tl}${OSREL}
Index: head/devel/binutils/Makefile
===================================================================
--- head/devel/binutils/Makefile
+++ head/devel/binutils/Makefile
@@ -14,7 +14,7 @@
LICENSE_COMB= multi
EXTRA_PATCHES= ${FILESDIR}/binutils-do-not-provide-shared-section-symbols.patch:-p1
-.if !defined(CROSS_TOOLCHAIN)
+.if defined(PREFIX) && ${PREFIX} != "/usr"
BUILD_DEPENDS= ${LOCALBASE}/lib/libgmp.so:math/gmp \
${LOCALBASE}/lib/libmpfr.so:math/mpfr
@@ -122,28 +122,30 @@
${RM} ${STAGEDIR}${PREFIX}/${BUTARGET}/lib/ldscripts/i386bsd.*
@if [ -d ${STAGEDIR}${PREFIX}/${INFO_PATH:H} ] ; then rm -rf ${STAGEDIR}${PREFIX}/${INFO_PATH:H}; fi
${LN} -fs ../../bin/${BUTARGET}-size ${STAGEDIR}${PREFIX}/${BUTARGET}/bin/size
+.if ${PREFIX} == "/usr"
.if defined(CROSS_TOOLCHAIN)
${MV} ${STAGEDIR}/usr/bin/as ${STAGEDIR}/usr/bin/${BUTARGET}-as
- ${LN} -fs /usr/bin/${BUTARGET}-as ${STAGEDIR}/usr/bin/as
${MV} ${STAGEDIR}/usr/bin/ld ${STAGEDIR}/usr/bin/${BUTARGET}-ld
- ${LN} -fs /usr/bin/${BUTARGET}-ld ${STAGEDIR}/usr/bin/ld
${MV} ${STAGEDIR}/usr/bin/ld.bfd ${STAGEDIR}/usr/bin/${BUTARGET}-ld.bfd
- ${LN} -fs /usr/bin/${BUTARGET}-ld.bfd ${STAGEDIR}/usr/bin/ld.bfd
${MV} ${STAGEDIR}/usr/bin/objcopy ${STAGEDIR}/usr/bin/${BUTARGET}-objcopy
- ${LN} -fs /usr/bin/${BUTARGET}-objcopy ${STAGEDIR}/usr/bin/objcopy
${MV} ${STAGEDIR}/usr/bin/objdump ${STAGEDIR}/usr/bin/${BUTARGET}-objdump
- ${LN} -fs /usr/bin/${BUTARGET}-objdump ${STAGEDIR}/usr/bin/objdump
${MV} ${STAGEDIR}/${MANDIR}1/as.1 ${STAGEDIR}/${MANDIR}1/${BUTARGET}-as.1
${GZIP_CMD} ${STAGEDIR}/${MANDIR}1/${BUTARGET}-as.1
- ${LN} -fs ${BUTARGET}-as.1.gz ${STAGEDIR}/${MANDIR}1/as.1.gz
${MV} ${STAGEDIR}/${MANDIR}1/ld.1 ${STAGEDIR}/${MANDIR}1/${BUTARGET}-ld.1
${GZIP_CMD} ${STAGEDIR}/${MANDIR}1/${BUTARGET}-ld.1
- ${LN} -fs ${BUTARGET}-ld.1.gz ${STAGEDIR}/${MANDIR}1/ld.1.gz
${MV} ${STAGEDIR}/${MANDIR}1/objcopy.1 ${STAGEDIR}/${MANDIR}1/${BUTARGET}-objcopy.1
${GZIP_CMD} ${STAGEDIR}/${MANDIR}1/${BUTARGET}-objcopy.1
- ${LN} -fs ${BUTARGET}-objcopy.1.gz ${STAGEDIR}/${MANDIR}1/objcopy.1.gz
${MV} ${STAGEDIR}/${MANDIR}1/objdump.1 ${STAGEDIR}/${MANDIR}1/${BUTARGET}-objdump.1
${GZIP_CMD} ${STAGEDIR}/${MANDIR}1/${BUTARGET}-objdump.1
+.endif
+ ${LN} -fs /usr/bin/${BUTARGET}-as ${STAGEDIR}/usr/bin/as
+ ${LN} -fs /usr/bin/${BUTARGET}-ld ${STAGEDIR}/usr/bin/ld
+ ${LN} -fs /usr/bin/${BUTARGET}-ld.bfd ${STAGEDIR}/usr/bin/ld.bfd
+ ${LN} -fs /usr/bin/${BUTARGET}-objcopy ${STAGEDIR}/usr/bin/objcopy
+ ${LN} -fs /usr/bin/${BUTARGET}-objdump ${STAGEDIR}/usr/bin/objdump
+ ${LN} -fs ${BUTARGET}-as.1.gz ${STAGEDIR}/${MANDIR}1/as.1.gz
+ ${LN} -fs ${BUTARGET}-ld.1.gz ${STAGEDIR}/${MANDIR}1/ld.1.gz
+ ${LN} -fs ${BUTARGET}-objcopy.1.gz ${STAGEDIR}/${MANDIR}1/objcopy.1.gz
${LN} -fs ${BUTARGET}-objdump.1.gz ${STAGEDIR}/${MANDIR}1/objdump.1.gz
@${RM} -r ${STAGEDIR}${PREFIX}/include
@${RM} -r ${STAGEDIR}${PREFIX}/lib

File Metadata

Mime Type
text/plain
Expires
Sun, Feb 8, 9:42 AM (17 h, 22 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28468795
Default Alt Text
D19128.diff (3 KB)

Event Timeline