Re: [macports-ports] branch master updated: g95: fix build error, closing #52990

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: [macports-ports] branch master updated: g95: fix build error, closing #52990

mf2k
Hi Takeshi,


On Jul 16, 2017, at 2:00 AM, Takeshi Enomoto <[hidden email]> wrote:

Takeshi Enomoto (tenomoto) pushed a commit to branch master
in repository macports-ports.

https://github.com/macports/macports-ports/commit/0c117cac980b5c189b1b033652def0ece0c51a81

The following commit(s) were added to refs/heads/master by this push:
     new 0c117ca  g95: fix build error, closing #52990
0c117ca is described below

commit 0c117cac980b5c189b1b033652def0ece0c51a81
Author: Takeshi Enomoto <[hidden email]>
AuthorDate: Sun Jul 16 16:58:12 2017 +0900

    g95: fix build error, closing #52990
With the switch to GitHub, using “#52990” in the commit message no longer works as a link to that ticket. Instead you should change it to the complete URL and put it on a new line. Like this:

g95: fix build error


Then the ticket will be closed automatically with a link to the commit. 

Also, using “See: https://trac.macports.org/ticket/52990” would automatically add a comment to the ticket with the commit but without closing the ticket. 


Cheers!
Frank
---
 lang/g95/Portfile                           |  4 ++--
 lang/g95/files/patch-libf95-math-x87.S.diff | 12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/lang/g95/Portfile b/lang/g95/Portfile
index 77da2ad..5b95c59 100644
--- a/lang/g95/Portfile
+++ b/lang/g95/Portfile
@@ -5,7 +5,7 @@ PortGroup		compiler_blacklist_versions 1.0
 
 name            g95
 version         0.93
-revision        4
+revision        5
 platforms       darwin
 categories      lang
 license         GPL-2
@@ -97,7 +97,7 @@ compiler.blacklist-append   {clang < 500}
 configure.cflags-append -std=gnu89
 pre-configure {
     file mkdir ${workpath}/gcc-${version_gcc}/${name}
-    reinplace "s|tjmp %%edx|tjmp *%%edx|" ${workpath}/gcc-${version_gcc}/gcc/config/i386/i386.c
+#    reinplace "s|tjmp %%edx|tjmp *%%edx|" ${workpath}/gcc-${version_gcc}/gcc/config/i386/i386.c
     if {${build_arch} eq "i386"} {
         reinplace "s|i686|i386|" ${workpath}/gcc-${version_gcc}/gcc/config/i386/darwin.h
     }
diff --git a/lang/g95/files/patch-libf95-math-x87.S.diff b/lang/g95/files/patch-libf95-math-x87.S.diff
index f58bb4b..6a2a5f5 100644
--- a/lang/g95/files/patch-libf95-math-x87.S.diff
+++ b/lang/g95/files/patch-libf95-math-x87.S.diff
@@ -1,5 +1,15 @@
 --- libf95.a-0.93/math/x87.S.orig	2010-04-05 03:49:02.000000000 +0900
-+++ libf95.a-0.93/math/x87.S	2014-10-18 13:08:16.000000000 +0900
++++ libf95.a-0.93/math/x87.S	2017-07-16 16:01:49.000000000 +0900
+@@ -1,7 +1,7 @@
+-
++/*
+ ## Some of the code here is transliterated from the x87 glibc code
+ ## originally written by J.T. Conklin and Ulrich Drepper.
+-
++*/
+ 
+ 
+ #if HAVE_REAL_10 == 3
 @@ -250,7 +250,7 @@
  	fldcw	(SP)
  	frndint



Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: [macports-ports] branch master updated: g95: fix build error, closing #52990

Ryan Schmidt-24

> On Jul 16, 2017, at 03:00, Takeshi Enomoto <[hidden email]> wrote:
>
> Takeshi Enomoto (tenomoto) pushed a commit to branch master
> in repository macports-ports.
>
>
> https://github.com/macports/macports-ports/commit/0c117cac980b5c189b1b033652def0ece0c51a81
>
> The following commit(s) were added to refs/heads/master by this push:
>
>      new 0c117ca  g95: fix build error, closing #52990
>
> 0c117ca is described below
>
>
> commit 0c117cac980b5c189b1b033652def0ece0c51a81
>
> Author: Takeshi Enomoto <[hidden email]>
> AuthorDate: Sun Jul 16 16:58:12 2017 +0900
>
>
>     g95: fix build error, closing #52990
>
> ---
>  lang/g95/Portfile                           |  4 ++--
>  lang/g95/files/patch-libf95-math-x87.S.diff | 12 +++++++++++-
>  2 files changed, 13 insertions(+), 3 deletions(-)
>
>
> diff --git a/lang/g95/Portfile b/lang/g95/Portfile
> index 77da2ad..5b95c59 100644
> --- a/lang/g95/Portfile
> +++ b/lang/g95/Portfile
> @@ -5,7 +5,7 @@ PortGroup compiler_blacklist_versions 1.0
>  
>  name            g95
>  version         0.93
> -revision        4
> +revision        5
>  platforms       darwin
>  categories      lang
>  license         GPL-2

Since this just fixed a build failure, the revision didn't need to be increased.


> @@ -97,7 +97,7 @@ compiler.blacklist-append   {clang < 500}
>  configure.cflags-append -std=gnu89
>  pre-configure {
>      file mkdir ${workpath}/gcc-${version_gcc}/${name}
> -    reinplace "s|tjmp %%edx|tjmp *%%edx|" ${workpath}/gcc-${version_gcc}/gcc/config/i386/i386.c
> +#    reinplace "s|tjmp %%edx|tjmp *%%edx|" ${workpath}/gcc-${version_gcc}/gcc/config/i386/i386.c

Is this line still needed? If yes, uncomment it; if no, remove it.

Loading...