autoReq/autoProv now per-package.
CVS patchset: 2915 CVS date: 1999/03/26 20:07:34
This commit is contained in:
jbj
parent
746681bee7
commit
7a9fe7272c
1
CHANGES
1
CHANGES
|
|
@ -5,6 +5,7 @@
|
|||
- fix: don't add header if signature generation failed (Carlo Wood).
|
||||
- more DU 4.0D fiddles (Shing-Gene Yung).
|
||||
- fix: segfault from unknown uid/gid -- use builder's uid/gid instead.
|
||||
- autoReq/autoProv now per-package.
|
||||
|
||||
2.91 -> 2.92
|
||||
- update with libtool-2.4f.
|
||||
|
|
|
|||
|
|
@ -285,7 +285,12 @@ AC_REQUIRE([AC_PROG_LN_S])dnl
|
|||
dnl
|
||||
|
||||
# Check for any special flags to pass to ltconfig.
|
||||
libtool_flags="--cache-file=$cache_file"
|
||||
#
|
||||
# the following will cause an existing older ltconfig to fail, so
|
||||
# we ignore this at the expense of the cache file... Checking this
|
||||
# will just take longer ... bummer!
|
||||
#libtool_flags="--cache-file=$cache_file"
|
||||
#
|
||||
test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
|
||||
test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
|
||||
test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
|
||||
|
|
|
|||
|
|
@ -1517,7 +1517,7 @@ static int generateAutoReqProv(Spec spec, Package pkg,
|
|||
return 0;
|
||||
}
|
||||
|
||||
if (! (spec->autoReq || spec->autoProv)) {
|
||||
if (! (pkg->autoReq || pkg->autoProv)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -1531,7 +1531,7 @@ static int generateAutoReqProv(Spec spec, Package pkg,
|
|||
|
||||
/*** Do Provides ***/
|
||||
|
||||
if (spec->autoProv) {
|
||||
if (pkg->autoProv) {
|
||||
rpmMessage(RPMMESS_NORMAL, _("Finding provides...\n"));
|
||||
|
||||
argv[0] = FINDPROVIDES;
|
||||
|
|
@ -1557,7 +1557,7 @@ static int generateAutoReqProv(Spec spec, Package pkg,
|
|||
|
||||
/*** Do Requires ***/
|
||||
|
||||
if (spec->autoReq) {
|
||||
if (pkg->autoReq) {
|
||||
rpmMessage(RPMMESS_NORMAL, _("Finding requires...\n"));
|
||||
|
||||
argv[0] = FINDREQUIRES;
|
||||
|
|
|
|||
|
|
@ -472,14 +472,14 @@ static int handlePreambleTag(Spec spec, Package pkg, int tag, char *macro,
|
|||
headerAddEntry(pkg->header, tag, RPM_INT32_TYPE, &num, 1);
|
||||
break;
|
||||
case RPMTAG_AUTOREQPROV:
|
||||
spec->autoReq = parseYesNo(field);
|
||||
spec->autoProv = spec->autoReq;
|
||||
pkg->autoReq = parseYesNo(field);
|
||||
pkg->autoProv = pkg->autoReq;
|
||||
break;
|
||||
case RPMTAG_AUTOREQ:
|
||||
spec->autoReq = parseYesNo(field);
|
||||
pkg->autoReq = parseYesNo(field);
|
||||
break;
|
||||
case RPMTAG_AUTOPROV:
|
||||
spec->autoProv = parseYesNo(field);
|
||||
pkg->autoProv = parseYesNo(field);
|
||||
break;
|
||||
case RPMTAG_SOURCE:
|
||||
case RPMTAG_PATCH:
|
||||
|
|
|
|||
|
|
@ -112,9 +112,6 @@ struct SpecStruct {
|
|||
|
||||
/*@dependent@*/ struct MacroContext *macros;
|
||||
|
||||
int autoReq;
|
||||
int autoProv;
|
||||
|
||||
/*@only@*/ StringBuf prep;
|
||||
/*@only@*/ StringBuf build;
|
||||
/*@only@*/ StringBuf install;
|
||||
|
|
@ -131,7 +128,8 @@ struct PackageStruct {
|
|||
|
||||
/*@owned@*/ struct Source *icon;
|
||||
|
||||
int autoReqProv;
|
||||
int autoReq;
|
||||
int autoProv;
|
||||
|
||||
char *preInFile;
|
||||
char *postInFile;
|
||||
|
|
|
|||
|
|
@ -96,7 +96,9 @@ Package newPackage(Spec spec)
|
|||
|
||||
p->header = headerNew();
|
||||
p->icon = NULL;
|
||||
p->autoReqProv = 1;
|
||||
|
||||
p->autoProv = 1;
|
||||
p->autoReq = 1;
|
||||
|
||||
#if 0
|
||||
p->reqProv = NULL;
|
||||
|
|
@ -436,9 +438,6 @@ Spec newSpec(void)
|
|||
|
||||
spec->macros = &globalMacroContext;
|
||||
|
||||
spec->autoReq = 1;
|
||||
spec->autoProv = 1;
|
||||
|
||||
return spec;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"POT-Creation-Date: 1999-03-24 07:35-0500\n"
|
||||
"POT-Creation-Date: 1999-03-26 20:02+0000\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
@ -2194,17 +2194,17 @@ msgstr ""
|
|||
msgid "archive = %s, fs = %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: ../build/spec.c:230
|
||||
#: ../build/spec.c:232
|
||||
#, c-format
|
||||
msgid "line %d: Bad number: %s"
|
||||
msgstr ""
|
||||
|
||||
#: ../build/spec.c:236
|
||||
#: ../build/spec.c:238
|
||||
#, c-format
|
||||
msgid "line %d: Bad no%s number: %d"
|
||||
msgstr ""
|
||||
|
||||
#: ../build/spec.c:292
|
||||
#: ../build/spec.c:294
|
||||
#, c-format
|
||||
msgid "line %d: Bad %s number: %s\n"
|
||||
msgstr ""
|
||||
|
|
|
|||
|
|
@ -285,7 +285,12 @@ AC_REQUIRE([AC_PROG_LN_S])dnl
|
|||
dnl
|
||||
|
||||
# Check for any special flags to pass to ltconfig.
|
||||
libtool_flags="--cache-file=$cache_file"
|
||||
#
|
||||
# the following will cause an existing older ltconfig to fail, so
|
||||
# we ignore this at the expense of the cache file... Checking this
|
||||
# will just take longer ... bummer!
|
||||
#libtool_flags="--cache-file=$cache_file"
|
||||
#
|
||||
test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
|
||||
test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
|
||||
test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
|
||||
|
|
|
|||
Loading…
Reference in New Issue