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

Don't use version number in library name. The library version is checked

Browse Source 
after dlopen() anyway, so we should be safe.

Suggested by:	ru
This commit is contained in:
Pawel Jakub Dawidek 2004-08-02 09:05:29 +00:00
parent 3103c94843
commit fe5e0baab7
4 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sbin/geom/Makefile.inc
View File

@ -2,6 +2,5 @@
WARNS?= 6
CLASS_DIR?=/lib/geom
CLASS_MAJOR?=1
.include "../Makefile.inc"

3
sbin/geom/class/Makefile.inc
View File

@ -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

2
sbin/geom/core/Makefile
View File

@ -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}

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

@ -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