<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0be70fbb6d218973beeb56f40ef72e89157467cb">https://github.com/macports/macports-ports/commit/0be70fbb6d218973beeb56f40ef72e89157467cb</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 0be70fbb6d2 mpir: split patch into devel and release versions
</span>0be70fbb6d2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0be70fbb6d218973beeb56f40ef72e89157467cb
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed Jan 6 21:14:08 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> mpir: split patch into devel and release versions
</span>---
devel/mpir/Portfile | 9 ++-
...nfigure.diff => patch-fix-configure.devel.diff} | 0
...igure.diff => patch-fix-configure.release.diff} | 90 +++++++++++++++++++---
3 files changed, 84 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mpir/Portfile b/devel/mpir/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3a12ad66418..8b3e0f33949 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mpir/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mpir/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,6 +40,9 @@ if {${subport} eq ${name}} {
</span> sha256 b0a4088134fb25f25725a04243f83039897c51139a0b5f1dcac1395963483c38 \
size 3116197
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-fix-configure.release.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> } else {
# devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,6 +59,9 @@ if {${subport} eq ${name}} {
</span> size 2546282
revision 0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-fix-configure.devel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
homepage http://www.mpir.org/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,9 +76,6 @@ depends_build port:autoconf \
</span> port:libtool \
port:yasm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-fix-configure.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.cppflags
compiler.cpath
compiler.library_path
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mpir/files/patch-fix-configure.diff b/devel/mpir/files/patch-fix-configure.devel.diff
</span>similarity index 100%
copy from devel/mpir/files/patch-fix-configure.diff
copy to devel/mpir/files/patch-fix-configure.devel.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mpir/files/patch-fix-configure.diff b/devel/mpir/files/patch-fix-configure.release.diff
</span>similarity index 64%
rename from devel/mpir/files/patch-fix-configure.diff
rename to devel/mpir/files/patch-fix-configure.release.diff
<span style='display:block; white-space:pre;color:#808080;'>index 5c78292d6e5..8874bdc5497 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mpir/files/patch-fix-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mpir/files/patch-fix-configure.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,8 +37,21 @@
</span> +void h();
__inline__ t1 e(t2 rp,t2 up,int n,t1 v0)
{t1 c,x,r;int i;if(v0){c=1;for(i=1;i<n;i++){x=up[i];r=x+1;rp[i]=r;}}return c;}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- void f(){static const struct{t1 n;t1 src[9];t1 want[9];}d[]={{1,{0},{1}},};t1 got[9];int i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -621,6 +633,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f(){static const struct{t1 n;t1 src[9];t1 want[9];}d[]={{1,{0},{1}},};t1 got[9];int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -603,8 +615,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1666 to get an ICE with -O1 -mpowerpc64. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __GNUC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-f(int u){int i;long long x;x=u?~0:0;if(x)for(i=0;i<9;i++);x&=g();if(x)g();}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-g(){}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void f (int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++long long g ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void f(int u){int i;long long x;x=u?~0:0;if(x)for(i=0;i<9;i++);x&=g();if(x)g();}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++long long g(){ return 0; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int dummy;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -620,6 +634,7 @@
</span> but that's fine, the offending cc is a native-only compiler so we don't
have to worry about cross compiling. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +59,7 @@
</span> unsigned long
lshift_com (rp, up, n, cnt)
unsigned long *rp;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -664,6 +677,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -663,6 +678,7 @@
</span> native-only compiler so we don't have to worry about cross compiling. */
#include <stdlib.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +67,7 @@
</span> void
lshift_com (rp, up, n, cnt)
unsigned long *rp;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -815,6 +829,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -814,6 +830,7 @@
</span> [AC_MSG_CHECKING([compiler $1 has long long])
cat >conftest.c <<EOF
long long foo;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,7 +75,7 @@
</span> long long bar () { return foo; }
int main () { return 0; }
EOF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -959,6 +974,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -958,6 +975,7 @@
</span> [echo "Testing gcc GOT with eax emitted" >&AC_FD_CC
cat >conftest.c <<\EOF
[int foo;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,7 +83,7 @@
</span> int bar () { return foo; }
]EOF
tmp_got_emitted=no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1150,7 +1166,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1149,7 +1167,7 @@
</span> [AC_MSG_CHECKING([assembler $1 $2])
result=no
cat >conftest.c <<EOF
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,7 +92,7 @@
</span> EOF
gmp_compile="$1 $2 -c conftest.c >conftest.out 2>&1"
if AC_TRY_EVAL(gmp_compile); then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2509,6 +2525,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2508,6 +2526,8 @@
</span> AC_REQUIRE([AC_PROG_LIBTOOL])
AC_MSG_CHECKING([how to call x86 mcount])
cat >conftest.c <<EOF
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,7 +101,7 @@
</span> foo(){bar();}
EOF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2704,6 +2722,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2703,6 +2723,7 @@
</span> [gmp_cv_asm_powerpc_pic=yes
cat >conftest.c <<EOF
int foo;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,7 +109,7 @@
</span> int *bar() { return &foo; }
EOF
echo "Test program:" >&AC_FD_CC
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3294,6 +3313,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3293,6 +3314,7 @@
</span> AC_TRY_RUN([
#include <string.h> /* for strcmp */
#include <stdio.h> /* for vsnprintf */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,7 +117,15 @@
</span>
#if HAVE_STDARG
#include <stdarg.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3399,7 +3419,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3337,6 +3359,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $i
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit (0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [:],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3398,7 +3421,7 @@
</span> yes) tmp_inline=inline ;;
*) tmp_inline=$ac_cv_c_inline ;;
esac
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -113,12 +134,57 @@
</span> ;;
esac
])
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3576,7 +3596,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3466,10 +3489,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove anything that might look like compiler output to our "||" expression
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f conftest* a.out b.out a.exe a_out.exe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat >conftest.c <<EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit(0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gmp_compile="$1 conftest.c"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3540,10 +3565,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CACHE_CHECK([for build system executable suffix],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gmp_cv_prog_exeext_for_build,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [cat >conftest.c <<EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit (0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for i in .exe ,ff8 ""; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3574,10 +3601,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CACHE_CHECK([whether build system compiler is ANSI],
</span> gmp_cv_c_for_build_ansi,
[cat >conftest.c <<EOF
<span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span> int
-main (int argc, char *argv[])
+main (int argc, char **argv)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit(0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gmp_compile="$CC_FOR_BUILD conftest.c"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3608,10 +3637,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CACHE_CHECK([for build system compiler math library],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gmp_cv_check_libm_for_build,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [cat >conftest.c <<EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <math.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit(0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ double d;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double
</span></pre><pre style='margin:0'>
</pre>