diff options
| author | pjd <pjd@FreeBSD.org> | 2004-08-02 09:05:29 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2004-08-02 09:05:29 +0000 |
| commit | 27a1acf9e3af5dba7d105122656145b146c238d7 (patch) | |
| tree | 06958ce295f0743ef152e0083d524690ddbbea08 | |
| parent | db9322a9fc353030b5b2e97279a3b6407f43de93 (diff) | |
| download | FreeBSD-src-27a1acf9e3af5dba7d105122656145b146c238d7.zip FreeBSD-src-27a1acf9e3af5dba7d105122656145b146c238d7.tar.gz | |
Don't use version number in library name. The library version is checked
after dlopen() anyway, so we should be safe.
Suggested by: ru
| -rw-r--r-- | sbin/geom/Makefile.inc | 1 | ||||
| -rw-r--r-- | sbin/geom/class/Makefile.inc | 3 | ||||
| -rw-r--r-- | sbin/geom/core/Makefile | 2 | ||||
| -rw-r--r-- | sbin/geom/core/geom.c | 3 |
4 files changed, 3 insertions, 6 deletions
diff --git a/sbin/geom/Makefile.inc b/sbin/geom/Makefile.inc index d3914ab..94ca09f 100644 --- a/sbin/geom/Makefile.inc +++ b/sbin/geom/Makefile.inc @@ -2,6 +2,5 @@ WARNS?= 6 CLASS_DIR?=/lib/geom -CLASS_MAJOR?=1 .include "../Makefile.inc" diff --git a/sbin/geom/class/Makefile.inc b/sbin/geom/class/Makefile.inc index aeb0dcd..112756d 100644 --- a/sbin/geom/class/Makefile.inc +++ b/sbin/geom/class/Makefile.inc @@ -1,8 +1,7 @@ # $FreeBSD$ SHLIBDIR?=${CLASS_DIR} -SHLIB_MAJOR=${CLASS_MAJOR} -SHLIB_NAME?=geom_${CLASS}.so.${SHLIB_MAJOR} +SHLIB_NAME?=geom_${CLASS}.so LINKS= ${BINDIR}/geom ${BINDIR}/g${CLASS} MAN= g${CLASS}.8 SRCS= geom_${CLASS}.c subr.c diff --git a/sbin/geom/core/Makefile b/sbin/geom/core/Makefile index 6ee6c39..ab5d94a 100644 --- a/sbin/geom/core/Makefile +++ b/sbin/geom/core/Makefile @@ -6,7 +6,7 @@ PROG= geom MAN= geom.8 SRCS= geom.c subr.c -CFLAGS+= -DCLASS_DIR=\"${CLASS_DIR}\" -DCLASS_MAJOR=${CLASS_MAJOR} +CFLAGS+= -DCLASS_DIR=\"${CLASS_DIR}\" CFLAGS+= -I${.CURDIR}/../../../sys -I${.CURDIR} -I${.CURDIR}/.. DPADD= ${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL} diff --git a/sbin/geom/core/geom.c b/sbin/geom/core/geom.c index dcc6631..c327179 100644 --- a/sbin/geom/core/geom.c +++ b/sbin/geom/core/geom.c @@ -438,8 +438,7 @@ load_library(void) uint32_t *lib_version; void *dlh; - snprintf(path, sizeof(path), "%s/geom_%s.so.%u", CLASS_DIR, class_name, - CLASS_MAJOR); + snprintf(path, sizeof(path), "%s/geom_%s.so", CLASS_DIR, class_name); dlh = dlopen(path, RTLD_NOW); if (dlh == NULL) { #if 0 |
