openkylin
/
curl
mirror of https://gitee.com/openkylin/curl.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Build with NSS. 

Origin: vendor
Forwarded: not-needed
Reviewed-by: Alessandro Ghedini <ghedo@debian.org>
Last-Update: 2015-08-12

Gbp-Pq: Name 99_nss.patch
This commit is contained in:
Ramakrishnan Muthukrishnan 2022-05-13 20:09:08 +08:00 committed by openKylinBot
parent 0e8c584d39
commit ba5d1c2c7d
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/examples/Makefile.am
View File

@ -48,9 +48,9 @@ LIBS = $(BLANK_AT_MAKETIME)
# Dependencies # Dependencies
if USE_EXPLICIT_LIB_DEPS if USE_EXPLICIT_LIB_DEPS
LDADD = $(LIBDIR)/libcurl-gnutls.la @LIBCURL_LIBS@ LDADD = $(LIBDIR)/libcurl-nss.la @LIBCURL_LIBS@
else else
LDADD = $(LIBDIR)/libcurl-gnutls.la LDADD = $(LIBDIR)/libcurl-nss.la
endif endif
# This might hold -Werror # This might hold -Werror

32
lib/Makefile.am
View File

@ -31,7 +31,7 @@ EXTRA_DIST = Makefile.m32 config-win32.h config-win32ce.h \
config-tpf.h mk-ca-bundle.pl mk-ca-bundle.vbs $(CMAKE_DIST) \ config-tpf.h mk-ca-bundle.pl mk-ca-bundle.vbs $(CMAKE_DIST) \
firefox-db2pem.sh config-vxworks.h Makefile.vxworks checksrc.pl firefox-db2pem.sh config-vxworks.h Makefile.vxworks checksrc.pl
lib_LTLIBRARIES = libcurl-gnutls.la lib_LTLIBRARIES = libcurl-nss.la
if BUILD_UNITTESTS if BUILD_UNITTESTS
noinst_LTLIBRARIES = libcurlu.la noinst_LTLIBRARIES = libcurlu.la
@ -83,43 +83,43 @@ AM_CPPFLAGS += -DBUILDING_LIBCURL
AM_LDFLAGS = AM_LDFLAGS =
AM_CFLAGS = AM_CFLAGS =
libcurl_gnutls_la_CPPFLAGS_EXTRA = libcurl_nss_la_CPPFLAGS_EXTRA =
libcurl_gnutls_la_LDFLAGS_EXTRA = libcurl_nss_la_LDFLAGS_EXTRA =
libcurl_gnutls_la_CFLAGS_EXTRA = libcurl_nss_la_CFLAGS_EXTRA =
if CURL_LT_SHLIB_USE_VERSION_INFO if CURL_LT_SHLIB_USE_VERSION_INFO
libcurl_gnutls_la_LDFLAGS_EXTRA += $(VERSIONINFO) libcurl_nss_la_LDFLAGS_EXTRA += $(VERSIONINFO)
endif endif
if CURL_LT_SHLIB_USE_NO_UNDEFINED if CURL_LT_SHLIB_USE_NO_UNDEFINED
libcurl_gnutls_la_LDFLAGS_EXTRA += -no-undefined libcurl_nss_la_LDFLAGS_EXTRA += -no-undefined
endif endif
if CURL_LT_SHLIB_USE_MIMPURE_TEXT if CURL_LT_SHLIB_USE_MIMPURE_TEXT
libcurl_gnutls_la_LDFLAGS_EXTRA += -mimpure-text libcurl_nss_la_LDFLAGS_EXTRA += -mimpure-text
endif endif
if CURL_LT_SHLIB_USE_VERSIONED_SYMBOLS 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 else
# if symbol-hiding is enabled, hide them! # if symbol-hiding is enabled, hide them!
if DOING_CURL_SYMBOL_HIDING 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
endif endif
if USE_CPPFLAG_CURL_STATICLIB if USE_CPPFLAG_CURL_STATICLIB
libcurl_gnutls_la_CPPFLAGS_EXTRA += -DCURL_STATICLIB libcurl_nss_la_CPPFLAGS_EXTRA += -DCURL_STATICLIB
endif endif
if DOING_CURL_SYMBOL_HIDING if DOING_CURL_SYMBOL_HIDING
libcurl_gnutls_la_CPPFLAGS_EXTRA += -DCURL_HIDDEN_SYMBOLS libcurl_nss_la_CPPFLAGS_EXTRA += -DCURL_HIDDEN_SYMBOLS
libcurl_gnutls_la_CFLAGS_EXTRA += $(CFLAG_CURL_SYMBOL_HIDING) libcurl_nss_la_CFLAGS_EXTRA += $(CFLAG_CURL_SYMBOL_HIDING)
endif endif
libcurl_gnutls_la_CPPFLAGS = $(AM_CPPFLAGS) $(libcurl_gnutls_la_CPPFLAGS_EXTRA) libcurl_nss_la_CPPFLAGS = $(AM_CPPFLAGS) $(libcurl_nss_la_CPPFLAGS_EXTRA)
libcurl_gnutls_la_LDFLAGS = $(AM_LDFLAGS) $(libcurl_gnutls_la_LDFLAGS_EXTRA) $(LDFLAGS) $(LIBCURL_LIBS) libcurl_nss_la_LDFLAGS = $(AM_LDFLAGS) $(libcurl_nss_la_LDFLAGS_EXTRA) $(LDFLAGS) $(LIBCURL_LIBS)
libcurl_gnutls_la_CFLAGS = $(AM_CFLAGS) $(libcurl_gnutls_la_CFLAGS_EXTRA) libcurl_nss_la_CFLAGS = $(AM_CFLAGS) $(libcurl_nss_la_CFLAGS_EXTRA)
libcurlu_la_CPPFLAGS = $(AM_CPPFLAGS) -DCURL_STATICLIB -DUNITTESTS libcurlu_la_CPPFLAGS = $(AM_CPPFLAGS) -DCURL_STATICLIB -DUNITTESTS
libcurlu_la_LDFLAGS = $(AM_LDFLAGS) -static $(LIBCURL_LIBS) libcurlu_la_LDFLAGS = $(AM_LDFLAGS) -static $(LIBCURL_LIBS)
@ -128,7 +128,7 @@ libcurlu_la_CFLAGS = $(AM_CFLAGS)
# Makefile.inc provides the CSOURCES and HHEADERS defines # Makefile.inc provides the CSOURCES and HHEADERS defines
include Makefile.inc include Makefile.inc
libcurl_gnutls_la_SOURCES = $(CSOURCES) $(HHEADERS) libcurl_nss_la_SOURCES = $(CSOURCES) $(HHEADERS)
libcurlu_la_SOURCES = $(CSOURCES) $(HHEADERS) libcurlu_la_SOURCES = $(CSOURCES) $(HHEADERS)
CHECKSRC = $(CS_$(V)) CHECKSRC = $(CS_$(V))

4
src/Makefile.am
View File

@ -61,9 +61,9 @@ CFLAGS += @CURL_CFLAG_EXTRAS@
LIBS = $(BLANK_AT_MAKETIME) LIBS = $(BLANK_AT_MAKETIME)
if USE_EXPLICIT_LIB_DEPS if USE_EXPLICIT_LIB_DEPS
curl_LDADD = $(top_builddir)/lib/libcurl-gnutls.la @LIBMETALINK_LIBS@ @LIBCURL_LIBS@ curl_LDADD = $(top_builddir)/lib/libcurl-nss.la @LIBMETALINK_LIBS@ @LIBCURL_LIBS@
else else
curl_LDADD = $(top_builddir)/lib/libcurl-gnutls.la @LIBMETALINK_LIBS@ @NSS_LIBS@ @SSL_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@ curl_LDADD = $(top_builddir)/lib/libcurl-nss.la @LIBMETALINK_LIBS@ @NSS_LIBS@ @SSL_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@
endif endif
curl_LDFLAGS = @LIBMETALINK_LDFLAGS@ curl_LDFLAGS = @LIBMETALINK_LDFLAGS@

8
tests/libtest/Makefile.am
View File

@ -57,11 +57,11 @@ CLEANFILES = lib1521.c
LIBS = $(BLANK_AT_MAKETIME) LIBS = $(BLANK_AT_MAKETIME)
if USE_EXPLICIT_LIB_DEPS if USE_EXPLICIT_LIB_DEPS
SUPPORTFILES_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-gnutls.la @LIBCURL_LIBS@ TESTUTIL_LIBS = $(top_builddir)/lib/libcurl-nss.la @LIBCURL_LIBS@
else else
SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl-gnutls.la @CURL_NETWORK_LIBS@ @NSS_LIBS@ SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl-nss.la @CURL_NETWORK_LIBS@ @NSS_LIBS@
TESTUTIL_LIBS = $(top_builddir)/lib/libcurl-gnutls.la @CURL_NETWORK_AND_TIME_LIBS@ @NSS_LIBS@ TESTUTIL_LIBS = $(top_builddir)/lib/libcurl-nss.la @CURL_NETWORK_AND_TIME_LIBS@ @NSS_LIBS@
endif endif
# Dependencies (may need to be overridden) # Dependencies (may need to be overridden)