Skip to content

Commit 9ce79c4

Browse files
ejohnstownejohnstown
authored
Merge pull request #5921 from cconlon/libsuffix
2 parents 709461e + 9a7ff87 commit 9ce79c4

16 files changed

Lines changed: 274 additions & 259 deletions

File tree

‎configure.ac‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7429,6 +7429,20 @@ if test -n "$MPI_MAX_KEY_BITS" -o -n "$WITH_MAX_ECC_BITS"; then
74297429
fi
74307430
fi
74317431

7432+
# Library Suffix
7433+
LIBSUFFIX=""
7434+
AC_ARG_WITH([libsuffix],
7435+
[AS_HELP_STRING([--with-libsuffix=SUFFIX],[Library artifact SUFFIX, ie libwolfsslSUFFIX.so])],
7436+
[
7437+
if test "x$withval" != "xno" ; then
7438+
LIBSUFFIX=$withval
7439+
fi
7440+
if test "x$withval" = "xyes" ; then
7441+
AC_MSG_ERROR([Invalid argument to --with-libsuffix, no suffix given])
7442+
fi
7443+
]
7444+
)
7445+
AC_SUBST(LIBSUFFIX)
74327446

74337447
AC_ARG_ENABLE([context-extra-user-data],
74347448
[AS_HELP_STRING([--enable-context-extra-user-data],[Enables option for storing user-defined data in TLS API contexts, with optional argument the number of slots to allocate (default: disabled)])],
@@ -8616,6 +8630,7 @@ echo " * C++ Flags: $CXXFLAGS"
86168630
echo " * CPP Flags: $CPPFLAGS"
86178631
echo " * CCAS Flags: $CCASFLAGS"
86188632
echo " * LIB Flags: $LIB"
8633+
echo " * Library Suffix: $LIBSUFFIX"
86198634

86208635
test "$ENABLED_LINUXKM" = "yes" && \
86218636
echo " * Linux Kernel Build Root: $KERNEL_ROOT" && \

‎examples/benchmark/include.am‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ if BUILD_THREADED_EXAMPLES
77
noinst_PROGRAMS += examples/benchmark/tls_bench
88
noinst_HEADERS += examples/benchmark/tls_bench.h
99
examples_benchmark_tls_bench_SOURCES = examples/benchmark/tls_bench.c
10-
examples_benchmark_tls_bench_LDADD = src/libwolfssl.la $(LIB_STATIC_ADD)
11-
examples_benchmark_tls_bench_DEPENDENCIES = src/libwolfssl.la
10+
examples_benchmark_tls_bench_LDADD = src/libwolfssl@LIBSUFFIX@.la $(LIB_STATIC_ADD)
11+
examples_benchmark_tls_bench_DEPENDENCIES = src/libwolfssl@LIBSUFFIX@.la
1212
endif
1313

1414
dist_example_DATA+= examples/benchmark/tls_bench.c

‎examples/client/include.am‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ if BUILD_EXAMPLE_CLIENTS
55
noinst_PROGRAMS += examples/client/client
66
noinst_HEADERS += examples/client/client.h
77
examples_client_client_SOURCES = examples/client/client.c
8-
examples_client_client_LDADD = src/libwolfssl.la $(LIB_STATIC_ADD) $(WOLFSENTRY_LIB)
9-
examples_client_client_DEPENDENCIES = src/libwolfssl.la
8+
examples_client_client_LDADD = src/libwolfssl@LIBSUFFIX@.la $(LIB_STATIC_ADD) $(WOLFSENTRY_LIB)
9+
examples_client_client_DEPENDENCIES = src/libwolfssl@LIBSUFFIX@.la
1010
examples_client_client_CFLAGS = $(WOLFSENTRY_INCLUDE) $(AM_CFLAGS)
1111
endif
1212
EXTRA_DIST += examples/client/client.sln

‎examples/echoclient/include.am‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ if BUILD_EXAMPLE_CLIENTS
77
noinst_PROGRAMS += examples/echoclient/echoclient
88
noinst_HEADERS += examples/echoclient/echoclient.h
99
examples_echoclient_echoclient_SOURCES = examples/echoclient/echoclient.c
10-
examples_echoclient_echoclient_LDADD = src/libwolfssl.la $(LIB_STATIC_ADD)
11-
examples_echoclient_echoclient_DEPENDENCIES = src/libwolfssl.la
10+
examples_echoclient_echoclient_LDADD = src/libwolfssl@LIBSUFFIX@.la $(LIB_STATIC_ADD)
11+
examples_echoclient_echoclient_DEPENDENCIES = src/libwolfssl@LIBSUFFIX@.la
1212
endif
1313
EXTRA_DIST += examples/echoclient/echoclient.sln
1414
EXTRA_DIST += examples/echoclient/echoclient.vcproj

‎examples/echoserver/include.am‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ if BUILD_EXAMPLE_SERVERS
77
noinst_PROGRAMS += examples/echoserver/echoserver
88
noinst_HEADERS += examples/echoserver/echoserver.h
99
examples_echoserver_echoserver_SOURCES = examples/echoserver/echoserver.c
10-
examples_echoserver_echoserver_LDADD = src/libwolfssl.la $(LIB_STATIC_ADD)
11-
examples_echoserver_echoserver_DEPENDENCIES = src/libwolfssl.la
10+
examples_echoserver_echoserver_LDADD = src/libwolfssl@LIBSUFFIX@.la $(LIB_STATIC_ADD)
11+
examples_echoserver_echoserver_DEPENDENCIES = src/libwolfssl@LIBSUFFIX@.la
1212
endif
1313
EXTRA_DIST += examples/echoserver/echoserver.sln
1414
EXTRA_DIST += examples/echoserver/echoserver.vcproj

‎examples/sctp/include.am‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ noinst_PROGRAMS += \
1111
examples_sctp_sctp_server_SOURCES = examples/sctp/sctp-server.c
1212
examples_sctp_sctp_server_LDADD = $(LIB_STATIC_ADD)
1313
examples_sctp_sctp_server_dtls_SOURCES = examples/sctp/sctp-server-dtls.c
14-
examples_sctp_sctp_server_dtls_LDADD = src/libwolfssl.la $(LIB_STATIC_ADD)
15-
examples_sctp_sctp_server_dtls_DEPENDENCIES = src/libwolfssl.la
14+
examples_sctp_sctp_server_dtls_LDADD = src/libwolfssl@LIBSUFFIX@.la $(LIB_STATIC_ADD)
15+
examples_sctp_sctp_server_dtls_DEPENDENCIES = src/libwolfssl@LIBSUFFIX@.la
1616
endif
1717
if BUILD_EXAMPLE_CLIENTS
1818
noinst_PROGRAMS += \
@@ -21,8 +21,8 @@ noinst_PROGRAMS += \
2121
examples_sctp_sctp_client_SOURCES = examples/sctp/sctp-client.c
2222
examples_sctp_sctp_client_LDADD = $(LIB_STATIC_ADD)
2323
examples_sctp_sctp_client_dtls_SOURCES = examples/sctp/sctp-client-dtls.c
24-
examples_sctp_sctp_client_dtls_LDADD = src/libwolfssl.la $(LIB_STATIC_ADD)
25-
examples_sctp_sctp_client_dtls_DEPENDENCIES = src/libwolfssl.la
24+
examples_sctp_sctp_client_dtls_LDADD = src/libwolfssl@LIBSUFFIX@.la $(LIB_STATIC_ADD)
25+
examples_sctp_sctp_client_dtls_DEPENDENCIES = src/libwolfssl@LIBSUFFIX@.la
2626
endif
2727
endif
2828

‎examples/server/include.am‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ if BUILD_EXAMPLE_SERVERS
77
noinst_PROGRAMS += examples/server/server
88
noinst_HEADERS += examples/server/server.h
99
examples_server_server_SOURCES = examples/server/server.c
10-
examples_server_server_LDADD = src/libwolfssl.la $(LIB_STATIC_ADD) $(WOLFSENTRY_LIB)
11-
examples_server_server_DEPENDENCIES = src/libwolfssl.la
10+
examples_server_server_LDADD = src/libwolfssl@LIBSUFFIX@.la $(LIB_STATIC_ADD) $(WOLFSENTRY_LIB)
11+
examples_server_server_DEPENDENCIES = src/libwolfssl@LIBSUFFIX@.la
1212
examples_server_server_CFLAGS = $(WOLFSENTRY_INCLUDE) $(AM_CFLAGS)
1313
endif
1414
EXTRA_DIST += examples/server/server.sln

‎mcapi/include.am‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ check_PROGRAMS += mcapi/test
77
noinst_PROGRAMS += mcapi/test
88
mcapi_test_SOURCES = mcapi/crypto.c \
99
mcapi/mcapi_test.c
10-
mcapi_test_LDADD = src/libwolfssl.la
11-
mcapi_test_DEPENDENCIES = src/libwolfssl.la
10+
mcapi_test_LDADD = src/libwolfssl@LIBSUFFIX@.la
11+
mcapi_test_DEPENDENCIES = src/libwolfssl@LIBSUFFIX@.la
1212
endif
1313

1414
noinst_HEADERS += mcapi/crypto.h

‎rpm/spec.in‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ fi
5050
%{__rm} -rf %{buildroot}
5151
%{__make} install DESTDIR="%{buildroot}" AM_INSTALL_PROGRAM_FLAGS=""
5252
mkdir -p $RPM_BUILD_ROOT/
53-
%{__rm} -f %{buildroot}/%{_libdir}/libwolfssl.la
53+
%{__rm} -f %{buildroot}/%{_libdir}/libwolfssl@LIBSUFFIX@.la
5454

5555
%check
5656

@@ -78,9 +78,9 @@ mkdir -p $RPM_BUILD_ROOT/
7878
%{_docdir}/wolfssl/README.txt
7979
%{_docdir}/wolfssl/QUIC.md
8080

81-
%{_libdir}/libwolfssl.so
82-
%{_libdir}/libwolfssl.so.@WOLFSSL_LIBRARY_VERSION_FIRST@
83-
%{_libdir}/libwolfssl.so.@WOLFSSL_LIBRARY_VERSION_FIRST@.@WOLFSSL_LIBRARY_VERSION_SECOND@.@WOLFSSL_LIBRARY_VERSION_THIRD@
81+
%{_libdir}/libwolfssl@LIBSUFFIX@.so
82+
%{_libdir}/libwolfssl@LIBSUFFIX@.so.@WOLFSSL_LIBRARY_VERSION_FIRST@
83+
%{_libdir}/libwolfssl@LIBSUFFIX@.so.@WOLFSSL_LIBRARY_VERSION_FIRST@.@WOLFSSL_LIBRARY_VERSION_SECOND@.@WOLFSSL_LIBRARY_VERSION_THIRD@
8484

8585
%files devel
8686
%defattr(-,root,root,-)

0 commit comments

Comments
 (0)