diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2020-11-08 18:44:12 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2020-11-08 18:44:12 +0000 |
| commit | 513bd78bd61284ecf40e2a08223cf4ae17654635 (patch) | |
| tree | 9713cbb6e0c68b661687f507ffd761f0cdb3d9f3 /dev-python/pycurl/files | |
| parent | b34405a9c56e4bd60fb90a07ebb2da36d0d8623f (diff) | |
| download | baldeagleos-repo-513bd78bd61284ecf40e2a08223cf4ae17654635.tar.gz baldeagleos-repo-513bd78bd61284ecf40e2a08223cf4ae17654635.tar.xz baldeagleos-repo-513bd78bd61284ecf40e2a08223cf4ae17654635.zip | |
Updating liguros repo
Diffstat (limited to 'dev-python/pycurl/files')
| -rw-r--r-- | dev-python/pycurl/files/pycurl-7.43.0.5-cc-cflags.patch | 34 | ||||
| -rw-r--r-- | dev-python/pycurl/files/pycurl-7.43.0.5-telnet-test.patch | 50 |
2 files changed, 0 insertions, 84 deletions
diff --git a/dev-python/pycurl/files/pycurl-7.43.0.5-cc-cflags.patch b/dev-python/pycurl/files/pycurl-7.43.0.5-cc-cflags.patch deleted file mode 100644 index b1e66e0942d1..000000000000 --- a/dev-python/pycurl/files/pycurl-7.43.0.5-cc-cflags.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 861ba3143001caf2623ce5d84a1d04a69b502339 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Mon, 11 May 2020 08:52:04 +0200 -Subject: [PATCH 1/2] Support overriding CC, respect *FLAGS in fake-curl - -The shipped libraries (obviously) do not work on non-amd64 platforms, -and rebuilding without the correct compiler and flags does not work -on more complex setups such as ppc64 with 32-bit userland. Make -the Makefile permit CC override while preserving the current default, -and use user-provided CFLAGS, CPPFLAGS and LDFLAGS. ---- - tests/fake-curl/libcurl/Makefile | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/tests/fake-curl/libcurl/Makefile b/tests/fake-curl/libcurl/Makefile -index b05bc89..8ece206 100644 ---- a/tests/fake-curl/libcurl/Makefile -+++ b/tests/fake-curl/libcurl/Makefile -@@ -7,8 +7,11 @@ all: \ - - .SUFFIXES: .c .so - -+CC = `curl-config --cc` -+CFLAGS += `curl-config --cflags` -+ - .c.so: -- `curl-config --cc` `curl-config --cflags` -shared -fPIC \ -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fPIC \ - -Wl,-soname,$@ -o $@ $< - - show-targets: --- -2.26.2 - diff --git a/dev-python/pycurl/files/pycurl-7.43.0.5-telnet-test.patch b/dev-python/pycurl/files/pycurl-7.43.0.5-telnet-test.patch deleted file mode 100644 index c96b14d7c475..000000000000 --- a/dev-python/pycurl/files/pycurl-7.43.0.5-telnet-test.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 1f747cc4194601e8e54084638085d60026f1dbc4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Mon, 4 May 2020 10:22:32 +0200 -Subject: [PATCH] Skip telnet tests when cURL is built without telnet support - ---- - tests/option_constants_test.py | 1 + - tests/util.py | 14 ++++++++++++++ - 2 files changed, 15 insertions(+) - -diff --git a/tests/option_constants_test.py b/tests/option_constants_test.py -index 2d6d185..20228c6 100644 ---- a/tests/option_constants_test.py -+++ b/tests/option_constants_test.py -@@ -387,6 +387,7 @@ class OptionConstantsSettingTest(unittest.TestCase): - def test_keypasswd(self): - self.curl.setopt(self.curl.KEYPASSWD, 'secret') - -+ @util.only_telnet - def test_telnetoptions(self): - self.curl.setopt(self.curl.TELNETOPTIONS, ('TTYPE=1', 'XDISPLOC=2')) - -diff --git a/tests/util.py b/tests/util.py -index aabadf5..e12e251 100644 ---- a/tests/util.py -+++ b/tests/util.py -@@ -138,6 +138,20 @@ def only_ssl(fn): - - return decorated - -+def only_telnet(fn): -+ import nose.plugins.skip -+ import pycurl -+ -+ @functools.wraps(fn) -+ def decorated(*args, **kwargs): -+ # pycurl.version_info()[8] is a tuple of protocols supported by libcurl -+ if 'telnet' not in pycurl.version_info()[8]: -+ raise nose.plugins.skip.SkipTest('libcurl does not support telnet') -+ -+ return fn(*args, **kwargs) -+ -+ return decorated -+ - def only_ssl_backends(*backends): - def decorator(fn): - import nose.plugins.skip --- -2.26.2 - |
