Index: head/lang/gcc5/Makefile =================================================================== --- head/lang/gcc5/Makefile (revision 416462) +++ head/lang/gcc5/Makefile (revision 416463) @@ -1,174 +1,174 @@ # Created by: Gerald Pfeifer # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 5.3.0 +PORTVERSION= 5.4.0 CATEGORIES= lang java MASTER_SITES= GCC/releases/gcc-${DISTVERSION} PKGNAMESUFFIX= ${SUFFIX} MAINTAINER= gerald@FreeBSD.org COMMENT= GNU Compiler Collection 5 LICENSE= GPLv3 GPLv3RLE LICENSE_COMB= multi LIB_DEPENDS= libgmp.so:math/gmp \ libmpfr.so:math/mpfr \ libmpc.so:math/mpc BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils RUN_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils .if defined(MAINTAINER_MODE) BUILD_DEPENDS+= runtest:misc/dejagnu .endif CPE_VENDOR= gnu CPE_VERSION= ${GCC_VERSION} # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. A PORTVERSION of # Y.2.1.s20140817 results in values of Y-20140817, Y.2.1, and Y # for these three. DISTVERSION= ${PORTVERSION:C/([0-9]+).*\.s([0-9]+)/\1-\2/} GCC_VERSION= ${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/} SUFFIX= ${PORTVERSION:C/([0-9]+).*/\1/} ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 sparc64 arm armv6 armv6hf USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2 USE_BINUTILS= yes USE_PERL5= build SSP_UNSAFE= yes OPTIONS_DEFINE= BOOTSTRAP GRAPHITE OPTIONS_DEFINE_i386= JAVA OPTIONS_DEFINE_amd64= JAVA OPTIONS_DEFAULT= BOOTSTRAP OPTIONS_DEFAULT_i386= JAVA OPTIONS_DEFAULT_amd64= JAVA OPTIONS_EXCLUDE_DragonFly= JAVA BOOTSTRAP_DESC= Build using a full bootstrap GRAPHITE_DESC= Support for Graphite loop optimizations .if exists(/usr/lib32/libc.so) OPTIONS_DEFINE_powerpc64= MULTILIB OPTIONS_DEFAULT_powerpc64= MULTILIB MULTILIB_DESC= Build support for 32-bit and 64-bit targets MULTILIB_CONFIGURE_ENABLE= multilib .else CONFIGURE_ARGS+= --disable-multilib .endif .include .if ${ARCH} == "amd64" CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL} .else CONFIGURE_TARGET= ${ARCH}-portbld-${OPSYS:tl}${OSREL} .endif .if ${ARCH} == powerpc64 CONFIGURE_ENV+= UNAME_m="powerpc64" .endif .if ${ARCH} == "armv6" || ${ARCH} == "armv6hf" . if ${COMPILER_TYPE} == clang . if empty(PORT_OPTIONS:MBOOTSTRAP) MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512 . else MAKE_ARGS+=STAGE1_CXXFLAGS=-fbracket-depth=512 . endif . endif .endif LANGUAGES:= c,c++,objc,fortran TARGLIB= ${PREFIX}/lib/gcc${SUFFIX} LIBEXEC= ${PREFIX}/libexec/gcc${SUFFIX} GNU_CONFIGURE= yes CONFIGURE_OUTSOURCE= yes .if empty(PORT_OPTIONS:MBOOTSTRAP) CONFIGURE_ARGS+=--disable-bootstrap .else CONFIGURE_ARGS+=--with-build-config=bootstrap-debug ALL_TARGET= bootstrap-lean .endif CONFIGURE_ARGS+=--disable-nls \ --enable-gnu-indirect-function \ --libdir=${TARGLIB} \ --libexecdir=${LIBEXEC} \ --program-suffix=${SUFFIX} \ --with-as=${LOCALBASE}/bin/as \ --with-gmp=${LOCALBASE} \ --with-gxx-include-dir=${TARGLIB}/include/c++/ \ --with-ld=${LOCALBASE}/bin/ld \ ${ICONV_CONFIGURE_ARG} \ --with-pkgversion="FreeBSD Ports Collection" \ --with-system-zlib MAKE_ARGS+= MAKEINFOFLAGS="--no-split" USE_LDCONFIG= ${TARGLIB} PLIST_SUB= GCC_VERSION=${GCC_VERSION} \ GNU_HOST=${CONFIGURE_TARGET} \ SUFFIX=${SUFFIX} INFO= gcc${SUFFIX}/cpp \ gcc${SUFFIX}/cppinternals \ gcc${SUFFIX}/gcc \ gcc${SUFFIX}/gccinstall \ gcc${SUFFIX}/gccint \ gcc${SUFFIX}/gfortran \ gcc${SUFFIX}/libgomp # Release tarballs (as opposed to snapshots) always carry this. #.if ${ARCH} == "i386" || ${ARCH} == "amd64" INFO+= gcc${SUFFIX}/libquadmath \ gcc${SUFFIX}/libitm #.endif SUB_FILES= pkg-message SUB_LIST+= TARGLIB=${TARGLIB} .if ${PORT_OPTIONS:MGRAPHITE} LIB_DEPENDS+= libisl.so:devel/isl CONFIGURE_ARGS+=--with-isl=${LOCALBASE} .endif .if ${PORT_OPTIONS:MJAVA} ECJ_JAR= ${LOCALBASE}/share/java/ecj-4.5.jar BUILD_DEPENDS+= ${ECJ_JAR}:lang/gcc-ecj45 \ zip:archivers/zip RUN_DEPENDS+= ${ECJ_JAR}:lang/gcc-ecj45 EXTRA_PATCHES+= ${FILESDIR}/java-patch-hier CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR} LANGUAGES:= ${LANGUAGES},java INFO+= gcc${SUFFIX}/cp-tools \ gcc${SUFFIX}/gcj PLIST_SUB+= JAVA="" .else CONFIGURE_ARGS+=--disable-libgcj PLIST_SUB+= JAVA="@comment " .endif CONFIGURE_ARGS+=--enable-languages=${LANGUAGES} pre-everything:: @${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]" pre-configure: cd ${WRKSRC} ; contrib/gcc_update --touch @${RM} -f ${WRKSRC}/gcc/*/*.info* .if defined(MAINTAINER_MODE) full-regression-test: build cd ${TEST_WRKSRC}; ${MAKE_CMD} -sk check \ ; ${WRKSRC}/contrib/test_summary .endif post-stage: ${RM} -f ${STAGEDIR}${PREFIX}/man/man7/* ${RM} -f ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \ ${STAGEDIR}${PREFIX}/man/man1/rebuild-gcj-db${SUFFIX}.1 # Add target libraries and include files to packaging list. ${RM} -f ${WRKDIR}/PLIST.lib .for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax cd ${STAGEDIR}${PREFIX} ; if [ -d $d ]; then \ ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\ fi .endfor cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST} .include Index: head/lang/gcc5/distinfo =================================================================== --- head/lang/gcc5/distinfo (revision 416462) +++ head/lang/gcc5/distinfo (revision 416463) @@ -1,2 +1,3 @@ -SHA256 (gcc-5.3.0.tar.bz2) = b84f5592e9218b73dbae612b5253035a7b34a9a1f7688d2e1bfaaf7267d5c4db -SIZE (gcc-5.3.0.tar.bz2) = 95441837 +TIMESTAMP = 1464965789 +SHA256 (gcc-5.4.0.tar.bz2) = 608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a +SIZE (gcc-5.4.0.tar.bz2) = 95661481 Index: head/lang/gcc5/files/patch-gcc-freebsd-powerpc64 =================================================================== --- head/lang/gcc5/files/patch-gcc-freebsd-powerpc64 (revision 416462) +++ head/lang/gcc5/files/patch-gcc-freebsd-powerpc64 (nonexistent) @@ -1,79 +0,0 @@ ---- gcc/config/rs6000/freebsd64.h.orig 2015-12-23 21:56:41.030016000 +0100 -+++ gcc/config/rs6000/freebsd64.h 2015-12-23 21:56:28.343015000 +0100 -@@ -65,6 +65,13 @@ - #define INVALID_64BIT "-m%s not supported in this configuration" - #define INVALID_32BIT INVALID_64BIT - -+/* Use LINUX64 instead of FREEBSD64 for compat with e.g. sysv4le.h */ -+#ifdef LINUX64_DEFAULT_ABI_ELFv2 -+#define ELFv2_ABI_CHECK (rs6000_elf_abi != 1) -+#else -+#define ELFv2_ABI_CHECK (rs6000_elf_abi == 2) -+#endif -+ - #undef SUBSUBTARGET_OVERRIDE_OPTIONS - #define SUBSUBTARGET_OVERRIDE_OPTIONS \ - do \ -@@ -84,6 +91,12 @@ - rs6000_isa_flags &= ~OPTION_MASK_RELOCATABLE; \ - error (INVALID_64BIT, "relocatable"); \ - } \ -+ if (ELFv2_ABI_CHECK) \ -+ { \ -+ rs6000_current_abi = ABI_ELFv2; \ -+ if (dot_symbols) \ -+ error ("-mcall-aixdesc incompatible with -mabi=elfv2"); \ -+ } \ - if (rs6000_isa_flags & OPTION_MASK_EABI) \ - { \ - rs6000_isa_flags &= ~OPTION_MASK_EABI; \ -@@ -154,22 +167,7 @@ - { "link_os_freebsd_spec32", LINK_OS_FREEBSD_SPEC32 }, \ - { "link_os_freebsd_spec64", LINK_OS_FREEBSD_SPEC64 }, - --#define FREEBSD_DYNAMIC_LINKER32 "/libexec/ld-elf32.so.1" --#define FREEBSD_DYNAMIC_LINKER64 "/libexec/ld-elf.so.1" -- --#define LINK_OS_FREEBSD_SPEC_DEF32 "\ -- %{p:%nconsider using `-pg' instead of `-p' with gprof(1)} \ -- %{v:-V} \ -- %{assert*} %{R*} %{rpath*} %{defsym*} \ -- %{shared:-Bshareable %{h*} %{soname*}} \ -- %{!shared: \ -- %{!static: \ -- %{rdynamic: -export-dynamic} \ -- %{!dynamic-linker:-dynamic-linker " FREEBSD_DYNAMIC_LINKER32 "}} \ -- %{static:-Bstatic}} \ -- %{symbolic:-Bsymbolic}" -- --#define LINK_OS_FREEBSD_SPEC_DEF64 "\ -+#define LINK_OS_FREEBSD_SPEC_DEF "\ - %{p:%nconsider using `-pg' instead of `-p' with gprof(1)} \ - %{v:-V} \ - %{assert*} %{R*} %{rpath*} %{defsym*} \ -@@ -177,13 +175,13 @@ - %{!shared: \ - %{!static: \ - %{rdynamic: -export-dynamic} \ -- %{!dynamic-linker:-dynamic-linker " FREEBSD_DYNAMIC_LINKER64 "}} \ -+ %{!dynamic-linker:-dynamic-linker " FBSD_DYNAMIC_LINKER "}} \ - %{static:-Bstatic}} \ - %{symbolic:-Bsymbolic}" - --#define LINK_OS_FREEBSD_SPEC32 "-melf32ppc_fbsd " LINK_OS_FREEBSD_SPEC_DEF32 -+#define LINK_OS_FREEBSD_SPEC32 "-melf32ppc_fbsd " LINK_OS_FREEBSD_SPEC_DEF - --#define LINK_OS_FREEBSD_SPEC64 "-melf64ppc_fbsd " LINK_OS_FREEBSD_SPEC_DEF64 -+#define LINK_OS_FREEBSD_SPEC64 "-melf64ppc_fbsd " LINK_OS_FREEBSD_SPEC_DEF - - #undef MULTILIB_DEFAULTS - #define MULTILIB_DEFAULTS { "m64" } -@@ -304,7 +302,7 @@ - - /* rs6000.h gets this wrong for FreeBSD. We use the GCC defaults instead. */ - #undef WCHAR_TYPE --#define WCHAR_TYPE (TARGET_64BIT ? "int" : "long int") -+ - #undef WCHAR_TYPE_SIZE - #define WCHAR_TYPE_SIZE 32 - Property changes on: head/lang/gcc5/files/patch-gcc-freebsd-powerpc64 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/lang/gcc5/files/patch-build-without-bootstrap =================================================================== --- head/lang/gcc5/files/patch-build-without-bootstrap (revision 416462) +++ head/lang/gcc5/files/patch-build-without-bootstrap (nonexistent) @@ -1,25 +0,0 @@ ---- UTC -Index: Makefile.def -=================================================================== ---- Makefile.def (revision 230942) -+++ Makefile.def (working copy) -@@ -534,6 +534,7 @@ - // on libgcc and newlib/libgloss. - lang_env_dependencies = { module=libjava; cxx=true; }; - lang_env_dependencies = { module=libitm; cxx=true; }; -+lang_env_dependencies = { module=libffi; cxx=true; }; - lang_env_dependencies = { module=libcilkrts; cxx=true; }; - lang_env_dependencies = { module=liboffloadmic; cxx=true; }; - lang_env_dependencies = { module=newlib; no_c=true; }; -Index: Makefile.in -=================================================================== ---- Makefile.in (revision 230942) -+++ Makefile.in (working copy) -@@ -51034,6 +51034,7 @@ - - - configure-target-libffi: maybe-all-target-newlib maybe-all-target-libgloss -+configure-target-libffi: maybe-all-target-libstdc++-v3 - - configure-target-libjava: maybe-all-target-newlib maybe-all-target-libgloss - configure-target-libjava: maybe-all-target-libstdc++-v3 Property changes on: head/lang/gcc5/files/patch-build-without-bootstrap ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property