folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add BUILDARCHS tag to source packages. 

CVS patchset: 1783
CVS date: 1997/08/19 16:35:33
This commit is contained in:
marc 1997-08-19 16:35:33 +00:00
parent 2ec98d5fed
commit a377e96040
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/pack.c
View File

@ -416,6 +416,8 @@ int packageBinaries(Spec s, char *passPhrase, int doPackage)
}
headerFreeIterator(headerIter);
headerRemoveEntry(outHeader, RPMTAG_BUILDARCHS);
rpmGetArchInfo(&arch, NULL);
rpmGetOsInfo(&os, NULL);

12
build/spec.c
View File

@ -1066,7 +1066,7 @@ Spec *parseSpec(FILE *f, char *specfile, char *buildRootOverride)
Spec s;
char **archs = NULL;
char **arch;
int i;
int i, count;
s = parseSpecAux(f, specfile, buildRootOverride, &archs);
@ -1084,11 +1084,11 @@ Spec *parseSpec(FILE *f, char *specfile, char *buildRootOverride)
}
/* We have a BuildArchitectures field */
i = 0;
while (archs[i]) {
i++;
count = 0;
while (archs[count]) {
count++;
}
res = (Spec *) malloc(i * sizeof(Spec));
res = (Spec *) malloc(count * sizeof(Spec));
i = 0;
arch = archs;
@ -1107,6 +1107,8 @@ Spec *parseSpec(FILE *f, char *specfile, char *buildRootOverride)
free(res);
return NULL;
}
headerAddEntry(res[i]->packages->header, RPMTAG_BUILDARCHS,
RPM_STRING_ARRAY_TYPE, archs, count);
res[i]->buildArch = strdup(*arch);
i++;
}