diff options
| author | Kaz Kylheku <kaz@kylheku.com> | 2012-04-10 20:48:44 -0700 |
|---|---|---|
| committer | Kaz Kylheku <kaz@kylheku.com> | 2012-04-10 20:48:44 -0700 |
| commit | be004953796f8286ce614d40670b3b14d61d80ef (patch) | |
| tree | 6a6dd697cf588ee3cf614eed6c6ca234850ab767 | |
| parent | 7b825e541377fc8a6f6ec8e490187c7b19bda6c3 (diff) | |
| download | txr-be004953796f8286ce614d40670b3b14d61d80ef.tar.gz txr-be004953796f8286ce614d40670b3b14d61d80ef.tar.bz2 txr-be004953796f8286ce614d40670b3b14d61d80ef.zip | |
Adding patch to MPI to disable its Makefile so people don't try
to work around TXR build problems by running make inside
the MPI directory, which is wrong.
Also fixing an incorrect use of ctype.h functions in
MPI and one case of a superfluous warning.
* mpi-patches/series: new patches added.
* mpi-patches/disable-make: New file.
* mpi-patches/fix-ctype-warnings: New file.
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | mpi-patches/disable-make | 18 | ||||
| -rw-r--r-- | mpi-patches/fix-ctype-warnings | 31 | ||||
| -rw-r--r-- | mpi-patches/series | 2 |
4 files changed, 66 insertions, 0 deletions
@@ -1,5 +1,20 @@ 2012-04-10 Kaz Kylheku <kaz@kylheku.com> + Adding patch to MPI to disable its Makefile so people don't try + to work around TXR build problems by running make inside + the MPI directory, which is wrong. + + Also fixing an incorrect use of ctype.h functions in + MPI and one case of a superfluous warning. + + * mpi-patches/series: new patches added. + + * mpi-patches/disable-make: New file. + + * mpi-patches/fix-ctype-warnings: New file. + +2012-04-10 Kaz Kylheku <kaz@kylheku.com> + More NetBSD porting. * Makefile (EXTRA_FLAGS): Handy new variable for additional diff --git a/mpi-patches/disable-make b/mpi-patches/disable-make new file mode 100644 index 00000000..04e53d3d --- /dev/null +++ b/mpi-patches/disable-make @@ -0,0 +1,18 @@ +Index: mpi-1.8.6/Makefile +=================================================================== +--- mpi-1.8.6.orig/Makefile 2012-04-10 20:41:06.333743757 -0700 ++++ mpi-1.8.6/Makefile 2012-04-10 20:43:28.337576007 -0700 +@@ -14,6 +14,13 @@ + ## 'mpi-config.h', which you should set as appropriate. + ## + ++.PHONY: all ++all: ++ @echo "Do not use this Makefile! TXR pulls in the MPI sources into" ++ @echo "its own build environment. If something isn't working" ++ @echo "it has to be debugged properly." ++ exit 1 ++ + include Makefile.base + + ###---------------------------------------------------------------------- diff --git a/mpi-patches/fix-ctype-warnings b/mpi-patches/fix-ctype-warnings new file mode 100644 index 00000000..17aeeb9c --- /dev/null +++ b/mpi-patches/fix-ctype-warnings @@ -0,0 +1,31 @@ +Index: mpi-1.8.6/mpi.c +=================================================================== +--- mpi-1.8.6.orig/mpi.c 2012-04-10 20:44:54.109795757 -0700 ++++ mpi-1.8.6/mpi.c 2012-04-10 20:45:57.857633757 -0700 +@@ -200,7 +200,7 @@ + int s_mp_ispow2(mp_int *v); /* is v a power of 2? */ + int s_mp_ispow2d(mp_digit d); /* is d a power of 2? */ + +-int s_mp_tovalue(char ch, int r); /* convert ch to value */ ++int s_mp_tovalue(int ch, int r); /* convert ch to value */ + char s_mp_todigit(int val, int r, int low); /* convert val to digit */ + int s_mp_outlen(int bits, int r); /* output length in bytes */ + +@@ -4258,7 +4258,7 @@ + The results will be odd if you use a radix < 2 or > 62, you are + expected to know what you're up to. + */ +-int s_mp_tovalue(char ch, int r) ++int s_mp_tovalue(int ch, int r) + { + int val, xch; + +@@ -4302,7 +4302,7 @@ + + char s_mp_todigit(int val, int r, int low) + { +- char ch; ++ int ch; + + if(val < 0 || val >= r) + return 0; diff --git a/mpi-patches/series b/mpi-patches/series index c880ab60..08e0f6ee 100644 --- a/mpi-patches/series +++ b/mpi-patches/series @@ -1,3 +1,4 @@ +disable-make config-types fix-warnings use-txr-allocator @@ -13,3 +14,4 @@ bit-search-optimizations shrink-mpi-int faster-square-root mpi-to-double +fix-ctype-warnings |