This is a partial patch, more errors remain.
About this hunk:
@@ -115,5 +115,5 @@
* Try OS-specific probe, compiling with -m64 (assumes gcc workalike)
*/
- i = 1 + strlen(frm) + strlen(osnam) + strlen(osnam[OS]) +
+ i = 1 + strlen(frm) + strlen(osname) + strlen(osnam[OS]) +
strlen(ASMNAM[asmd]) + strlen(flag) + strlen(targ) + strlen(find);
cmnd = malloc(i*sizeof(char));
strlen(osnam) must have been a typo, because osnam is char**.
Some sort of preprocessing exists when building this so don't rely on
dpkg-source --commit as I did because it will generate a massively poluted
patch in which the real changes will be flooded.
Description: Fix failure to build. This patch is partial, i.e. not enough.
Author: -- Nathan Pratta Teodosio <[email protected]> Fri, 16 Aug 2024 15:49:26 +0200
--- atlas-3.10.3.orig/CONFIG/include/atlconf_misc.h
+++ atlas-3.10.3/CONFIG/include/atlconf_misc.h
@@ -40,6 +40,8 @@ void KillUselessSpace(char *str);
char *NameWithoutPath(char *file);
char *GetPathWithoutName(char *file);
void GetGccVers(char *gcc, int *comp, int *major, int *minor, int *patch);
+int CompIsClang(char *comp);
+int CompIsMinGW(char *comp);
int CompIsGcc(char *comp);
int CompIsAppleGcc(char *comp);
int CompIsMIPSpro(char *comp);
--- atlas-3.10.3.orig/CONFIG/src/backend/archinfo_aix.c
+++ atlas-3.10.3/CONFIG/src/backend/archinfo_aix.c
@@ -180,7 +180,7 @@ int ProbeThrottle()
return(iret);
}
-main(int nargs, char **args)
+void main(int nargs, char **args)
{
int flags, CacheLevel, ncpu, mhz, bits, sure;
enum MACHTYPE arch=MACHOther;
--- atlas-3.10.3.orig/CONFIG/src/backend/archinfo_freebsd.c
+++ atlas-3.10.3/CONFIG/src/backend/archinfo_freebsd.c
@@ -243,7 +243,7 @@ int ProbeThrottle()
return(iret);
}
-main(int nargs, char **args)
+void main(int nargs, char **args)
{
int flags, CacheLevel, ncpu, mhz, bits, sure;
enum MACHTYPE arch=MACHOther;
--- atlas-3.10.3.orig/CONFIG/src/backend/archinfo_irix.c
+++ atlas-3.10.3/CONFIG/src/backend/archinfo_irix.c
@@ -198,7 +198,7 @@ int ProbeThrottle()
return(iret);
}
-main(int nargs, char **args)
+void main(int nargs, char **args)
{
int flags, CacheLevel, ncpu, mhz, bits, sure;
enum MACHTYPE arch=MACHOther;
--- atlas-3.10.3.orig/CONFIG/src/backend/archinfo_linux.c
+++ atlas-3.10.3/CONFIG/src/backend/archinfo_linux.c
@@ -572,7 +572,7 @@ int ProbeThrottle()
return(iret);
}
-main(int nargs, char **args)
+void main(int nargs, char **args)
{
int flags, CacheLevel, ncpu, mhz, bits, sure;
enum MACHTYPE arch=MACHOther;
--- atlas-3.10.3.orig/CONFIG/src/backend/archinfo_sfu.c
+++ atlas-3.10.3/CONFIG/src/backend/archinfo_sfu.c
@@ -151,7 +151,7 @@ int ProbeThrottle()
return(iret);
}
-main(int nargs, char **args)
+void main(int nargs, char **args)
{
int flags, CacheLevel, ncpu, mhz, bits, sure;
enum MACHTYPE arch=MACHOther;
--- atlas-3.10.3.orig/CONFIG/src/backend/archinfo_sunos.c
+++ atlas-3.10.3/CONFIG/src/backend/archinfo_sunos.c
@@ -212,7 +212,7 @@ int ProbeThrottle()
return(iret);
}
-main(int nargs, char **args)
+void main(int nargs, char **args)
{
int flags, CacheLevel, ncpu, mhz, bits, sure;
enum MACHTYPE arch=MACHOther;
--- atlas-3.10.3.orig/CONFIG/src/backend/archinfo_win.c
+++ atlas-3.10.3/CONFIG/src/backend/archinfo_win.c
@@ -221,7 +221,7 @@ int ProbeThrottle()
return(iret);
}
-main(int nargs, char **args)
+void main(int nargs, char **args)
{
int flags, CacheLevel, ncpu, mhz, bits, sure;
enum MACHTYPE arch=MACHOther;
--- atlas-3.10.3.orig/CONFIG/src/backend/archinfo_x86.c
+++ atlas-3.10.3/CONFIG/src/backend/archinfo_x86.c
@@ -460,7 +460,7 @@ int GetFlags(int nargs, char **args, int
return(flag);
}
-main(int nargs, char **args)
+void main(int nargs, char **args)
{
int ierr, x86_64, flags, CacheLevel;
unsigned family, model;
--- atlas-3.10.3.orig/CONFIG/src/probe_arch.c
+++ atlas-3.10.3/CONFIG/src/probe_arch.c
@@ -1,9 +1,9 @@
void PrintUsage(char *name, int iarg)
{
- fprintf(stderr, "error in arg %d USAGE: \n", iarg);
- fprintf(stderr, " %s -O <os> -s <asm> -v <verb#> -c (cpu) -b (@ bits) -a (arch) -n (ncpu) -m (Mhz) -t (cpu throttling) -T <targ>\n", name);
- exit(iarg);
+ fprintf(stderr, "error in arg %d USAGE: \n", iarg); fprintf(stderr,
+ "%s -O <os> -s <asm> -v <verb#> -c (cpu) -b (@ bits) -a (arch) -n (ncpu) -m (Mhz) -t (cpu throttling) -T <targ>\n",
+ name); exit(iarg);
}
int GetFlags(int nargs, char **args, int *CacheLevel, enum OSTYPE *OS,
@@ -115,5 +115,5 @@
* Try OS-specific probe, compiling with -m64 (assumes gcc workalike)
*/
- i = 1 + strlen(frm) + strlen(osnam) + strlen(osnam[OS]) +
+ i = 1 + strlen(frm) + strlen(osname) + strlen(osnam[OS]) +
strlen(ASMNAM[asmd]) + strlen(flag) + strlen(targ) + strlen(find);
cmnd = malloc(i*sizeof(char));
--- atlas-3.10.3.orig/bin/extract.c
+++ atlas-3.10.3/bin/extract.c
@@ -3904,7 +3904,7 @@ void HandleLine(EXTENV *EE, char *line)
}
-main(int nargs, char *args[])
+void main(int nargs, char *args[])
{
char line[LNLEN], *path;
int i;
--- atlas-3.10.3.orig/bin/gpmmtst.c
+++ atlas-3.10.3/bin/gpmmtst.c
@@ -787,7 +787,7 @@ ___main(){}
__main(){}
MAIN__(){}
_MAIN_(){}
-main(int nargs, char *args[])
+void main(int nargs, char *args[])
/*
* tst <tst> <# TA> <TA's> <# TB's> <TB's> <M0> <MN> <incM> <N0> <NN> <incN>
* <K0> <KN> <incK> <# alphas> <alphas> <# betas> <betas>
--- atlas-3.10.3.orig/bin/invtst.c
+++ atlas-3.10.3/bin/invtst.c
@@ -743,7 +743,7 @@ void GetFlags(int nargs, char **args, in
}
}
-main(int nargs, char **args)
+void main(int nargs, char **args)
{
int MFLOP, CacheSize, ldagap, nord, nuplo, N0, NN, incN;
enum TEST_UPLO *Uplo;
--- atlas-3.10.3.orig/bin/llttst.c
+++ atlas-3.10.3/bin/llttst.c
@@ -538,7 +538,7 @@ void GetFlags(int nargs, char **args, in
}
}
-main(int nargs, char **args)
+void main(int nargs, char **args)
{
int MFLOP, CacheSize, ldagap, nuplo, N0, NN, incN;
TYPE thresh;
--- atlas-3.10.3.orig/bin/lutst.c
+++ atlas-3.10.3/bin/lutst.c
@@ -476,7 +476,7 @@ void GetFlags(int nargs, char **args, in
if (*M0 == -1) *M0 = *MN = *incM = *MisN = 1;
}
-main(int nargs, char **args)
+void main(int nargs, char **args)
{
int MFLOP, CacheSize, LdaIsM, MisN, NisM, M0, MN, incM, N0, NN, incN;
int norders;
--- atlas-3.10.3.orig/bin/slvtst.c
+++ atlas-3.10.3/bin/slvtst.c
@@ -743,7 +743,7 @@ static int DoAllTests(int nrep, int N0,
else fprintf(stdout, "\n%d TESTS RUN, %d FAILED!!\n\n", i, ierr);
return(ierr);
}
-main(int nargs, char **args)
+void main(int nargs, char **args)
{
int ierr, N0, NN, incN, R0, RN, incR, ldagap, ldbgap, nord, nuplo;
int CS, MFLOP, QR, nrep;
--- atlas-3.10.3.orig/bin/uumtst.c
+++ atlas-3.10.3/bin/uumtst.c
@@ -566,7 +566,7 @@ void GetFlags(int nargs, char **args, in
}
}
-main(int nargs, char **args)
+void main(int nargs, char **args)
{
int MFLOP, CacheSize, ldagap, nuplo, N0, NN, incN;
TYPE thresh;
--- atlas-3.10.3.orig/lib/qr.c
+++ atlas-3.10.3/lib/qr.c
@@ -5,7 +5,7 @@
#elif defined(UpCase)
#define dgeqrf_ DGEQRF
#endif
-main(int nargs, char **args)
+void main(int nargs, char **args)
{
extern void dgeqrf_(F77_INTEGER*,F77_INTEGER*,double*,F77_INTEGER*,
double*,double*,F77_INTEGER*,F77_INTEGER*);
--- atlas-3.10.3.orig/lib/test_dynlink.c
+++ atlas-3.10.3/lib/test_dynlink.c
@@ -1,6 +1,6 @@
#include <cblas.h>
#include <clapack.h>
-main(int nargs, char **args)
+void main(int nargs, char **args)
{
double A[1]={1.0}, b[1]={1.0};
int ipiv[1];
--- atlas-3.10.3.orig/tune/sysinfo/masrch.c
+++ atlas-3.10.3/tune/sysinfo/masrch.c
@@ -169,7 +169,7 @@ int FindMflop
return(mf);
}
-FindNreg
+int FindNreg
(
char pre, /* precision: s,d,q */
int fmf, /* number of mflops to force timer on */
