CVS commit: pkgsrc/lang/mercury

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Tue Jun 19 02:04:05 UTC 2018

Modified Files:
        pkgsrc/lang/mercury: distinfo
        pkgsrc/lang/mercury/patches: patch-at

Log Message:
mercury: disable non-local gotos on powerpc(32) too

PR pkg/53346: The configure test for use of labels loops on powerpc


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/mercury/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/mercury/patches/patch-at

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/mercury/distinfo
diff -u pkgsrc/lang/mercury/distinfo:1.18 pkgsrc/lang/mercury/distinfo:1.19
--- pkgsrc/lang/mercury/distinfo:1.18   Sun Feb 18 05:30:55 2018
+++ pkgsrc/lang/mercury/distinfo        Tue Jun 19 02:04:04 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2018/02/18 05:30:55 rillig Exp $
+$NetBSD: distinfo,v 1.19 2018/06/19 02:04:04 maya Exp $
 
 SHA1 (mercury-srcdist-14.01.1.tar.gz) = 8d8295aed6cadb6cd2e932490042de6075d18acf
 RMD160 (mercury-srcdist-14.01.1.tar.gz) = 8ee4a5ee694985b6d6453bee86a3a7e12cc9d0ac
@@ -11,4 +11,4 @@ SHA1 (patch-an) = 7e518ce6bc3f1cf09b1308
 SHA1 (patch-ao) = 88011fb285d0e71126524fb41d0a46831d1532e7
 SHA1 (patch-ap) = 1140c0c9db3ed621f50247b5d0fc1cc1291c7b79
 SHA1 (patch-aq) = f9b80024440fb4dbcf77c1daca5bc40d4aeb2f61
-SHA1 (patch-at) = fc77b1e0059a7eb98e5d9c9fb30b69434fcf475c
+SHA1 (patch-at) = 49bf68b771d998ee21be2f47a7b35141a8983924

Index: pkgsrc/lang/mercury/patches/patch-at
diff -u pkgsrc/lang/mercury/patches/patch-at:1.5 pkgsrc/lang/mercury/patches/patch-at:1.6
--- pkgsrc/lang/mercury/patches/patch-at:1.5    Sat Dec 26 11:58:19 2015
+++ pkgsrc/lang/mercury/patches/patch-at        Tue Jun 19 02:04:04 2018
@@ -1,8 +1,10 @@
-$NetBSD: patch-at,v 1.5 2015/12/26 11:58:19 joerg Exp $
+$NetBSD: patch-at,v 1.6 2018/06/19 02:04:04 maya Exp $
 
 Support shared libraries.
 Don't capture value of HOME.
 
+No non-local gotos on powerpc32, too
+
 --- configure.orig     2014-09-08 04:56:03.000000000 +0000
 +++ configure
 @@ -1514,7 +1514,7 @@ Installation directories:
@@ -14,6 +16,17 @@ Don't capture value of HOME.
  
  For better control, use the options below.
  
+@@ -9318,8 +9318,8 @@ case "$ac_cv_c_compiler_gnu" in yes)
+             mercury_cv_asm_labels=no
+             mercury_cv_gcc_labels=no
+             ;;
+-        powerpc64-*)
+-            echo "gcc labels do not work on PPC64" 1>&6
++        powerpc*-*)
++            echo "gcc labels do not work on PPC" 1>&6
+             mercury_cv_asm_labels=no
+             mercury_cv_gcc_labels=no
+             ;;
 @@ -11481,7 +11481,7 @@ $as_echo "yes" >&6; }
          EXT_FOR_SHARED_LIB=so
          EXT_FOR_LINK_WITH_PIC_OBJECTS=o