File ccx-2.8-build.patch of Package ccx

Overview Repositories Revisions Requests Users Attributes Meta

File ccx-2.8-build.patch of Package ccx

Index: ccx-2.12/CalculiX/ccx_2.12/src/Makefile
===================================================================
--- ccx-2.12.orig/CalculiX/ccx_2.12/src/Makefile
+++ ccx-2.12/CalculiX/ccx_2.12/src/Makefile
@@ -1,6 +1,6 @@
 
-CFLAGS = -Wall -O3 -fopenmp -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
-FFLAGS = -Wall -O3 -fopenmp
+CFLAGS = -Wall $(GLOBAL_OFLAGS) -g -DARCH="Linux" -DUSE_MT -DSPOOLES -DARPACK -DMATRIXSTORAGE -Wno-unused
+FFLAGS = -Wall $(GLOBAL_OFLAGS) -g -Wno-unused -fopenmp
 
 CC=cc
 FC=gfortran
@@ -21,8 +21,8 @@ OCCXMAIN = $(SCCXMAIN:.c=.o)
 DIR=../../../SPOOLES.2.2
 
 LIBS = \
-       $(DIR)/spooles.a \
-	../../../ARPACK/libarpack_INTEL.a \
+       -lspooles \
+       -larpack -llapack -lblas \
        -lpthread -lm -lc
 
 ccx_2.12: $(OCCXMAIN) ccx_2.12.a  $(LIBS)
--- ccx-2.12/CalculiX/ccx_2.12/src/mafilltcompmain.c.orig	2017-07-20 01:40:53.300552079 +0200
+++ ccx-2.12/CalculiX/ccx_2.12/src/mafilltcompmain.c	2017-07-20 01:42:31.516556093 +0200
@@ -150,7 +150,7 @@
 			 body1,volume1,ielfa1,lakonf1,ifabou1,
 			 nbody1,neq1,dtimef1,velo1,veloo1,cvfa1,hcfa1,cvel1,
 			 gradvel1,xload1,gammat1,xrlfa1,xxj1,nactdohinv1,
-			 a11,a21,a31,flux1,&nefa,&nefb,iau61,xxni1,xxnj1));
+			 a11,a21,a31,flux1,&nefa,&nefb,(void*)iau61,xxni1,xxnj1));
 
     return NULL;
 }
--- ccx-2.12/CalculiX/ccx_2.12/src/steadystate.c.orig	2017-07-20 01:45:15.689465570 +0200
+++ ccx-2.12/CalculiX/ccx_2.12/src/steadystate.c	2017-07-20 01:46:12.869467908 +0200
@@ -1777,8 +1777,8 @@
 		      xforc,nforc,thicke,shcon,nshcon,
 		      sideload,xload,xloadold,&icfd,inomat,pslavsurf,pmastsurf,
 		      &mortar,islavact,cdn,islavnode,nslavnode,&ntie,clearini,
-                      islavsurf,ielprop,prop,energyini,energy,&iit,iponoel,
-                      inoel,nener,orname,network);}
+                      islavsurf,ielprop,prop,energyini,energy,&iit,iponoel,
+                      inoel,nener,orname,(void*)network);}
 	  else{ 
       
               /* calculating displacements/temperatures */
@@ -2808,8 +2808,8 @@
 		      thicke,shcon,nshcon,
 		      sideload,xload,xloadold,&icfd,inomat,pslavsurf,pmastsurf,
 		      &mortar,islavact,cdn,islavnode,nslavnode,&ntie,clearini,
-                      islavsurf,ielprop,prop,energyini,energy,&iit,iponoel,
-                      inoel,nener,orname,network);
+                      islavsurf,ielprop,prop,energyini,energy,&iit,iponoel,
+                      inoel,nener,orname,(void*)network);
 	  
 	      (*kode)++;
 	      mode=-1;

Places

File ccx-2.8-build.patch of Package ccx

Places