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

Also add RPMTAG_OPTFLAGS during spec parse since we easily can...

This commit is contained in:
Panu Matilainen 2011-10-06 11:14:05 +03:00
parent 6c7b53b108
commit d9932aa63c
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/pack.c
View File

@ -570,11 +570,6 @@ rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating)
headerPutString(pkg->header, RPMTAG_BUILDHOST, buildHost());
headerPutUint32(pkg->header, RPMTAG_BUILDTIME, getBuildTime(), 1);
{ char * optflags = rpmExpand("%{optflags}", NULL);
headerPutString(pkg->header, RPMTAG_OPTFLAGS, optflags);
free(optflags);
}
if (spec->sourcePkgId != NULL) {
headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16);
}

3
build/parseSpec.c
View File

@ -538,6 +538,7 @@ static void addTargets(Package Pkgs)
char *platform = rpmExpand("%{_target_platform}", NULL);
char *arch = rpmExpand("%{_target_cpu}", NULL);
char *os = rpmExpand("%{_target_os}", NULL);
char *optflags = rpmExpand("%{optflags}", NULL);
for (Package pkg = Pkgs; pkg != NULL; pkg = pkg->next) {
headerPutString(pkg->header, RPMTAG_OS, os);
@ -546,6 +547,7 @@ static void addTargets(Package Pkgs)
headerPutString(pkg->header, RPMTAG_ARCH, arch);
}
headerPutString(pkg->header, RPMTAG_PLATFORM, platform);
headerPutString(pkg->header, RPMTAG_OPTFLAGS, optflags);
pkg->ds = rpmdsThis(pkg->header, RPMTAG_REQUIRENAME, RPMSENSE_EQUAL);
addPackageProvides(pkg->header);
@ -553,6 +555,7 @@ static void addTargets(Package Pkgs)
free(platform);
free(arch);
free(os);
free(optflags);
}
static rpmSpec parseSpec(const char *specFile, rpmSpecFlags flags,