[129208] trunk/dports/lang/gcc5
ryandesign at macports.org
ryandesign at macports.org
Mon Dec 8 18:39:11 PST 2014
Revision: 129208
https://trac.macports.org/changeset/129208
Author: ryandesign at macports.org
Date: 2014-12-08 18:39:11 -0800 (Mon, 08 Dec 2014)
Log Message:
-----------
gcc5: update to 5-20141207; fix location (#45619) and name (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64219) of libgcj pkg-config file
Modified Paths:
--------------
trunk/dports/lang/gcc5/Portfile
Removed Paths:
-------------
trunk/dports/lang/gcc5/files/patch-isl-0.13.diff
Modified: trunk/dports/lang/gcc5/Portfile
===================================================================
--- trunk/dports/lang/gcc5/Portfile 2014-12-09 02:31:43 UTC (rev 129207)
+++ trunk/dports/lang/gcc5/Portfile 2014-12-09 02:39:11 UTC (rev 129208)
@@ -9,7 +9,7 @@
subport libgcc-devel {}
epoch 1
-version 5-20141130
+version 5-20141207
platforms darwin
categories lang
maintainers mww openmaintainer
@@ -31,8 +31,8 @@
distname gcc-${version}
use_bzip2 yes
-checksums rmd160 fd6c17fe61b9897b628159b320db91e894d404ad \
- sha256 64594948fcf710296e3b9dcb83bbd607338c819f88562a5f99ddfe8c6492faeb
+checksums rmd160 aa27f5ac0a2ff9b8dddf3f838b37dced01507068 \
+ sha256 2e9e0b678c0b690ea70c935d44172b2fcca44b30fb939b71d56e393f16d1f047
depends_lib port:cctools \
port:gmp \
@@ -49,10 +49,8 @@
# Handle OS X deployment targets correctly (GCC PR target/63810
# <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63810>).
-patchfiles macosx-version-min.patch
+patchfiles-append macosx-version-min.patch
-patchfiles-append patch-isl-0.13.diff
-
set major [lindex [split ${version} .-] 0]
platform darwin {
@@ -227,6 +225,8 @@
}
}
}
+ # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64219
+ move ${destroot}${prefix}/lib/${name}/pkgconfig/libgcj-${major}.0.pc ${destroot}${prefix}/lib/pkgconfig/libgcj-${major}.pc
}
select.group gcc
Deleted: trunk/dports/lang/gcc5/files/patch-isl-0.13.diff
===================================================================
--- trunk/dports/lang/gcc5/files/patch-isl-0.13.diff 2014-12-09 02:31:43 UTC (rev 129207)
+++ trunk/dports/lang/gcc5/files/patch-isl-0.13.diff 2014-12-09 02:39:11 UTC (rev 129208)
@@ -1,107 +0,0 @@
-Fix build with isl 0.13 and later.
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63801
---- gcc/graphite-interchange.c.orig 2014-11-12 12:28:36.000000000 -0600
-+++ gcc/graphite-interchange.c 2014-11-20 00:24:36.000000000 -0600
-@@ -30,13 +30,7 @@
- #include <isl/union_map.h>
- #include <isl/ilp.h>
- #include <isl/val.h>
--#if defined(__cplusplus)
--extern "C" {
--#endif
- #include <isl/val_gmp.h>
--#if defined(__cplusplus)
--}
--#endif
- #endif
-
- #include "system.h"
---- gcc/graphite-isl-ast-to-gimple.c.orig 2014-11-15 09:37:49.000000000 -0600
-+++ gcc/graphite-isl-ast-to-gimple.c 2014-11-20 00:26:15.000000000 -0600
-@@ -25,13 +25,7 @@
- #include <isl/map.h>
- #include <isl/union_map.h>
- #include <isl/ast_build.h>
--#if defined(__cplusplus)
--extern "C" {
--#endif
- #include <isl/val_gmp.h>
--#if defined(__cplusplus)
--}
--#endif
- #endif
-
- #include "system.h"
---- gcc/graphite-optimize-isl.c.orig 2014-11-15 09:37:49.000000000 -0600
-+++ gcc/graphite-optimize-isl.c 2014-11-20 00:50:22.000000000 -0600
-@@ -460,7 +460,7 @@
- if (flag_loop_unroll_jam && (i != (ScheduleDimensions - depth)))
- continue;
-
-- if (isl_band_member_is_zero_distance (Band, i))
-+ if (isl_band_member_is_coincident (Band, i))
- {
- isl_map *TileMap;
- isl_union_map *TileUMap;
-@@ -559,6 +559,7 @@
- {
-
- isl_schedule *schedule;
-+ isl_schedule_constraints *schedule_constraints;
- isl_union_set *domain;
- isl_union_map *validity, *proximity, *dependences;
- isl_union_map *schedule_map;
-@@ -574,11 +575,16 @@
-
- proximity = isl_union_map_copy (validity);
-
-+ schedule_constraints = isl_schedule_constraints_on_domain(domain);
-+ schedule_constraints = isl_schedule_constraints_set_proximity(schedule_constraints, proximity);
-+ schedule_constraints = isl_schedule_constraints_set_validity(schedule_constraints, isl_union_map_copy(validity));
-+ schedule_constraints = isl_schedule_constraints_set_coincidence(schedule_constraints, validity);
-+
- isl_options_set_schedule_max_constant_term (scop->ctx, CONSTANT_BOUND);
- isl_options_set_schedule_maximize_band_depth (scop->ctx, 1);
- isl_options_set_schedule_fuse (scop->ctx, ISL_SCHEDULE_FUSE_MIN);
- isl_options_set_on_error (scop->ctx, ISL_ON_ERROR_CONTINUE);
-- schedule = isl_union_set_compute_schedule (domain, validity, proximity);
-+ schedule = isl_schedule_constraints_compute_schedule(schedule_constraints);
- isl_options_set_on_error (scop->ctx, ISL_ON_ERROR_ABORT);
-
- if (!schedule)
---- gcc/graphite-poly.c.orig 2014-11-15 09:37:49.000000000 -0600
-+++ gcc/graphite-poly.c 2014-11-20 00:26:29.000000000 -0600
-@@ -29,13 +29,7 @@
- #include <isl/ilp.h>
- #include <isl/aff.h>
- #include <isl/val.h>
--#if defined(__cplusplus)
--extern "C" {
--#endif
- #include <isl/val_gmp.h>
--#if defined(__cplusplus)
--}
--#endif
- #endif
-
- #include "system.h"
---- gcc/graphite-sese-to-poly.c.orig 2014-11-10 14:32:31.000000000 -0600
-+++ gcc/graphite-sese-to-poly.c 2014-11-20 00:26:49.000000000 -0600
-@@ -27,17 +27,7 @@
- #include <isl/constraint.h>
- #include <isl/aff.h>
- #include <isl/val.h>
--/* For C++ linkage of C functions.
-- Missing from isl/val_gmp.h in isl 0.12 versions.
-- Appearing in isl/val_gmp.h in isl 0.13.
-- To be removed when passing to isl 0.13. */
--#if defined(__cplusplus)
--extern "C" {
--#endif
- #include <isl/val_gmp.h>
--#if defined(__cplusplus)
--}
--#endif
- #endif
-
- #include "system.h"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141208/fca223af/attachment.html>
More information about the macports-changes
mailing list