- Upgrade to 0.99712;

- Build the static library with PIC and run ranlib;

- Also build and install a shared library.

6 files changed, 34 insertions, 25 deletions

diff --git a/math/cocoalib/files/patch-src_AlgebraicCore_Makefile b/math/cocoalib/files/patch-src_AlgebraicCore_Makefile
index b44336052c65..2605423683a7 100644
--- a/math/cocoalib/files/patch-src_AlgebraicCore_Makefile
+++ b/math/cocoalib/files/patch-src_AlgebraicCore_Makefile
@@ -1,4 +1,4 @@
---- src/AlgebraicCore/Makefile.orig	2020-03-11 17:00:26 UTC
+--- src/AlgebraicCore/Makefile.orig	2020-10-27 09:42:18 UTC
 +++ src/AlgebraicCore/Makefile
 @@ -1,10 +1,5 @@
  # Makefile for CoCoALib/src/AlgebraicCore/ directory.
@@ -11,15 +11,19 @@
  SUBDIRS=TmpFactorDir TmpHilbertDir
  
  FROBBY_FILES=ExternalLibs-Frobby.C
-@@ -72,126 +67,17 @@ SRCS=time.C assert.C utils.C  utils-gmp.C  VectorOps.C
+@@ -74,126 +69,21 @@ SRCS=time.C assert.C utils.C  utils-gmp.C  VectorOps.C
       $(FROBBY_FILES) $(GFAN_FILES) $(GSL_FILES) \
       $(MATHSAT_FILES) $(NORMALIZ_FILES)
  
 -# (see below) OBJS depend on $(COCOA_ROOT)/configuration/autoconf.mk
 -OBJS=$(SRCS:.C=.o)
 +all: ${SRCS:.C=.o}
++	echo "" > ./.ALLSRC
 +	for x in ${SUBDIRS}; do make -C $$x; done
 +	ar rcs libcocoa.a ${.ALLSRC}
++	ranlib libcocoa.a
++	echo ${.ALLSRC} >> ./.ALLSRC
++	${CXX} -shared `cat ./.ALLSRC` -Wl,-soname,libcocoa.so.0 -o libcocoa.so.0
  
 -# The default target compiles debug_new.C and leak_checker.C as
 -# well as all the files listed in SRCS.
@@ -56,7 +60,7 @@
 -# Special compilation targets with extra CPP symbols.
 -BuildInfo.o: BuildInfo.C $(COCOA_ROOT)/include/CoCoA/BuildInfo.H
 -	@echo "Compiling BuildInfo.o (with special preprocessor flags)"
--	$(COMPILE) -c  -DCOCOA_VERSION="\"$(COCOALIB_VERSION)\""  -DCOCOA_CXX="\"$(CXX)\""  -DCOCOA_CXXFLAGS="\"$(CXXFLAGS)\""  -DCOCOA_CXXFLAGS_DEFINES="\"$(CXXFLAGS_DEFINES)\""  -o BuildInfo.o BuildInfo.C
+-	$(COMPILE) -c  -DCOCOA_VERSION="\"$(COCOALIB_VERSION)\""  -DCOCOA_CXX="\"$(CXX)\""  -DCOCOA_CXXFLAGS="\"$(CXXFLAGS)\""   -o BuildInfo.o BuildInfo.C
 -
 -IdealOfPoints.o: IdealOfPoints.C $(COCOA_ROOT)/include/CoCoA/IdealOfPoints.H
 -	@echo "Compiling IdealOfPoints --  keep your fingers crossed"
@@ -127,7 +131,7 @@
 -	@for srcfile in $(SRCS); \
 -	do \
 -	  objfile=`basename $$srcfile .C`.o; \
--	  $(CXX) $(CXXFLAGS) $(CXXFLAGS_DEFINES) $(INCLUDE) -ITmpFactorDir -ITmpFactorDir/linalg -ITmpFactorDir/multivariate -MM "$$srcfile" -MQ "$$objfile" >> $(DEPEND_FILE).new; \
+-	  $(CXX) $(CXXFLAGS) $(INCLUDE_PATHS) -ITmpFactorDir -ITmpFactorDir/linalg -ITmpFactorDir/multivariate -MM "$$srcfile" -MQ "$$objfile" >> $(DEPEND_FILE).new; \
 -	  echo >> $(DEPEND_FILE).new; \
 -	done
 -	@if [ -s "$(DEPEND_FILE)" ] ; \
@@ -145,4 +149,4 @@
 +	${CXX} ${CXXFLAGS} -DCOCOA_VERSION="\"%%DISTVERSION%%\"" -DCOCOA_CXX="\"${CXX}\"" -DCOCOA_CXXFLAGS="\"${CXXFLAGS}\"" -DCOCOA_CXXFLAGS_DEFINES="\"\"" -o BuildInfo.o -c BuildInfo.C
  
  # Next few lines are for RCS header/log
- # $Header: /Volumes/Home_1/cocoa/cvs-repository/CoCoALib-0.99/src/AlgebraicCore/Makefile,v 1.169 2020/03/11 17:00:26 abbott Exp $
+ # $Header: /Volumes/Home_1/cocoa/cvs-repository/CoCoALib-0.99/src/AlgebraicCore/Makefile,v 1.176 2020/10/27 09:42:18 abbott Exp $
diff --git a/math/cocoalib/files/patch-src_AlgebraicCore_TmpFactorDir_Makefile b/math/cocoalib/files/patch-src_AlgebraicCore_TmpFactorDir_Makefile
index e2a9d31888dc..fc397d6d9714 100644
--- a/math/cocoalib/files/patch-src_AlgebraicCore_TmpFactorDir_Makefile
+++ b/math/cocoalib/files/patch-src_AlgebraicCore_TmpFactorDir_Makefile
@@ -1,4 +1,4 @@
---- src/AlgebraicCore/TmpFactorDir/Makefile.orig	2020-03-06 20:35:15 UTC
+--- src/AlgebraicCore/TmpFactorDir/Makefile.orig	2020-10-27 09:42:42 UTC
 +++ src/AlgebraicCore/TmpFactorDir/Makefile
 @@ -1,10 +1,5 @@
  # Makefile for CoCoALib/src/AlgebraicCore/TmpFactorDir/ directory
@@ -11,7 +11,7 @@
  SUBDIRS=linalg multivariate
  
  SRCS=primes.c DUPFF.c FF.c FindPrimRoot.c DUPFFsqfrd.c DUPFFderiv.c \
-@@ -19,79 +14,11 @@ SRCS=primes.c DUPFF.c FF.c FindPrimRoot.c DUPFFsqfrd.c
+@@ -19,79 +14,13 @@ SRCS=primes.c DUPFF.c FF.c FindPrimRoot.c DUPFFsqfrd.c
       jalloc.c add_logs.c jaaerror.c debug_malloc.c \
       DUPZfactor_liftq.c mpz_lift_recip.c mpq_to_FFelem.c
  
@@ -19,6 +19,8 @@
 +all: ${SRCS:.c=.o}
 +	for x in ${SUBDIRS}; do make -C $$x; done
 +	ar rcs ../libcocoa.a ${.ALLSRC}
++	echo ${.ALLSRC} >> ../.ALLSRC
++	/bin/mv *.o ..
  
 -%.o: %.c
 -	$(COMPILE) -I. -Ilinalg -c -o $@ $<
@@ -79,7 +81,7 @@
 -	for srcfile in $(SRCS); \
 -	do \
 -	  objfile=`basename $$srcfile .c`.o; \
--	  $(CXX) $(INCLUDE) -I. -Ilinalg -Imultivariate -MM "$$srcfile" -MQ "$$objfile" >> $(DEPEND_FILE).new; \
+-	  $(CXX) $(INCLUDE_PATHS) -I. -Ilinalg -Imultivariate -MM "$$srcfile" -MQ "$$objfile" >> $(DEPEND_FILE).new; \
 -	  echo >> $(DEPEND_FILE).new; \
 -	done
 -	@if [ -s "$(DEPEND_FILE)" ] ; \
diff --git a/math/cocoalib/files/patch-src_AlgebraicCore_TmpFactorDir_linalg_Makefile b/math/cocoalib/files/patch-src_AlgebraicCore_TmpFactorDir_linalg_Makefile
index 467fa0c65b0a..d66d6180e5c8 100644
--- a/math/cocoalib/files/patch-src_AlgebraicCore_TmpFactorDir_linalg_Makefile
+++ b/math/cocoalib/files/patch-src_AlgebraicCore_TmpFactorDir_linalg_Makefile
@@ -1,6 +1,6 @@
---- src/AlgebraicCore/TmpFactorDir/linalg/Makefile.orig	2020-03-06 20:35:15 UTC
+--- src/AlgebraicCore/TmpFactorDir/linalg/Makefile.orig	2020-10-27 09:43:00 UTC
 +++ src/AlgebraicCore/TmpFactorDir/linalg/Makefile
-@@ -1,73 +1,13 @@
+@@ -1,73 +1,15 @@
  # Makefile for CoCoALib/src/AlgebraicCore/TmpFactorDir/linalg/ directory
  
 -COCOA_ROOT=../../../..
@@ -15,6 +15,8 @@
 -OBJS=$(SRCS:.c=.o)
 +all: ${SRCS:.c=.o}
 +	ar rcs ../../libcocoa.a ${.ALLSRC}
++	echo ${.ALLSRC} >> ../../.ALLSRC
++	/bin/mv *.o ..
  
 -%.o: %.c
 -	$(COMPILE) -I. -I.. -c -o $@ $<
@@ -61,7 +63,7 @@
 -	for srcfile in $(SRCS); \
 -	do \
 -	  objfile=`basename $$srcfile .C`.o; \
--	  $(CXX) $(INCLUDE) -I. -I.. -MM "$$srcfile" -MQ "$$objfile" >> $(DEPEND_FILE).new; \
+-	  $(CXX) $(INCLUDE_PATHS) -I. -I.. -MM "$$srcfile" -MQ "$$objfile" >> $(DEPEND_FILE).new; \
 -	  echo >> $(DEPEND_FILE).new; \
 -	done
 -	@if [ -s "$(DEPEND_FILE)" ] ; \
diff --git a/math/cocoalib/files/patch-src_AlgebraicCore_TmpFactorDir_multivariate_Makefile b/math/cocoalib/files/patch-src_AlgebraicCore_TmpFactorDir_multivariate_Makefile
index 5127b3183d38..abf926f1a5b1 100644
--- a/math/cocoalib/files/patch-src_AlgebraicCore_TmpFactorDir_multivariate_Makefile
+++ b/math/cocoalib/files/patch-src_AlgebraicCore_TmpFactorDir_multivariate_Makefile
@@ -1,6 +1,6 @@
---- src/AlgebraicCore/TmpFactorDir/multivariate/Makefile.orig	2020-03-06 20:35:15 UTC
+--- src/AlgebraicCore/TmpFactorDir/multivariate/Makefile.orig	2020-10-27 09:43:20 UTC
 +++ src/AlgebraicCore/TmpFactorDir/multivariate/Makefile
-@@ -1,74 +1,15 @@
+@@ -1,74 +1,17 @@
  # Makefile for CoCoALib/src/AlgebraicCore/TmpFactorDir/multivariate/ directory.
  
 -COCOA_ROOT=../../../..
@@ -17,6 +17,8 @@
 -OBJS=$(SRCS:.c=.o)
 +all: ${SRCS:.c=.o}
 +	ar rcs ../../libcocoa.a ${.ALLSRC}
++	echo ${.ALLSRC} >> ../../.ALLSRC
++	/bin/mv *.o ..
  
 -%.o: %.c
 -	$(COMPILE) -I. -I.. -I../linalg -c -o $@ $<
@@ -62,7 +64,7 @@
 -	for srcfile in $(SRCS); \
 -	do \
 -	  objfile=`basename $$srcfile .c`.o; \
--	  $(CXX) $(INCLUDE) -I. -I.. -I../linalg -MM "$$srcfile" -MQ "$$objfile" >> $(DEPEND_FILE).new; \
+-	  $(CXX) $(INCLUDE_PATHS) -I. -I.. -I../linalg -MM "$$srcfile" -MQ "$$objfile" >> $(DEPEND_FILE).new; \
 -	  echo >> $(DEPEND_FILE).new; \
 -	done
 -	@if [ -s "$(DEPEND_FILE)" ] ; \
diff --git a/math/cocoalib/files/patch-src_AlgebraicCore_TmpHilbertDir_Makefile b/math/cocoalib/files/patch-src_AlgebraicCore_TmpHilbertDir_Makefile
index 154f63697883..674edee57d0a 100644
--- a/math/cocoalib/files/patch-src_AlgebraicCore_TmpHilbertDir_Makefile
+++ b/math/cocoalib/files/patch-src_AlgebraicCore_TmpHilbertDir_Makefile
@@ -1,6 +1,6 @@
---- src/AlgebraicCore/TmpHilbertDir/Makefile.orig	2020-03-06 20:35:15 UTC
+--- src/AlgebraicCore/TmpHilbertDir/Makefile.orig	2020-10-27 09:43:37 UTC
 +++ src/AlgebraicCore/TmpHilbertDir/Makefile
-@@ -1,72 +1,13 @@
+@@ -1,72 +1,15 @@
  # Makefile for CoCoALib/src/AlgebraicCore/TmpHilbertDir/ directory
  
 -COCOA_ROOT=../../..
@@ -15,6 +15,8 @@
 -OBJS=$(SRCS:.C=.o)
 +all: ${SRCS:.C=.o}
 +	ar rcs ../libcocoa.a ${.ALLSRC}
++	echo ${.ALLSRC} >> ../.ALLSRC
++	/bin/mv *.o ..
  
 -# Default target, must be the first one!
 -.PHONY: default
@@ -60,7 +62,7 @@
 -	for srcfile in $(SRCS); \
 -	do \
 -	  objfile=`basename $$srcfile .c`.o; \
--	  $(CXX) $(INCLUDE) -I. -MM "$$srcfile" -MQ "$$objfile" >> $(DEPEND_FILE).new; \
+-	  $(CXX) $(INCLUDE_PATHS) -I. -MM "$$srcfile" -MQ "$$objfile" >> $(DEPEND_FILE).new; \
 -	  echo >> $(DEPEND_FILE).new; \
 -	done
 -	@if [ -s "$(DEPEND_FILE)" ] ; \
diff --git a/math/cocoalib/files/patch-src_tests_Makefile b/math/cocoalib/files/patch-src_tests_Makefile
index 063bd5ffe2be..f26d2b256b46 100644
--- a/math/cocoalib/files/patch-src_tests_Makefile
+++ b/math/cocoalib/files/patch-src_tests_Makefile
@@ -1,4 +1,4 @@
---- src/tests/Makefile.orig	2020-06-11 13:17:06 UTC
+--- src/tests/Makefile.orig	2020-12-04 10:17:44 UTC
 +++ src/tests/Makefile
 @@ -1,11 +1,5 @@
  # Makefile for CoCoALib/src/tests/ directory
@@ -12,7 +12,7 @@
  TESTS=test-empty.C \
        test-BigInt1.C  test-BigInt2.C  test-BigInt3.C \
        test-BigRat1.C  test-BigRat2.C  test-BigRat3.C  test-BigRat4.C \
-@@ -66,110 +60,11 @@ TESTS=test-empty.C \
+@@ -66,107 +60,11 @@ TESTS=test-empty.C \
        test-utils1.C  test-utils2.C
  #     test-RingTwinFloat3.C test-OpenMath2.C   -- skip these tests for the moment
  
@@ -26,15 +26,12 @@
 -	@echo "*** src/tests/Makefile: default target ***"
 -	@(cd $(COCOA_ROOT); $(MAKE) check)
 -
--$(COCOA_LIB):
--	@echo "Compiling CoCoALib..."
--	@(cd $(COCOA_ROOT); $(MAKE) library)
--
 -.PHONY: lib
--lib: $(COCOA_LIB)
+-lib: library
 -
 -.PHONY: library
--library: $(COCOA_LIB)
+-library:
+-	@(cd $(COCOA_ROOT); $(MAKE) library)
 -
 -
 -# This target should be made only after the CoCoA library has been compiled;