removed arch sensitive -- always on

CVS patchset: 814
CVS date: 1996/07/14 03:47:23

diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 9f5bc60..86bdd4b 100644 (file)
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -137,7 +137,7 @@ extern const int rpmTagTableSize;
 #define RPMVAR_ROOT                    6
 #define RPMVAR_RPMDIR                  7
 #define RPMVAR_SRPMDIR                 8
-#define RPMVAR_ARCHSENSITIVE           9
+/* #define RPMVAR_ARCHSENSITIVE        9  -- No longer used */
 #define RPMVAR_REQUIREDISTRIBUTION     10
 /* #define RPMVAR_REQUIREGROUP         11 -- No longer used */
 #define RPMVAR_REQUIREVENDOR           12

diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index 9b9ba3e..5e9b6a3 100644 (file)
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -23,7 +23,6 @@ struct archEquiv {
 
 /* this *must* be kept in alphabetical order */
 struct option optionTable[] = {
-    { "arch_sensitive",                RPMVAR_ARCHSENSITIVE,           0 },
     { "build_arch",            RPMVAR_BUILDARCH,               0 },
     { "builddir",              RPMVAR_BUILDDIR,                0 },
     { "buildprefix",            RPMVAR_BUILDPREFIX,             0 },
@@ -259,7 +258,6 @@ static int readRpmrc(FILE * f, char * fn, int readArchSpecific) {
 }
 
 static void setDefaults(void) {
-    setVar(RPMVAR_ARCHSENSITIVE, "1");
     setVar(RPMVAR_TOPDIR, "/usr/src");
     setVar(RPMVAR_DOCDIR, "/usr/doc");
     setVar(RPMVAR_OPTFLAGS, "-O2");