d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace checks for RESCUE in sources with checks for STATIC_GEOM_CLASSES

Browse Source 
and define STATIC_GEOM_CLASSES when building the rescue binary. This way
geom can more easily be part of other crunched binaries, as it requires
only a Makefile change.
This commit is contained in:
Marcel Moolenaar 2008-06-04 20:07:59 +00:00
parent 48f6b9b8b1
commit 14bf405be4
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=179550
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sbin/geom/Makefile
View File

@ -10,7 +10,7 @@
PROG= geom
SRCS= geom.c geom_label.c geom_part.c subr.c
CFLAGS+=-I${.CURDIR} -I${.CURDIR}/core
CFLAGS+=-I${.CURDIR} -I${.CURDIR}/core -DSTATIC_GEOM_CLASSES
DPADD= ${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL}
LDADD= -lgeom -lsbuf -lbsdxml -lutil

2
sbin/geom/class/label/geom_label.c
View File

@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$");
#include "core/geom.h"
#include "misc/subr.h"
#ifdef RESCUE
#ifdef STATIC_GEOM_CLASSES
#define PUBSYM(x) glabel_##x
#else
#define PUBSYM(x) x

2
sbin/geom/class/part/geom_part.c
View File

@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
#include "core/geom.h"
#include "misc/subr.h"
#ifdef RESCUE
#ifdef STATIC_GEOM_CLASSES
#define PUBSYM(x) gpart_##x
#else
#define PUBSYM(x) x

10
sbin/geom/core/geom.c
View File

@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
#include "misc/subr.h"
#ifdef RESCUE
#ifdef STATIC_GEOM_CLASSES
extern uint32_t gpart_version;
extern struct g_command gpart_class_commands[];
extern uint32_t glabel_version;
@ -472,7 +472,7 @@ run_command(int argc, char *argv[])
exit(EXIT_SUCCESS);
}
#ifndef RESCUE
#ifndef STATIC_GEOM_CLASSES
static const char *
library_path(void)
{
@ -551,7 +551,7 @@ load_library(void)
exit(EXIT_FAILURE);
}
}
#endif /* !RESCUE */
#endif /* !STATIC_GEOM_CLASSES */
/*
* Class name should be all capital letters.
@ -600,7 +600,7 @@ get_class(int *argc, char ***argv)
errx(EXIT_FAILURE, "Invalid utility name.");
}
#ifndef RESCUE
#ifndef STATIC_GEOM_CLASSES
load_library();
#else
if (!strcasecmp(class_name, "part")) {
@ -611,7 +611,7 @@ get_class(int *argc, char ***argv)
class_commands = glabel_class_commands;
} else
errx(EXIT_FAILURE, "Invalid class name.");
#endif /* !RESCUE */
#endif /* !STATIC_GEOM_CLASSES */
set_class_name();
if (*argc < 1)