Index: head/lang/gcc/Makefile =================================================================== --- head/lang/gcc/Makefile (revision 384833) +++ head/lang/gcc/Makefile (revision 384834) @@ -1,164 +1,164 @@ # Created by: Gerald Pfeifer # $FreeBSD$ PORTNAME= gcc PORTVERSION= 4.8.4 -PORTREVISION= 2 +PORTREVISION= 1 CATEGORIES= lang java MASTER_SITES= ${MASTER_SITE_GCC} MASTER_SITE_SUBDIR= releases/gcc-${DISTVERSION} MAINTAINER= gerald@FreeBSD.org COMMENT= GNU Compiler Collection 4.8 LICENSE= GPLv3 GPLv3RLE LICENSE_COMB= multi LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp \ libmpfr.so:${PORTSDIR}/math/mpfr \ libmpc.so:${PORTSDIR}/math/mpc BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils RUN_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils .if defined(MAINTAINER_MODE) BUILD_DEPENDS+= runtest:${PORTSDIR}/misc/dejagnu .endif CONFLICTS= gcc48* CPE_VENDOR= gnu # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. DISTVERSION= ${PORTVERSION} GCC_VERSION= ${PORTVERSION:C/(.+)\.[0-9]{8}/\1/} SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/} ONLY_FOR_ARCHS= amd64 armv6 armv6hf i386 powerpc powerpc64 sparc64 USES= cpe gmake iconv libtool makeinfo perl5 tar:bzip2 USE_BINUTILS= yes USE_PERL5= build SSP_UNSAFE= yes PATCH_WRKSRC= ${SRCDIR} CONFIGURE_SCRIPT= ../${SRCDIR:S/${WRKDIR}\///}/configure OPTIONS_DEFINE= BOOTSTRAP OPTIONS_DEFINE_i386= JAVA OPTIONS_DEFINE_amd64= JAVA OPTIONS_DEFAULT_i386= JAVA OPTIONS_DEFAULT_amd64= JAVA OPTIONS_EXCLUDE_DragonFly= JAVA BOOTSTRAP_DESC= Build using a full bootstrap .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" # Override sys.mk including -O in CFLAGS which breaks libgomp building. CFLAGS:= ${CFLAGS:S/-O/-O2/g} . 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 SRCDIR= ${WRKDIR}/gcc-${DISTVERSION} WRKSRC= ${WRKDIR}/build TARGLIB= ${PREFIX}/lib/gcc${SUFFIX} LIBEXEC= ${PREFIX}/libexec/gcc${SUFFIX} GNU_CONFIGURE= 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:MJAVA} ECJ_JAR= ${LOCALBASE}/share/java/ecj-4.5.jar BUILD_DEPENDS+= ${ECJ_JAR}:${PORTSDIR}/lang/gcc-ecj45 \ zip:${PORTSDIR}/archivers/zip RUN_DEPENDS+= ${ECJ_JAR}:${PORTSDIR}/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 ${SRCDIR} ; contrib/gcc_update --touch @${RM} -f ${SRCDIR}/gcc/*/*.info* @${MKDIR} ${CONFIGURE_WRKSRC} .if defined(MAINTAINER_MODE) full-regression-test: build cd ${WRKSRC}; ${MAKE_CMD} -sk check \ ; ${SRCDIR}/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/gcc/files/patch-libgomp-posix-affinity =================================================================== --- head/lang/gcc/files/patch-libgomp-posix-affinity (revision 384833) +++ head/lang/gcc/files/patch-libgomp-posix-affinity (nonexistent) @@ -1,18 +0,0 @@ ---- libgomp/config/posix/affinity.c.orig 2015-04-26 05:29:27.925344000 -0700 -+++ libgomp/config/posix/affinity.c 2015-04-26 05:29:44.449277000 -0700 -@@ -26,6 +26,10 @@ - - #include "libgomp.h" - -+#ifdef __FreeBSD__ -+#include "../bsd/freebsd_affinity.c" -+#else -+ - void - gomp_init_affinity (void) - { -@@ -36,3 +40,4 @@ - { - (void) attr; - } -+#endif Property changes on: head/lang/gcc/files/patch-libgomp-posix-affinity ___________________________________________________________________ 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/gcc/files/patch-libgomp-freebsd-affinity =================================================================== --- head/lang/gcc/files/patch-libgomp-freebsd-affinity (revision 384833) +++ head/lang/gcc/files/patch-libgomp-freebsd-affinity (nonexistent) @@ -1,117 +0,0 @@ ---- libgomp/config/bsd/freebsd_affinity.c.orig 2015-04-26 05:29:16.795040000 -0700 -+++ libgomp/config/bsd/freebsd_affinity.c 2015-04-26 05:29:03.462728000 -0700 -@@ -0,0 +1,114 @@ -+/* Copyright (C) 2015 Free Software Foundation, Inc. -+ Contributed by Adrian Chadd . -+ Based on work by Jakub Jelinek . -+ -+ This file is part of the GNU OpenMP Library (libgomp). -+ -+ Libgomp is free software; you can redistribute it and/or modify it -+ under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 3, or (at your option) -+ any later version. -+ -+ Libgomp is distributed in the hope that it will be useful, but WITHOUT ANY -+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -+ FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ more details. -+ -+ Under Section 7 of GPL version 3, you are granted additional -+ permissions described in the GCC Runtime Library Exception, version -+ 3.1, as published by the Free Software Foundation. -+ -+ You should have received a copy of the GNU General Public License and -+ a copy of the GCC Runtime Library Exception along with this program; -+ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see -+ . */ -+ -+/* This is a FreeBSD specific implementation of a CPU affinity setting. */ -+ -+#include "libgomp.h" -+ -+#include -+#include -+#include -+#include -+ -+static unsigned int affinity_counter; -+ -+void -+gomp_init_affinity (void) -+{ -+ cpuset_t cpuset, cpusetnew; -+ size_t idx, widx; -+ unsigned long cpus = 0; -+ -+ if (pthread_getaffinity_np (pthread_self (), sizeof (cpuset), &cpuset)) -+ { -+ gomp_error ("could not get CPU affinity set"); -+ free (gomp_cpu_affinity); -+ gomp_cpu_affinity = NULL; -+ gomp_cpu_affinity_len = 0; -+ return; -+ } -+ -+ CPU_ZERO (&cpusetnew); -+ if (gomp_cpu_affinity_len == 0) -+ { -+ unsigned long count = CPU_COUNT(&cpuset); -+ if (count >= 65536) -+ count = 65536; -+ gomp_cpu_affinity = malloc (count * sizeof (unsigned short)); -+ if (gomp_cpu_affinity == NULL) -+ { -+ gomp_error ("not enough memory to store CPU affinity list"); -+ return; -+ } -+ for (widx = idx = 0; widx < count && idx < 65536; idx++) -+ if (CPU_ISSET (idx, &cpuset)) -+ { -+ cpus++; -+ gomp_cpu_affinity[widx++] = idx; -+ } -+ } -+ else -+ for (widx = idx = 0; idx < gomp_cpu_affinity_len; idx++) -+ if (gomp_cpu_affinity[idx] < CPU_SETSIZE -+ && CPU_ISSET (gomp_cpu_affinity[idx], &cpuset)) -+ { -+ if (! CPU_ISSET (gomp_cpu_affinity[idx], &cpusetnew)) -+ { -+ cpus++; -+ CPU_SET (gomp_cpu_affinity[idx], &cpusetnew); -+ } -+ gomp_cpu_affinity[widx++] = gomp_cpu_affinity[idx]; -+ } -+ -+ if (widx == 0) -+ { -+ gomp_error ("no CPUs left for affinity setting"); -+ free (gomp_cpu_affinity); -+ gomp_cpu_affinity = NULL; -+ gomp_cpu_affinity_len = 0; -+ return; -+ } -+ -+ gomp_cpu_affinity_len = widx; -+ if (cpus < gomp_available_cpus) -+ gomp_available_cpus = cpus; -+ CPU_ZERO (&cpuset); -+ CPU_SET (gomp_cpu_affinity[0], &cpuset); -+ pthread_setaffinity_np (pthread_self (), sizeof (cpuset), &cpuset); -+ affinity_counter = 1; -+} -+ -+void -+gomp_init_thread_affinity (pthread_attr_t *attr) -+{ -+ unsigned int cpu; -+ cpuset_t cpuset; -+ -+ cpu = __atomic_fetch_add (&affinity_counter, 1, MEMMODEL_RELAXED); -+ cpu %= gomp_cpu_affinity_len; -+ CPU_ZERO (&cpuset); -+ CPU_SET (gomp_cpu_affinity[cpu], &cpuset); -+ pthread_attr_setaffinity_np (attr, sizeof (cpuset_t), &cpuset); -+} Property changes on: head/lang/gcc/files/patch-libgomp-freebsd-affinity ___________________________________________________________________ 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