python/build/libs.py: convert CURL edit to quilt patch

This commit is contained in:
Max Kellermann 2018-02-09 23:02:35 +01:00
parent 927071e085
commit 3859a50466
3 changed files with 19 additions and 5 deletions

View File

@ -1,4 +1,6 @@
import re
from os.path import abspath
from build.project import Project
from build.zlib import ZlibProject
from build.autotools import AutotoolsProject
@ -359,11 +361,7 @@ curl = AutotoolsProject(
'--without-ssl', '--without-gnutls', '--without-nss', '--without-libssh2',
],
edits={
# build only the library, not the "curl" command-line tool
'Makefile.in': lambda data: re.sub(r'^SUBDIRS = lib src$', r'SUBDIRS = lib',
data, count=1, flags=re.MULTILINE),
}
patches='src/lib/curl/patches',
)
boost = BoostProject(

View File

@ -0,0 +1,15 @@
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 \

View File

@ -0,0 +1 @@
only_lib.patch