From 9870b64c2da27f9ba567c154c338b8317620b2c2 Mon Sep 17 00:00:00 2001 From: Ramakrishnan Muthukrishnan Date: Tue, 17 Sep 2024 16:29:24 -0300 Subject: [PATCH] Build with NSS. Origin: vendor Forwarded: not-needed Reviewed-by: Alessandro Ghedini Last-Update: 2015-08-12 Gbp-Pq: Name 99_nss.patch --- docs/examples/Makefile.am | 4 ++-- lib/Makefile.am | 42 +++++++++++++++++++-------------------- src/Makefile.am | 4 ++-- tests/libtest/Makefile.am | 8 ++++---- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am index 750000e8..d15147dc 100644 --- a/docs/examples/Makefile.am +++ b/docs/examples/Makefile.am @@ -51,9 +51,9 @@ LIBS = $(BLANK_AT_MAKETIME) # Dependencies if USE_EXPLICIT_LIB_DEPS -LDADD = $(LIBDIR)/libcurl-gnutls.la @LIBCURL_LIBS@ +LDADD = $(LIBDIR)/libcurl-nss.la @LIBCURL_LIBS@ else -LDADD = $(LIBDIR)/libcurl-gnutls.la +LDADD = $(LIBDIR)/libcurl-nss.la endif # This might hold -Werror diff --git a/lib/Makefile.am b/lib/Makefile.am index 30c38f91..02f900aa 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -31,7 +31,7 @@ EXTRA_DIST = Makefile.mk config-win32.h config-win32ce.h config-plan9.h \ config-os400.h setup-os400.h $(CMAKE_DIST) setup-win32.h .checksrc \ Makefile.soname -lib_LTLIBRARIES = libcurl-gnutls.la +lib_LTLIBRARIES = libcurl-nss.la if BUILD_UNITTESTS noinst_LTLIBRARIES = libcurlu.la @@ -67,55 +67,55 @@ AM_CFLAGS = # Makefile.inc provides the CSOURCES and HHEADERS defines include Makefile.inc -libcurl_gnutls_la_SOURCES = $(CSOURCES) $(HHEADERS) -libcurlu_gnutls_la_SOURCES = $(CSOURCES) $(HHEADERS) +libcurl_nss_la_SOURCES = $(CSOURCES) $(HHEADERS) +libcurlu_nss_la_SOURCES = $(CSOURCES) $(HHEADERS) -libcurl_gnutls_la_CPPFLAGS_EXTRA = -libcurl_gnutls_la_LDFLAGS_EXTRA = -libcurl_gnutls_la_CFLAGS_EXTRA = +libcurl_nss_la_CPPFLAGS_EXTRA = +libcurl_nss_la_LDFLAGS_EXTRA = +libcurl_nss_la_CFLAGS_EXTRA = if CURL_LT_SHLIB_USE_VERSION_INFO -libcurl_gnutls_la_LDFLAGS_EXTRA += $(VERSIONINFO) +libcurl_nss_la_LDFLAGS_EXTRA += $(VERSIONINFO) endif if CURL_LT_SHLIB_USE_NO_UNDEFINED -libcurl_gnutls_la_LDFLAGS_EXTRA += -no-undefined +libcurl_nss_la_LDFLAGS_EXTRA += -no-undefined endif if CURL_LT_SHLIB_USE_MIMPURE_TEXT -libcurl_gnutls_la_LDFLAGS_EXTRA += -mimpure-text +libcurl_nss_la_LDFLAGS_EXTRA += -mimpure-text endif if CURL_LT_SHLIB_USE_VERSIONED_SYMBOLS -libcurl_gnutls_la_LDFLAGS_EXTRA += -Wl,--version-script=libcurl.vers +libcurl_nss_la_LDFLAGS_EXTRA += -Wl,--version-script=libcurl.vers else # if symbol-hiding is enabled, hide them! if DOING_CURL_SYMBOL_HIDING -libcurl_gnutls_la_LDFLAGS_EXTRA += -export-symbols-regex '^curl_.*' +libcurl_nss_la_LDFLAGS_EXTRA += -export-symbols-regex '^curl_.*' endif endif if USE_CPPFLAG_CURL_STATICLIB -libcurl_gnutls_la_CPPFLAGS_EXTRA += -DCURL_STATICLIB +libcurl_nss_la_CPPFLAGS_EXTRA += -DCURL_STATICLIB else if HAVE_WINDRES -libcurl_gnutls_la_SOURCES += $(LIB_RCFILES) +libcurl_nss_la_SOURCES += $(LIB_RCFILES) $(LIB_RCFILES): $(top_srcdir)/include/curl/curlver.h endif endif if DOING_CURL_SYMBOL_HIDING -libcurl_gnutls_la_CPPFLAGS_EXTRA += -DCURL_HIDDEN_SYMBOLS -libcurl_gnutls_la_CFLAGS_EXTRA += $(CFLAG_CURL_SYMBOL_HIDING) +libcurl_nss_la_CPPFLAGS_EXTRA += -DCURL_HIDDEN_SYMBOLS +libcurl_nss_la_CFLAGS_EXTRA += $(CFLAG_CURL_SYMBOL_HIDING) endif -libcurl_gnutls_la_CPPFLAGS = $(AM_CPPFLAGS) $(libcurl_gnutls_la_CPPFLAGS_EXTRA) -libcurl_gnutls_la_LDFLAGS = $(AM_LDFLAGS) $(libcurl_gnutls_la_LDFLAGS_EXTRA) $(LDFLAGS) $(LIBCURL_LIBS) -libcurl_gnutls_la_CFLAGS = $(AM_CFLAGS) $(libcurl_gnutls_la_CFLAGS_EXTRA) +libcurl_nss_la_CPPFLAGS = $(AM_CPPFLAGS) $(libcurl_nss_la_CPPFLAGS_EXTRA) +libcurl_nss_la_LDFLAGS = $(AM_LDFLAGS) $(libcurl_nss_la_LDFLAGS_EXTRA) $(LDFLAGS) $(LIBCURL_LIBS) +libcurl_nss_la_CFLAGS = $(AM_CFLAGS) $(libcurl_nss_la_CFLAGS_EXTRA) -libcurlu_gnutls_la_CPPFLAGS = $(AM_CPPFLAGS) -DCURL_STATICLIB -DUNITTESTS -libcurlu_gnutls_la_LDFLAGS = $(AM_LDFLAGS) -static $(LIBCURL_LIBS) -libcurlu_gnutls_la_CFLAGS = $(AM_CFLAGS) +libcurlu_nss_la_CPPFLAGS = $(AM_CPPFLAGS) -DCURL_STATICLIB -DUNITTESTS +libcurlu_nss_la_LDFLAGS = $(AM_LDFLAGS) -static $(LIBCURL_LIBS) +libcurlu_nss_la_CFLAGS = $(AM_CFLAGS) CHECKSRC = $(CS_$(V)) CS_0 = @echo " RUN " $@; diff --git a/src/Makefile.am b/src/Makefile.am index 1726c1ce..c4763a6b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -67,9 +67,9 @@ CFLAGS += @CURL_CFLAG_EXTRAS@ LIBS = $(BLANK_AT_MAKETIME) if USE_EXPLICIT_LIB_DEPS -curl_LDADD = $(top_builddir)/lib/libcurl-gnutls.la @LIBCURL_LIBS@ +curl_LDADD = $(top_builddir)/lib/libcurl-nss.la @LIBCURL_LIBS@ else -curl_LDADD = $(top_builddir)/lib/libcurl-gnutls.la @NSS_LIBS@ @SSL_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@ +curl_LDADD = $(top_builddir)/lib/libcurl-nss.la @NSS_LIBS@ @SSL_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@ endif # if unit tests are enabled, build a static library to link them with diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am index 1eec3d1d..092eff05 100644 --- a/tests/libtest/Makefile.am +++ b/tests/libtest/Makefile.am @@ -49,11 +49,11 @@ CLEANFILES = lib1521.c LIBS = $(BLANK_AT_MAKETIME) if USE_EXPLICIT_LIB_DEPS -SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl-gnutls.la @LIBCURL_LIBS@ -TESTUTIL_LIBS = $(top_builddir)/lib/libcurl-gnutls.la @LIBCURL_LIBS@ +SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl-nss.la @LIBCURL_LIBS@ +TESTUTIL_LIBS = $(top_builddir)/lib/libcurl-nss.la @LIBCURL_LIBS@ else -SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl-gnutls.la @CURL_NETWORK_LIBS@ @NSS_LIBS@ -TESTUTIL_LIBS = $(top_builddir)/lib/libcurl-gnutls.la @CURL_NETWORK_AND_TIME_LIBS@ @NSS_LIBS@ +SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl-nss.la @CURL_NETWORK_LIBS@ @NSS_LIBS@ +TESTUTIL_LIBS = $(top_builddir)/lib/libcurl-nss.la @CURL_NETWORK_AND_TIME_LIBS@ @NSS_LIBS@ endif # Dependencies (may need to be overridden) -- 2.30.2