From: Alan T. DeKok Date: Wed, 9 Dec 2020 12:39:40 +0000 (-0500) Subject: fix to use LIBRARY_EXT and correct names X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c76b4093b7fe345bfe19ed56a05466d50292400f;p=thirdparty%2Ffreeradius-server.git fix to use LIBRARY_EXT and correct names --- diff --git a/scripts/build/dlopen.mk b/scripts/build/dlopen.mk index 9dfb7b51135..1c3a2cad9ec 100644 --- a/scripts/build/dlopen.mk +++ b/scripts/build/dlopen.mk @@ -6,7 +6,7 @@ SOURCES = dlopen.c log.c # that building the target succeeds. # #ifneq "$(MAKECMDGOALS)" "$(TARGET)" -#load ${BUILD_DIR}/lib/.libs/libfreeradius-make-dlopen.dylib(dlopen_gmk_setup) +#load ${BUILD_DIR}/lib/.libs/libfreeradius-make-dlopen.${LIBRARY_EXT}(dlopen_gmk_setup) #$(info $(dlopen /home/foo/libcrypto,ASN1_verify,/home/user,/foo,/usr/local/Cellar/openssl@1.1/1.1.1d/lib)) #$(info $(dlsym libcrypto,ASN1_verify)) diff --git a/scripts/build/version.c b/scripts/build/version.c index ade4cff8b72..f3b48e5a861 100644 --- a/scripts/build/version.c +++ b/scripts/build/version.c @@ -32,7 +32,7 @@ /* * The only exported symbol */ -int libfreeradius_gmk_setup(void); +int version_gmk_setup(void); /* * GNU make insists on this in a loadable object. @@ -192,7 +192,7 @@ static char *make_version_eq(char const *nm, unsigned int argc, char **argv) return bool_to_str(res); } -int libfreeradius_gmk_setup(void) +int version_gmk_setup(void) { gmk_add_function("version_gt", &make_version_gt, 2, 2, 0); /* min 1, max 1, please expand the input string */ gmk_add_function("version_lt", &make_version_lt, 2, 2, 0); /* min 1, max 1, please expand the input string */ diff --git a/scripts/build/version.mk b/scripts/build/version.mk index 9a144d1e21a..be9cfe06883 100644 --- a/scripts/build/version.mk +++ b/scripts/build/version.mk @@ -6,7 +6,7 @@ SOURCES := version.c log.c # that building the target succeeds. # #ifneq "$(MAKECMDGOALS)" "$(TARGET)" -#load ${BUILD_DIR}/lib/.libs/libfreeradius-make-dlopen.dylib(dlopen_gmk_setup) +#load ${BUILD_DIR}/lib/.libs/libfreeradius-make-version.${LIBRARY_EXT}(version_gmk_setup) #$(info $(dlopen /home/foo/libcrypto,ASN1_verify,/home/user,/foo,/usr/local/Cellar/openssl@1.1/1.1.1d/lib)) #$(info $(dlsym libcrypto,ASN1_verify))