diff options
44 files changed, 77 insertions, 247 deletions
@@ -13456,3 +13456,17 @@ x11/xfwp||2019-11-06|Has expired: Deprecated upstream x11/xfindproxy||2019-11-06|Has expired: Deprecated upstream security/clamav-milter|security/clamav|2019-11-12|Now that MILTER option is enabled by default, use security/clamav instead graphics/py-vips|graphics/py-pyvips|2019-11-12|Rename for better naming +devel/aarch64-binutils|devel/binutils@aarch64|2019-11-05|Moved to a flavored version +devel/aarch64-none-elf-binutils|devel/binutils@aarch64_none_elf|2019-11-05|Moved to a flavored version +devel/amd64-binutils|devel/binutils@amd64|2019-11-05|Moved to a flavored version +devel/arm-gnueabi-binutils|devel/binutils@arm_gnueabi|2019-11-05|Moved to a flavored version +devel/arm-none-eabi-binutils|devel/binutils@arm_none_eabi|2019-11-05|Moved to a flavored version +devel/avr-binutils|devel/binutils@avr|2019-11-05|Moved to a flavored version +devel/i386-binutils|devel/binutils@i386|2019-11-05|Moved to a flavored version +devel/mingw32-binutils|devel/binutils@mingw32|2019-11-05|Moved to a flavored version +devel/mips-binutils|devel/binutils@mips|2019-11-05|Moved to a flavored version +devel/mips64-binutils|devel/binutils@mips64|2019-11-05|Moved to a flavored version +devel/powerpc64-binutils|devel/binutils@powerpc64|2019-11-05|Moved to a flavored version +devel/riscv64-binutils|devel/binutils@riscv64|2019-11-05|Moved to a flavored version +devel/s390x-binutils|devel/binutils@s390x|2019-11-05|Moved to a flavored version +devel/sparc64-binutils|devel/binutils@sparc64|2019-11-05|Moved to a flavored version diff --git a/devel/Makefile b/devel/Makefile index 80d4c741a220..674286341979 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -90,9 +90,7 @@ SUBDIR += RStudio SUBDIR += SpecTcl SUBDIR += aap - SUBDIR += aarch64-binutils SUBDIR += aarch64-gcc - SUBDIR += aarch64-none-elf-binutils SUBDIR += aarch64-none-elf-gcc SUBDIR += aarch64-xtoolchain-gcc SUBDIR += abi-compliance-checker @@ -112,7 +110,6 @@ SUBDIR += allegro SUBDIR += allegro-devel SUBDIR += alog - SUBDIR += amd64-binutils SUBDIR += amd64-gcc SUBDIR += amd64-xtoolchain-gcc SUBDIR += amqp-cpp @@ -159,8 +156,6 @@ SUBDIR += args SUBDIR += argtable SUBDIR += arm-elf-binutils - SUBDIR += arm-gnueabi-binutils - SUBDIR += arm-none-eabi-binutils SUBDIR += arm-none-eabi-gcc SUBDIR += arm-none-eabi-gcc492 SUBDIR += arm-none-eabi-gdb @@ -192,7 +187,6 @@ SUBDIR += avalon-framework SUBDIR += avarice SUBDIR += avce00 - SUBDIR += avr-binutils SUBDIR += avr-gcc SUBDIR += avr-gdb SUBDIR += avr-libc @@ -984,7 +978,6 @@ SUBDIR += hub SUBDIR += hwloc SUBDIR += hyperscan - SUBDIR += i386-binutils SUBDIR += i386-gcc SUBDIR += i386-xtoolchain-gcc SUBDIR += ice @@ -1547,7 +1540,6 @@ SUBDIR += mime SUBDIR += mimir SUBDIR += mingw32-bin-msvcrt - SUBDIR += mingw32-binutils SUBDIR += mingw32-directx SUBDIR += mingw32-gcc SUBDIR += mingw32-libffi @@ -1556,10 +1548,8 @@ SUBDIR += mingw32-pdcurses SUBDIR += mingw32-pthreads SUBDIR += mingw32-zlib - SUBDIR += mips-binutils SUBDIR += mips-gcc SUBDIR += mips-xtoolchain-gcc - SUBDIR += mips64-binutils SUBDIR += mips64-gcc SUBDIR += mips64-xtoolchain-gcc SUBDIR += mir-core @@ -3968,7 +3958,6 @@ SUBDIR += pmdk SUBDIR += poco SUBDIR += popt - SUBDIR += powerpc64-binutils SUBDIR += powerpc64-gcc SUBDIR += powerpc64-xtoolchain-gcc SUBDIR += poxml @@ -5393,7 +5382,6 @@ SUBDIR += replxx SUBDIR += resolv_wrapper SUBDIR += rhtvision - SUBDIR += riscv64-binutils SUBDIR += riscv64-gcc SUBDIR += riscv64-xtoolchain-gcc SUBDIR += rlog @@ -6365,7 +6353,6 @@ SUBDIR += rust-cbindgen SUBDIR += rvi SUBDIR += rvm - SUBDIR += s390x-binutils SUBDIR += sabre SUBDIR += safe-iop SUBDIR += samurai @@ -6426,7 +6413,6 @@ SUBDIR += sope4 SUBDIR += sord SUBDIR += sourcenav - SUBDIR += sparc64-binutils SUBDIR += sparc64-gcc SUBDIR += sparc64-xtoolchain-gcc SUBDIR += spark diff --git a/devel/aarch64-binutils/Makefile b/devel/aarch64-binutils/Makefile deleted file mode 100644 index 17733da0e19e..000000000000 --- a/devel/aarch64-binutils/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# $FreeBSD$ - -COMMENT= GNU binutils for AArch64 cross-development -PKGNAMEPREFIX= aarch64- -PLIST= ${.CURDIR}/pkg-plist - -BROKEN_mips= fails to configure: error: C compiler cannot create executables -BROKEN_mips64= fails to configure: error: C compiler cannot create executables -BROKEN_powerpc64= fails to configure: error: C compiler cannot create executables - -MASTERDIR= ${.CURDIR}/../binutils -OPTIONS_DEFAULT= STATIC - -.include "${MASTERDIR}/Makefile" diff --git a/devel/aarch64-none-elf-binutils/Makefile b/devel/aarch64-none-elf-binutils/Makefile deleted file mode 100644 index a47f81e383be..000000000000 --- a/devel/aarch64-none-elf-binutils/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $FreeBSD$ - -COMMENT= GNU binutils for bare metal AArch64 cross-development -PKGNAMEPREFIX= aarch64-none-elf- -BUTARGET= aarch64-none-elf -PLIST= ${.CURDIR}/pkg-plist - -MASTERDIR= ${.CURDIR}/../binutils - -.include "${MASTERDIR}/Makefile" diff --git a/devel/aarch64-none-elf-gcc/Makefile b/devel/aarch64-none-elf-gcc/Makefile index f4d58db408bd..56e803472a88 100644 --- a/devel/aarch64-none-elf-gcc/Makefile +++ b/devel/aarch64-none-elf-gcc/Makefile @@ -19,8 +19,8 @@ BROKEN_mips64= configure: error: cannot compute suffix of object files: cannot LIB_DEPENDS= libgmp.so:math/gmp \ libmpfr.so:math/mpfr \ libmpc.so:math/mpc -BUILD_DEPENDS= ${GCC_TARGET}-as:devel/${PKGNAMEPREFIX}binutils -RUN_DEPENDS= ${GCC_TARGET}-as:devel/${PKGNAMEPREFIX}binutils +BUILD_DEPENDS= ${GCC_TARGET}-as:devel/binutils@${PKGNAMEPREFIX:C/-$//:C/-/_/g} +RUN_DEPENDS= ${GCC_TARGET}-as:devel/binutils@${PKGNAMEPREFIX:C/-$//:C/-/_/g} USES= gmake iconv libtool tar:xz makeinfo compiler:c++11-lang diff --git a/devel/amd64-binutils/Makefile b/devel/amd64-binutils/Makefile deleted file mode 100644 index b746635fe631..000000000000 --- a/devel/amd64-binutils/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -COMMENT= GNU binutils for amd64 cross-development -PKGNAMEPREFIX= amd64- -PLIST= ${.CURDIR}/pkg-plist - -MASTERDIR= ${.CURDIR}/../binutils - -BUTARGET= x86_64-unknown-${OPSYS:tl}${OSREL} - -.include "${MASTERDIR}/Makefile" diff --git a/devel/arduino-tools/Makefile b/devel/arduino-tools/Makefile index 97630cc7d2e1..9e1ce9366ac5 100644 --- a/devel/arduino-tools/Makefile +++ b/devel/arduino-tools/Makefile @@ -15,7 +15,7 @@ LICENSE= BSD3CLAUSE RUN_DEPENDS= arduino-avrdude:devel/arduino-avrdude \ bossac:devel/bossa \ - avr-as:devel/avr-binutils \ + avr-as:devel/binutils@avr \ avr-gcc:devel/avr-gcc \ ${LOCALBASE}/avr/include/avr/io.h:devel/avr-libc \ gcc-arm-embedded>0:devel/gcc-arm-embedded \ diff --git a/devel/arm-gnueabi-binutils/Makefile b/devel/arm-gnueabi-binutils/Makefile deleted file mode 100644 index 4ae4892eda52..000000000000 --- a/devel/arm-gnueabi-binutils/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -COMMENT= GNU binutils for arm cross-development -PKGNAMEPREFIX= arm-gnueabi- -PLIST= ${.CURDIR}/pkg-plist - -MASTERDIR= ${.CURDIR}/../binutils - -.include "${MASTERDIR}/Makefile" diff --git a/devel/arm-none-eabi-binutils/Makefile b/devel/arm-none-eabi-binutils/Makefile deleted file mode 100644 index 5b0799f6356e..000000000000 --- a/devel/arm-none-eabi-binutils/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $FreeBSD$ - -COMMENT= GNU binutils for bare metal arm cross-development -PKGNAMEPREFIX= arm-none-eabi- -BUTARGET= arm-none-eabi -PLIST= ${.CURDIR}/pkg-plist - -MASTERDIR= ${.CURDIR}/../binutils - -.include "${MASTERDIR}/Makefile" diff --git a/devel/arm-none-eabi-gcc492/Makefile b/devel/arm-none-eabi-gcc492/Makefile index 278323182302..36f586ab52c0 100644 --- a/devel/arm-none-eabi-gcc492/Makefile +++ b/devel/arm-none-eabi-gcc492/Makefile @@ -17,8 +17,8 @@ LICENSE_COMB= multi LIB_DEPENDS= libgmp.so:math/gmp \ libmpfr.so:math/mpfr \ libmpc.so:math/mpc -BUILD_DEPENDS= ${BU_PREFIX}-as:devel/${PKGNAMEPREFIX}binutils -RUN_DEPENDS= ${BU_PREFIX}-as:devel/${PKGNAMEPREFIX}binutils +BUILD_DEPENDS= ${BU_PREFIX}-as:devel/binutils@${PKGNAMEPREFIX:C/-$//:C/-/_/g} +RUN_DEPENDS= ${BU_PREFIX}-as:devel/binutils@${PKGNAMEPREFIX:C/-$//:C/-/_/g} USES= compiler gmake iconv libtool makeinfo tar:bzip2 PLIST_SUB= TARGETARCH=${PKGNAMEPREFIX:C/-//g} \ diff --git a/devel/arm-none-eabi-newlib/Makefile b/devel/arm-none-eabi-newlib/Makefile index 39e5b26f194f..96507f4e7d7b 100644 --- a/devel/arm-none-eabi-newlib/Makefile +++ b/devel/arm-none-eabi-newlib/Makefile @@ -11,9 +11,9 @@ PKGNAMEPREFIX= ${NEWLIB_TARGET}- MAINTAINER= kevans@FreeBSD.org COMMENT= Newlib distribution for ${NEWLIB_TARGET} targets -BUILD_DEPENDS+= ${NEWLIB_TARGET}-ar:devel/${NEWLIB_TARGET}-binutils \ - ${NEWLIB_TARGET}-as:devel/${NEWLIB_TARGET}-binutils \ - ${NEWLIB_TARGET}-ld:devel/${NEWLIB_TARGET}-binutils \ +BUILD_DEPENDS+= ${NEWLIB_TARGET}-ar:devel/binutils@${NEWLIB_TARGET:C/-/_/g} \ + ${NEWLIB_TARGET}-as:devel/binutils@${NEWLIB_TARGET:C/-/_/g} \ + ${NEWLIB_TARGET}-ld:devel/binutils@${NEWLIB_TARGET:C/-/_/g} \ ${LOCALBASE}/bin/${NEWLIB_TARGET}-gcc:devel/${NEWLIB_TARGET}-gcc NEWLIB_TARGET?= arm-none-eabi diff --git a/devel/avr-binutils/Makefile b/devel/avr-binutils/Makefile deleted file mode 100644 index 797e1f84b768..000000000000 --- a/devel/avr-binutils/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# $FreeBSD$ - -MAINTAINER= joerg@FreeBSD.org - -COMMENT= GNU binutils for AVR cross-development -PKGNAMEPREFIX= avr- -BUTARGET= avr -PLIST= ${.CURDIR}/pkg-plist - -MASTERDIR= ${.CURDIR}/../binutils -PATCHDIR= ${.CURDIR}/files - -.include "${MASTERDIR}/Makefile" diff --git a/devel/avr-binutils/distinfo b/devel/avr-binutils/distinfo deleted file mode 100644 index 642e3ea78d48..000000000000 --- a/devel/avr-binutils/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (binutils-2.24.tar.bz2) = e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137 -SIZE (binutils-2.24.tar.bz2) = 22716802 diff --git a/devel/avr-binutils/pkg-descr b/devel/avr-binutils/pkg-descr deleted file mode 100644 index ccb3061e03c1..000000000000 --- a/devel/avr-binutils/pkg-descr +++ /dev/null @@ -1,13 +0,0 @@ -GNU binutils for Atmel AVR cross-development - -Prerequisite for the GCC for AVR cross-compilation environment. - -Still included is the "AVR COFF beta" patch. It allows avr-objcopy to -generate AVR (extended) COFF files to be used on Atmel AVR Studio and -VMLAB. Note that this patch has known issues, see -http://www.sax.de/~joerg/README.coff-avr-patch - -The support for additional devices has been synchronize with the -latest public Atmel AVR Tools package. - -WWW: http://www.sourceware.org/binutils/ diff --git a/devel/avr-gcc/Makefile b/devel/avr-gcc/Makefile index 7ea7b64cb344..8db0adf81d7f 100644 --- a/devel/avr-gcc/Makefile +++ b/devel/avr-gcc/Makefile @@ -15,14 +15,14 @@ LICENSE_COMB= multi BROKEN_aarch64= Fails to package: cannot find manpages BROKEN_mips64= Fails to configure: cannot compute suffix of object files -BUILD_DEPENDS= avr-as:devel/avr-binutils \ - avr-ld:devel/avr-binutils +BUILD_DEPENDS= avr-as:devel/binutils@avr \ + avr-ld:devel/binutils@avr LIB_DEPENDS= libmpfr.so:math/mpfr \ libgmp.so:math/gmp \ libmpc.so:math/mpc \ libisl.so:devel/isl -RUN_DEPENDS= avr-as:devel/avr-binutils \ - avr-ld:devel/avr-binutils +RUN_DEPENDS= avr-as:devel/binutils@avr \ + avr-ld:devel/binutils@avr USES= bison compiler:c++11-lang gmake iconv libtool localbase \ makeinfo perl5 tar:xz diff --git a/devel/avr-libc/Makefile b/devel/avr-libc/Makefile index bab8d479b7f8..87ed1e7ce197 100644 --- a/devel/avr-libc/Makefile +++ b/devel/avr-libc/Makefile @@ -14,11 +14,11 @@ COMMENT= C and math library for the Atmel AVR controller family LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= avr-as:devel/avr-binutils \ - avr-ld:devel/avr-binutils \ +BUILD_DEPENDS= avr-as:devel/binutils@avr \ + avr-ld:devel/binutils@avr \ avr-gcc:devel/avr-gcc -RUN_DEPENDS= avr-as:devel/avr-binutils \ - avr-ld:devel/avr-binutils \ +RUN_DEPENDS= avr-as:devel/binutils@avr \ + avr-ld:devel/binutils@avr \ avr-gcc:devel/avr-gcc OPTIONS_DEFINE= DOXYGEN diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile index 531f096c8786..0d18076f556a 100644 --- a/devel/binutils/Makefile +++ b/devel/binutils/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= binutils -PORTVERSION= 2.32 -PORTREVISION= 1 +PORTVERSION= 2.33.1 PORTEPOCH?= 1 CATEGORIES?= devel MASTER_SITES= SOURCEWARE/binutils/releases @@ -14,12 +13,15 @@ COMMENT?= GNU binary tools LICENSE= GPLv3 LGPL3 LICENSE_COMB= multi -.if defined(PREFIX) && ${PREFIX} != "/usr" +FLAVORS= native aarch64 aarch64_none_elf amd64 arm_gnueabi arm_none_eabi \ + avr i386 mingw32 mips mips64 powerpc64 riscv64 s390x sparc64 +FLAVOR?= native + +RELRO_CONFIGURE_ON= --enable-relro BUILD_DEPENDS= ${LOCALBASE}/lib/libgmp.so:math/gmp \ ${LOCALBASE}/lib/libmpfr.so:math/mpfr CONFLICTS= libbfd-[0-9]* -.endif #TEST_DEPENDS+= runtest:misc/dejagnu TEST_TARGET= check @@ -36,7 +38,19 @@ USES= bison:alias cpe gmake libtool tar:bzip2 compiler:env CPE_VENDOR= gnu GNU_CONFIGURE= yes -.if defined(PKGNAMEPREFIX) +RELRO_CONFIGURE_OFF= --enable-relro=no +OPTIONS_SUB= yes +NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls + +STATIC_LDFLAGS+= -all-static + +aarch64_COMMENT= GNU binutils for ${FLAVOR} development + +.if ${FLAVOR} != native +PKGNAMEPREFIX= ${FLAVOR:C/_/-/g}- +PLIST= ${PKGDIR}/pkg-plist-${FLAVOR:C/_/-/g} + .if ${PKGNAMEPREFIX:M*-*-} BUTARGET?= ${PKGNAMEPREFIX}${OPSYS:tl}${OSREL} .else @@ -45,9 +59,22 @@ BUTARGET?= ${PKGNAMEPREFIX}unknown-${OPSYS:tl}${OSREL} PLIST_SUB= BUTARGET=${BUTARGET} OPTIONS_EXCLUDE= NLS INFO_PATH= ${PKGNAMEPREFIX:S/-$//}/share/info + +.if ${FLAVOR} == aarch64 +BROKEN_mips= fails to configure: error: C compiler cannot create executables +BROKEN_mips64= fails to configure: error: C compiler cannot create executables +BROKEN_powerpc64= fails to configure: error: C compiler cannot create executables +.elif ${FLAVOR} == aarch64_none_elf || ${FLAVOR} == arm_none_eabi || ${FLAVOR} == mingw32 || ${FLAVOR} == avr +BUTARGET= ${FLAVOR:C/_/-/g} +.elif ${FLAVOR} == amd64 +BUTARGET= x86_64-unknown-${OPSYS:tl}${OSREL} +.endif + CONFIGURE_ARGS+= --disable-shared \ --target=${BUTARGET} -.else +.endif + +.if ${FLAVOR} == native BUREMOVE= coffdump \ dlltool \ dllwrap \ @@ -56,8 +83,7 @@ BUREMOVE= coffdump \ sysdump \ windmc \ windres -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +USES+= localbase CONFIGURE_ARGS+= --with-system-zlib \ --with-gmp=${LOCALBASE} \ --with-mpfr=${LOCALBASE} \ @@ -74,18 +100,10 @@ CONFIGURE_ARGS+= --disable-werror \ --enable-deterministic-archives \ --with-sysroot=/ \ --enable-x86-relax-relocations=no -RELRO_CONFIGURE_ON= --enable-relro -RELRO_CONFIGURE_OFF= --enable-relro=no MAKE_ENV+= ac_cv_func_sbrk=0 MAKE_ARGS+= LIBDL="" -OPTIONS_SUB= yes -NLS_USES= gettext -NLS_CONFIGURE_ENABLE= nls - -STATIC_LDFLAGS+= -all-static - .include <bsd.port.pre.mk> # Actual earliest version may differ slightly @@ -97,9 +115,9 @@ PLIST_SUB+= GOLD="" PLIST_SUB+= GOLD="@comment " .endif -.if ${ARCH} == "amd64" +.if ${ARCH} == amd64 CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL} -.elif ${ARCH} == "powerpcspe" +.elif ${ARCH} == powerpcspe CONFIGURE_TARGET= powerpc-portbld-freebsd${OSREL} .else CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} @@ -109,7 +127,7 @@ post-patch: ${REINPLACE_CMD} -e "s/-ldl//g" ${WRKSRC}/gold/testsuite/Makefile.in post-install: -.if !defined(PKGNAMEPREFIX) +.if ${FLAVOR} == native ${INSTALL_DATA} ${WRKSRC}/include/plugin-api.h ${STAGEDIR}${PREFIX}/include/ @${FIND} -ds ${STAGEDIR}${PREFIX}/${CONFIGURE_TARGET} ! -type d | \ ${SED} -e 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} @@ -122,34 +140,6 @@ post-install: ${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 - ${MV} ${STAGEDIR}/usr/bin/ld ${STAGEDIR}/usr/bin/${BUTARGET}-ld - ${MV} ${STAGEDIR}/usr/bin/ld.bfd ${STAGEDIR}/usr/bin/${BUTARGET}-ld.bfd - ${MV} ${STAGEDIR}/usr/bin/objcopy ${STAGEDIR}/usr/bin/${BUTARGET}-objcopy - ${MV} ${STAGEDIR}/usr/bin/objdump ${STAGEDIR}/usr/bin/${BUTARGET}-objdump - ${MV} ${STAGEDIR}/${MANDIR}1/as.1 ${STAGEDIR}/${MANDIR}1/${BUTARGET}-as.1 - ${GZIP_CMD} ${STAGEDIR}/${MANDIR}1/${BUTARGET}-as.1 - ${MV} ${STAGEDIR}/${MANDIR}1/ld.1 ${STAGEDIR}/${MANDIR}1/${BUTARGET}-ld.1 - ${GZIP_CMD} ${STAGEDIR}/${MANDIR}1/${BUTARGET}-ld.1 - ${MV} ${STAGEDIR}/${MANDIR}1/objcopy.1 ${STAGEDIR}/${MANDIR}1/${BUTARGET}-objcopy.1 - ${GZIP_CMD} ${STAGEDIR}/${MANDIR}1/${BUTARGET}-objcopy.1 - ${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 -.endif .endif .for tool in ${BUREMOVE} @${RM} ${STAGEDIR}${PREFIX}/bin/${BUTARGET}-${tool} \ diff --git a/devel/binutils/distinfo b/devel/binutils/distinfo index 723eb7088a15..da14f27ede73 100644 --- a/devel/binutils/distinfo +++ b/devel/binutils/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1549441338 -SHA256 (binutils-2.32.tar.bz2) = de38b15c902eb2725eac6af21183a5f34ea4634cb0bcef19612b50e5ed31072d -SIZE (binutils-2.32.tar.bz2) = 30782392 +TIMESTAMP = 1572946280 +SHA256 (binutils-2.33.1.tar.bz2) = 0cb4843da15a65a953907c96bad658283f3c4419d6bcc56bf2789db16306adb2 +SIZE (binutils-2.33.1.tar.bz2) = 32160315 diff --git a/devel/aarch64-binutils/pkg-plist b/devel/binutils/pkg-plist-aarch64 index 66712754a7aa..66712754a7aa 100644 --- a/devel/aarch64-binutils/pkg-plist +++ b/devel/binutils/pkg-plist-aarch64 diff --git a/devel/aarch64-none-elf-binutils/pkg-plist b/devel/binutils/pkg-plist-aarch64-none-elf index a9284ab28515..a9284ab28515 100644 --- a/devel/aarch64-none-elf-binutils/pkg-plist +++ b/devel/binutils/pkg-plist-aarch64-none-elf diff --git a/devel/amd64-binutils/pkg-plist b/devel/binutils/pkg-plist-amd64 index 66958eb7482d..66958eb7482d 100644 --- a/devel/amd64-binutils/pkg-plist +++ b/devel/binutils/pkg-plist-amd64 diff --git a/devel/arm-gnueabi-binutils/pkg-plist b/devel/binutils/pkg-plist-arm-gnueabi index 8721c1a6ebbd..8721c1a6ebbd 100644 --- a/devel/arm-gnueabi-binutils/pkg-plist +++ b/devel/binutils/pkg-plist-arm-gnueabi diff --git a/devel/arm-none-eabi-binutils/pkg-plist b/devel/binutils/pkg-plist-arm-none-eabi index 37d37fa818aa..37d37fa818aa 100644 --- a/devel/arm-none-eabi-binutils/pkg-plist +++ b/devel/binutils/pkg-plist-arm-none-eabi diff --git a/devel/avr-binutils/pkg-plist b/devel/binutils/pkg-plist-avr index 7afe562fdbf1..7afe562fdbf1 100644 --- a/devel/avr-binutils/pkg-plist +++ b/devel/binutils/pkg-plist-avr diff --git a/devel/i386-binutils/pkg-plist b/devel/binutils/pkg-plist-i386 index d21dfe4e6083..d21dfe4e6083 100644 --- a/devel/i386-binutils/pkg-plist +++ b/devel/binutils/pkg-plist-i386 diff --git a/devel/mingw32-binutils/pkg-plist b/devel/binutils/pkg-plist-mingw32 index b55afcdcb0c6..b55afcdcb0c6 100644 --- a/devel/mingw32-binutils/pkg-plist +++ b/devel/binutils/pkg-plist-mingw32 diff --git a/devel/mips-binutils/pkg-plist b/devel/binutils/pkg-plist-mips index 7b60e585d623..7b60e585d623 100644 --- a/devel/mips-binutils/pkg-plist +++ b/devel/binutils/pkg-plist-mips diff --git a/devel/mips64-binutils/pkg-plist b/devel/binutils/pkg-plist-mips64 index 7b60e585d623..7b60e585d623 100644 --- a/devel/mips64-binutils/pkg-plist +++ b/devel/binutils/pkg-plist-mips64 diff --git a/devel/powerpc64-binutils/pkg-plist b/devel/binutils/pkg-plist-powerpc64 index 72ff4ea014b8..72ff4ea014b8 100644 --- a/devel/powerpc64-binutils/pkg-plist +++ b/devel/binutils/pkg-plist-powerpc64 diff --git a/devel/riscv64-binutils/pkg-plist b/devel/binutils/pkg-plist-riscv64 index a61fc8d99576..a61fc8d99576 100644 --- a/devel/riscv64-binutils/pkg-plist +++ b/devel/binutils/pkg-plist-riscv64 diff --git a/devel/s390x-binutils/pkg-plist b/devel/binutils/pkg-plist-s390x index 891e13179e56..891e13179e56 100644 --- a/devel/s390x-binutils/pkg-plist +++ b/devel/binutils/pkg-plist-s390x diff --git a/devel/sparc64-binutils/pkg-plist b/devel/binutils/pkg-plist-sparc64 index e6bbc566c23c..e6bbc566c23c 100644 --- a/devel/sparc64-binutils/pkg-plist +++ b/devel/binutils/pkg-plist-sparc64 diff --git a/devel/i386-binutils/Makefile b/devel/i386-binutils/Makefile deleted file mode 100644 index fbb52eb3bcf2..000000000000 --- a/devel/i386-binutils/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -COMMENT= GNU binutils for i386 cross-development -PKGNAMEPREFIX= i386- -PLIST= ${.CURDIR}/pkg-plist - -MASTERDIR= ${.CURDIR}/../binutils - -.include "${MASTERDIR}/Makefile" diff --git a/devel/mingw32-binutils/Makefile b/devel/mingw32-binutils/Makefile deleted file mode 100644 index 9dbb77b5b070..000000000000 --- a/devel/mingw32-binutils/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# Created by: Lev Serebryakov <lev@serebryakov.spb.ru> -# $FreeBSD$ - -PORTEPOCH= 1 -PKGNAMEPREFIX= mingw32- - -MAINTAINER= cyberbotx@cyberbotx.com -COMMENT= GNU Binutils for Windows cross-development - -MASTERDIR= ${.CURDIR}/../binutils -PLIST= ${.CURDIR}/pkg-plist - -BUTARGET= ${PKGNAMEPREFIX:S/-$//} - -.include "${MASTERDIR}/Makefile" diff --git a/devel/mingw32-gcc/Makefile b/devel/mingw32-gcc/Makefile index 25bd0a6c2ca7..dc022fa0faaf 100644 --- a/devel/mingw32-gcc/Makefile +++ b/devel/mingw32-gcc/Makefile @@ -15,9 +15,9 @@ COMMENT= FSF gcc-4 for Windows cross-development LICENSE= GPLv3 GPLv3RLE LICENSE_COMB= multi -BUILD_DEPENDS= ${PKGNAMEPREFIX}as:devel/${PKGNAMEPREFIX}binutils \ +BUILD_DEPENDS= ${PKGNAMEPREFIX}as:devel/binutils@${PKGNAMEPREFIX:C/-$//} \ mingwm10.dll:devel/${PKGNAMEPREFIX}bin-msvcrt -RUN_DEPENDS= ${PKGNAMEPREFIX}as:devel/${PKGNAMEPREFIX}binutils +RUN_DEPENDS= ${PKGNAMEPREFIX}as:devel/binutils@${PKGNAMEPREFIX:C/-$//} LIB_DEPENDS= libgmp.so:math/gmp \ libmpfr.so:math/mpfr \ libmpc.so:math/mpc diff --git a/devel/mips-binutils/Makefile b/devel/mips-binutils/Makefile deleted file mode 100644 index 3214c5dab91a..000000000000 --- a/devel/mips-binutils/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -COMMENT= GNU binutils for mips cross-development -PKGNAMEPREFIX= mips- -PLIST= ${.CURDIR}/pkg-plist - -MASTERDIR= ${.CURDIR}/../binutils - -.include "${MASTERDIR}/Makefile" diff --git a/devel/mips64-binutils/Makefile b/devel/mips64-binutils/Makefile deleted file mode 100644 index 30687d7d11fa..000000000000 --- a/devel/mips64-binutils/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -COMMENT= GNU binutils for mips64 cross-development -PKGNAMEPREFIX= mips64- -PLIST= ${.CURDIR}/pkg-plist - -MASTERDIR= ${.CURDIR}/../binutils - -.include "${MASTERDIR}/Makefile" diff --git a/devel/powerpc64-binutils/Makefile b/devel/powerpc64-binutils/Makefile deleted file mode 100644 index 6e5ce10c2432..000000000000 --- a/devel/powerpc64-binutils/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -COMMENT= GNU binutils for powerpc64 cross-development -PKGNAMEPREFIX= powerpc64- -PLIST= ${.CURDIR}/pkg-plist - -MASTERDIR= ${.CURDIR}/../binutils - -.include "${MASTERDIR}/Makefile" diff --git a/devel/powerpc64-gcc/Makefile b/devel/powerpc64-gcc/Makefile index c854780e70ca..11bfeb81d038 100644 --- a/devel/powerpc64-gcc/Makefile +++ b/devel/powerpc64-gcc/Makefile @@ -16,8 +16,8 @@ LICENSE_COMB= multi LIB_DEPENDS= libgmp.so:math/gmp \ libmpfr.so:math/mpfr \ libmpc.so:math/mpc -BUILD_DEPENDS= ${BU_PREFIX}-as:devel/${PKGNAMEPREFIX}binutils -RUN_DEPENDS= ${BU_PREFIX}-as:devel/${PKGNAMEPREFIX}binutils +BUILD_DEPENDS= ${BU_PREFIX}-as:devel/binutils@${PKGNAMEPREFIX:C/-$//:C/-/_/g} +RUN_DEPENDS= ${BU_PREFIX}-as:devel/binutils@${PKGNAMEPREFIX:C/-$//:C/-/_/g} USES= gmake iconv libtool tar:xz makeinfo compiler:c++11-lang PLIST_SUB= TARGETARCH=${PKGNAMEPREFIX:C/-//g} \ diff --git a/devel/riscv64-binutils/Makefile b/devel/riscv64-binutils/Makefile deleted file mode 100644 index 00fa8a52aeaa..000000000000 --- a/devel/riscv64-binutils/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -COMMENT= GNU binutils for RISC-V cross-development -PKGNAMEPREFIX= riscv64- -PLIST= ${.CURDIR}/pkg-plist - -MASTERDIR= ${.CURDIR}/../binutils - -.include "${MASTERDIR}/Makefile" diff --git a/devel/riscv64-gcc/Makefile b/devel/riscv64-gcc/Makefile index 91d5fb597b6a..fbca1d4cfc51 100644 --- a/devel/riscv64-gcc/Makefile +++ b/devel/riscv64-gcc/Makefile @@ -12,8 +12,8 @@ COMMENT= Cross GNU Compiler Collection for ${PKGNAMEPREFIX:C/-//g} LICENSE= GPLv3 GPLv3RLE LICENSE_COMB= multi -BUILD_DEPENDS= ${PKGNAMEPREFIX}binutils>0:devel/${PKGNAMEPREFIX}binutils -RUN_DEPENDS= ${PKGNAMEPREFIX}binutils>0:devel/${PKGNAMEPREFIX}binutils +BUILD_DEPENDS= ${PKGNAMEPREFIX}binutils>0:devel/binutils@${PKGNAMEPREFIX:C/-$//} +RUN_DEPENDS= ${PKGNAMEPREFIX}binutils>0:devel/binutils@${PKGNAMEPREFIX:C/-$//} LIB_DEPENDS= libgmp.so:math/gmp \ libmpfr.so:math/mpfr \ libmpc.so:math/mpc diff --git a/devel/s390x-binutils/Makefile b/devel/s390x-binutils/Makefile deleted file mode 100644 index a9bd1cfe303d..000000000000 --- a/devel/s390x-binutils/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -COMMENT= GNU binutils for s390x cross-development -PKGNAMEPREFIX= s390x- -PLIST= ${.CURDIR}/pkg-plist - -MASTERDIR= ${.CURDIR}/../binutils - -.include "${MASTERDIR}/Makefile" diff --git a/devel/sope4/Makefile b/devel/sope4/Makefile index 3ade33d3f870..79f06ac665df 100644 --- a/devel/sope4/Makefile +++ b/devel/sope4/Makefile @@ -32,7 +32,7 @@ USE_GNUSTEP= base build USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} LLD_UNSAFE= yes # PR 230608 -CONFLICTS= sope2-[0-9]* sope3-[0-9]* +#CONFLICTS= sope2-[0-9]* sope3-[0-9]* SUB_LIST+= GNUSTEP_LOCAL_TOOLS=${GNUSTEP_LOCAL_TOOLS} \ GNUSTEP_MAKEFILES=${GNUSTEP_MAKEFILES} diff --git a/devel/sparc64-binutils/Makefile b/devel/sparc64-binutils/Makefile deleted file mode 100644 index 22623a0457c0..000000000000 --- a/devel/sparc64-binutils/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -COMMENT= GNU binutils for sparc64 cross-development -PKGNAMEPREFIX= sparc64- -PLIST= ${.CURDIR}/pkg-plist - -MASTERDIR= ${.CURDIR}/../binutils - -.include "${MASTERDIR}/Makefile" |