Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
6acf81d5
Commit
6acf81d5
authored
Sep 20, 2021
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
python/build/libs.py: build CURL with cmake
parent
4eb56d84
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
39 additions
and
40 deletions
+39
-40
libs.py
python/build/libs.py
+27
-24
no_CMAKE_C_IMPLICIT_LINK_LIBRARIES.patch
...lib/curl/patches/no_CMAKE_C_IMPLICIT_LINK_LIBRARIES.patch
+11
-0
only_lib.patch
src/lib/curl/patches/only_lib.patch
+0
-15
series
src/lib/curl/patches/series
+1
-1
No files found.
python/build/libs.py
View file @
6acf81d5
...
@@ -391,35 +391,38 @@ openssl = OpenSSLProject(
...
@@ -391,35 +391,38 @@ openssl = OpenSSLProject(
'include/openssl/ossl_typ.h'
,
'include/openssl/ossl_typ.h'
,
)
)
curl
=
Autotools
Project
(
curl
=
Cmake
Project
(
'https://curl.se/download/curl-7.78.0.tar.xz'
,
'https://curl.se/download/curl-7.78.0.tar.xz'
,
'be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5'
,
'be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5'
,
'lib/libcurl.a'
,
'lib/libcurl.a'
,
[
[
'--disable-shared'
,
'--enable-static'
,
'-DBUILD_CURL_EXE=OFF'
,
'--disable-debug'
,
'-DBUILD_SHARED_LIBS=OFF'
,
'--enable-http'
,
'-DCURL_DISABLE_VERBOSE_STRINGS=ON'
,
'--enable-ipv6'
,
'-DCURL_DISABLE_LDAP=ON'
,
'--disable-ftp'
,
'--disable-file'
,
'-DCURL_DISABLE_TELNET=ON'
,
'--disable-ldap'
,
'--disable-ldaps'
,
'-DCURL_DISABLE_DICT=ON'
,
'--disable-rtsp'
,
'--disable-proxy'
,
'--disable-dict'
,
'--disable-telnet'
,
'-DCURL_DISABLE_FILE=ON'
,
'--disable-tftp'
,
'--disable-pop3'
,
'--disable-imap'
,
'--disable-smtp'
,
'-DCURL_DISABLE_FTP=ON'
,
'--disable-smb'
,
'-DCURL_DISABLE_TFTP=ON'
,
'--disable-gopher'
,
'-DCURL_DISABLE_LDAPS=ON'
,
'--disable-manual'
,
'-DCURL_DISABLE_RTSP=ON'
,
'--disable-threaded-resolver'
,
'--disable-verbose'
,
'--disable-sspi'
,
'-DCURL_DISABLE_PROXY=ON'
,
'--disable-crypto-auth'
,
'--disable-ntlm-wb'
,
'--disable-tls-srp'
,
'--disable-cookies'
,
'-DCURL_DISABLE_POP3=ON'
,
'--disable-doh'
,
'-DCURL_DISABLE_IMAP=ON'
,
'--disable-mime'
,
'-DCURL_DISABLE_SMTP=ON'
,
'--disable-netrc'
,
'-DCURL_DISABLE_GOPHER=ON'
,
'--disable-progress-meter'
,
'-DCURL_DISABLE_COOKIES=ON'
,
'--disable-alt-svc'
,
'-DCURL_DISABLE_CRYPTO_AUTH=ON'
,
'--without-gnutls'
,
'--without-nss'
,
'--without-libssh2'
,
'-DCURL_DISABLE_ALTSVC=ON'
,
'-DCMAKE_USE_LIBSSH2=OFF'
,
# native Windows SSL/TLS support, option ignored on non-Windows builds
'-DCURL_WINDOWS_SSPI=OFF'
,
'--with-schannel'
,
'-DCURL_DISABLE_NTLM=ON'
,
'-DBUILD_TESTING=OFF'
,
],
windows_configure_args
=
[
'-DCMAKE_USE_SCHANNEL=ON'
,
],
],
patches
=
'src/lib/curl/patches'
,
patches
=
'src/lib/curl/patches'
,
)
)
...
...
src/lib/curl/patches/no_CMAKE_C_IMPLICIT_LINK_LIBRARIES.patch
0 → 100644
View file @
6acf81d5
--- curl-7.75.0.orig/CMakeLists.txt 2021-02-02 09:26:24.000000000 +0100
+++ curl-7.75.0/CMakeLists.txt 2021-03-25 20:17:25.445684029 +0100
@@ -1453,7 +1453,7 @@
set(LDFLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
set(LIBCURL_LIBS "")
set(libdir "${CMAKE_INSTALL_PREFIX}/lib")
-foreach(_lib ${CMAKE_C_IMPLICIT_LINK_LIBRARIES} ${CURL_LIBS})
+foreach(_lib ${CURL_LIBS})
if(TARGET "${_lib}")
set(_libname "${_lib}")
get_target_property(_libtype "${_libname}" TYPE)
src/lib/curl/patches/only_lib.patch
deleted
100644 → 0
View file @
4eb56d84
Index: curl-7.58.0/Makefile.in
===================================================================
--- curl-7.58.0.orig/Makefile.in
+++ curl-7.58.0/Makefile.in
@@ -641,8 +641,8 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP)
$(VC14_LIBVCXPROJ) $(VC14_SRCVCXPROJ) $(VC15_LIBVCXPROJ) $(VC15_SRCVCXPROJ)
bin_SCRIPTS = curl-config
-SUBDIRS = lib src
-DIST_SUBDIRS = $(SUBDIRS) tests packages scripts include docs
+SUBDIRS = lib
+DIST_SUBDIRS = $(SUBDIRS) include
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libcurl.pc
LIB_VAUTH_CFILES = vauth/vauth.c vauth/cleartext.c vauth/cram.c \
src/lib/curl/patches/series
View file @
6acf81d5
only_lib
.patch
no_CMAKE_C_IMPLICIT_LINK_LIBRARIES
.patch
no_netrc.patch
no_netrc.patch
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment