From 2d414a30bf7f99f3e2e73b05fdd68abeafbf6482 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 2 Apr 2021 22:23:45 +0300
Subject: Drop using redundant libcurl-symbols.expsym file

---
 libcurl/libcurl/buildfile              | 17 ++++---
 libcurl/libcurl/libcurl-symbols.expsym | 86 ----------------------------------
 2 files changed, 8 insertions(+), 95 deletions(-)
 delete mode 100644 libcurl/libcurl/libcurl-symbols.expsym

(limited to 'libcurl/libcurl')

diff --git a/libcurl/libcurl/buildfile b/libcurl/libcurl/buildfile
index 2245b83..d44293f 100644
--- a/libcurl/libcurl/buildfile
+++ b/libcurl/libcurl/buildfile
@@ -6,11 +6,6 @@
 define vsc: file
 vsc{*}: extension = vers
 
-# Exported symbols.
-#
-define esm: file
-esm{*}: extension = expsym
-
 import imp_libs  = libssl%lib{ssl}
 import imp_libs += libcrypto%lib{crypto}
 import imp_libs += libz%lib{z}
@@ -25,8 +20,7 @@ bsd     = ($tclass == 'bsd')
 macos   = ($tclass == 'macos')
 windows = ($tclass == 'windows')
 
-libs{curl}: vsc{libcurl}:         include = ($linux || $bsd ? adhoc : false)
-libs{curl}: esm{libcurl-symbols}: include = ($macos         ? adhoc : false)
+libs{curl}: vsc{libcurl}: include = ($linux || $bsd ? adhoc : false)
 
 vsc{libcurl}: lib/in{libcurl}
 {
@@ -95,8 +89,13 @@ switch $tclass, $tsys
   }
   case 'macos'
   {
-    c.loptions += "-Wl,-exported_symbols_list,$src_base/libcurl-symbols.expsym"
-    c.libs     += -framework CoreFoundation -framework Security
+    # Note that upstream generates the libcurl-symbols.expsym file on MacOS
+    # and passes it to linker via the -exported_symbols_list option. This
+    # looks redundant, since the __visibility__("default") attribute is also
+    # used for the API function declarations. Thus, we don't bother
+    # generating/passing the exported symbol list file.
+    #
+    c.libs += -framework CoreFoundation -framework Security
   }
   case 'windows', 'mingw32'
   {
diff --git a/libcurl/libcurl/libcurl-symbols.expsym b/libcurl/libcurl/libcurl-symbols.expsym
deleted file mode 100644
index 48882de..0000000
--- a/libcurl/libcurl/libcurl-symbols.expsym
+++ /dev/null
@@ -1,86 +0,0 @@
-_curl_easy_cleanup
-_curl_easy_duphandle
-_curl_easy_escape
-_curl_easy_getinfo
-_curl_easy_init
-_curl_easy_option_by_id
-_curl_easy_option_by_name
-_curl_easy_option_next
-_curl_easy_pause
-_curl_easy_perform
-_curl_easy_recv
-_curl_easy_reset
-_curl_easy_send
-_curl_easy_setopt
-_curl_easy_strerror
-_curl_easy_unescape
-_curl_easy_upkeep
-_curl_escape
-_curl_formadd
-_curl_formfree
-_curl_formget
-_curl_free
-_curl_getdate
-_curl_getenv
-_curl_global_cleanup
-_curl_global_init
-_curl_global_init_mem
-_curl_global_sslset
-#_curl_jmpenv
-_curl_maprintf
-_curl_mfprintf
-_curl_mime_addpart
-_curl_mime_data
-_curl_mime_data_cb
-_curl_mime_encoder
-_curl_mime_filedata
-_curl_mime_filename
-_curl_mime_free
-_curl_mime_headers
-_curl_mime_init
-_curl_mime_name
-_curl_mime_subparts
-_curl_mime_type
-_curl_mprintf
-_curl_msnprintf
-_curl_msprintf
-_curl_multi_add_handle
-_curl_multi_assign
-_curl_multi_cleanup
-_curl_multi_fdset
-_curl_multi_info_read
-_curl_multi_init
-_curl_multi_perform
-_curl_multi_poll
-_curl_multi_remove_handle
-_curl_multi_setopt
-_curl_multi_socket
-_curl_multi_socket_action
-_curl_multi_socket_all
-_curl_multi_strerror
-_curl_multi_timeout
-_curl_multi_wait
-_curl_multi_wakeup
-_curl_mvaprintf
-_curl_mvfprintf
-_curl_mvprintf
-_curl_mvsnprintf
-_curl_mvsprintf
-_curl_pushheader_byname
-_curl_pushheader_bynum
-_curl_share_cleanup
-_curl_share_init
-_curl_share_setopt
-_curl_share_strerror
-_curl_slist_append
-_curl_slist_free_all
-_curl_strequal
-_curl_strnequal
-_curl_unescape
-_curl_url
-_curl_url_cleanup
-_curl_url_dup
-_curl_url_get
-_curl_url_set
-_curl_version
-_curl_version_info
-- 
cgit v1.1