[149944] trunk/dports/science/gildas
smaret at macports.org
smaret at macports.org
Wed Jul 6 05:39:14 PDT 2016
Revision: 149944
https://trac.macports.org/changeset/149944
Author: smaret at macports.org
Date: 2016-07-06 05:39:14 -0700 (Wed, 06 Jul 2016)
Log Message:
-----------
gildas: Update to version 201607a.
Modified Paths:
--------------
trunk/dports/science/gildas/Portfile
trunk/dports/science/gildas/files/patch-admin-define-system.sh.diff
Modified: trunk/dports/science/gildas/Portfile
===================================================================
--- trunk/dports/science/gildas/Portfile 2016-07-06 10:45:48 UTC (rev 149943)
+++ trunk/dports/science/gildas/Portfile 2016-07-06 12:39:14 UTC (rev 149944)
@@ -6,7 +6,7 @@
PortGroup active_variants 1.1
name gildas
-version 201606a
+version 201607a
set my_version [string tolower [clock format [clock scan 2000-[string range ${version} 4 5]-10] -format %b]][string range ${version} 2 3][string range ${version} 6 end]
categories science
platforms darwin
@@ -30,8 +30,8 @@
master_sites http://www.iram.fr/~gildas/dist/
distname ${name}-src-${my_version}
-checksums rmd160 748d9faf6318db1dcea9cb84ea48790b925a8289 \
- sha256 7043db2fbca6144d714aaaf23aa4c5a7932ca2fd9d79d274286f78a470acd141
+checksums rmd160 51ba52418527dfbeb3a3712dbbec83aeda6b956b \
+ sha256 91a81826875d5624e783fd53a95f62717c45076710205126fab062cadad73060
patch.pre_args -p1
patchfiles patch-admin-Makefile.def.diff \
Modified: trunk/dports/science/gildas/files/patch-admin-define-system.sh.diff
===================================================================
--- trunk/dports/science/gildas/files/patch-admin-define-system.sh.diff 2016-07-06 10:45:48 UTC (rev 149943)
+++ trunk/dports/science/gildas/files/patch-admin-define-system.sh.diff 2016-07-06 12:39:14 UTC (rev 149944)
@@ -1,7 +1,21 @@
---- gildas-src-may15a/admin/define-system.sh.orig 2014-12-09 11:31:56.000000000 +0100
-+++ gildas-src-may15a/admin/define-system.sh 2015-05-26 10:30:40.000000000 +0200
-@@ -213,8 +213,8 @@
+--- gildas-src-jul16a/admin/define-system.sh.orig 2016-07-01 15:43:55.000000000 +0200
++++ gildas-src-jul16a/admin/define-system.sh 2016-07-01 15:59:36.000000000 +0200
+@@ -218,18 +218,18 @@
+ else
+ GAG_MACHINE=pc
+ fi
+- if which gcc > /dev/null 2>&1; then
+- DEFAULT_CCOMPILER=gcc
++ if which @CC@ > /dev/null 2>&1; then
++ DEFAULT_CCOMPILER=@CC@
fi
+- if which g++ > /dev/null 2>&1; then
+- DEFAULT_CXXCOMPILER=g++
++ if which @CXX@ > /dev/null 2>&1; then
++ DEFAULT_CXXCOMPILER=@CXX@
+ elif which clang++ > /dev/null 2>&1; then
+ DEFAULT_CXXCOMPILER=clang++
+ fi
if which ifort > /dev/null 2>&1; then
DEFAULT_FCOMPILER=ifort
- elif which gfortran > /dev/null 2>&1; then
@@ -11,7 +25,7 @@
fi
fi ;;
CYGWIN*)
-@@ -375,10 +375,12 @@
+@@ -439,10 +439,12 @@
fi
fi
#
@@ -20,19 +34,17 @@
if [ "$CPP_VERSION" ">" "4.7.9" ]; then
# See http://gcc.gnu.org/gcc-4.8/porting_to.html
GAG_COMPILER_CPPFLAGS="$GAG_COMPILER_CPPFLAGS -ffreestanding"
-+ elif [ "$CPP_VERSION" != "${CPP_VERSION/clang/}" ]; then
++ elif [ "$CPP_VERSION" != "${CPP_VERSION/clang/}" ]; then
+ GAG_COMPILER_CPPFLAGS="$GAG_COMPILER_CPPFLAGS -ffreestanding"
fi
#
export GAG_COMPILER_FFLAGS GAG_COMPILER_FLIBS GAG_COMPILER_CPPFLAGS
---- gildas-src-may15a/admin/define-system.sh.orig 2015-05-27 10:53:14.000000000 +0200
-+++ gildas-src-may15a/admin/define-system.sh 2015-05-27 10:53:29.000000000 +0200
-@@ -403,7 +403,7 @@
+@@ -465,7 +467,7 @@
# source admin/gildas-env.sh -c ifort (use default ifort e.g. ifort 11) and
# source admin/gildas-env.sh -c ifort14 (i.e. use namely non default ifort 14)
# does not build their binaries in the same integration branch.
- GAG_EXEC_SYSTEM=$GAG_MACHINE-$GAG_TARGET_VERS-$GAG_COMPILER_FEXE$GAG_CONFIG
+ GAG_EXEC_SYSTEM=$GAG_MACHINE-$GAG_TARGET_VERS-$GAG_COMPILER_FKIND$GAG_CONFIG
export GAG_COMP_SYSTEM GAG_EXEC_SYSTEM
- export GAG_MACHINE GAG_OS_KIND GAG_OS_VERS GAG_CONFIG
- export GAG_COMPILER_CKIND GAG_COMPILER_CEXE
+ export GAG_MACHINE GAG_CONFIG
+ export GAG_ENV_KIND GAG_ENV_VERS
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160706/af0427b1/attachment-0001.html>
More information about the macports-changes
mailing list