summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/apt/files/no-curl.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/apt/files/no-curl.patch')
-rw-r--r--meta/recipes-devtools/apt/files/no-curl.patch30
1 files changed, 23 insertions, 7 deletions
diff --git a/meta/recipes-devtools/apt/files/no-curl.patch b/meta/recipes-devtools/apt/files/no-curl.patch
index 30238faad3..0838552b26 100644
--- a/meta/recipes-devtools/apt/files/no-curl.patch
+++ b/meta/recipes-devtools/apt/files/no-curl.patch
@@ -1,13 +1,23 @@
1Upstream-Status: Inappropriate [configuration] 1Upstream-Status: Inappropriate [configuration]
2From 5d61ac822fd9a3871cd5089389c210606232ecdc Mon Sep 17 00:00:00 2001
3From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com>
4Date: Thu, 26 May 2016 15:34:45 -0500
5Subject: [PATCH] Upstream-Status: Inappropriate [configuration]
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
2 9
10Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
3--- 11---
4 configure.in | 6 ------ 12 configure.ac | 7 -------
5 methods/makefile | 7 ------- 13 methods/makefile | 7 -------
6 2 files changed, 13 deletions(-) 14 2 files changed, 14 deletions(-)
7 15
16diff --git a/configure.ac b/configure.ac
17index e47f459..cd24264 100644
8--- a/configure.ac 18--- a/configure.ac
9+++ b/configure.ac 19+++ b/configure.ac
10@@ -86,12 +86,6 @@ AC_CHECK_HEADER(db.h, 20@@ -83,13 +83,6 @@ AC_CHECK_HEADER(db.h,
11 21
12 LIBS="$saveLIBS" 22 LIBS="$saveLIBS"
13 23
@@ -17,9 +27,12 @@ Upstream-Status: Inappropriate [configuration]
17- curl_ok=no)], 27- curl_ok=no)],
18- AC_MSG_ERROR([failed: I need CURL due https support]), 28- AC_MSG_ERROR([failed: I need CURL due https support]),
19-) 29-)
20 30-
21 AC_SUBST(BDBLIB) 31 AC_SUBST(BDBLIB)
22 32
33 HAVE_ZLIB=no
34diff --git a/methods/makefile b/methods/makefile
35index 3274e92..255086b 100644
23--- a/methods/makefile 36--- a/methods/makefile
24+++ b/methods/makefile 37+++ b/methods/makefile
25@@ -51,13 +51,6 @@ LIB_MAKES = apt-pkg/makefile 38@@ -51,13 +51,6 @@ LIB_MAKES = apt-pkg/makefile
@@ -28,11 +41,14 @@ Upstream-Status: Inappropriate [configuration]
28 41
29-# The https method 42-# The https method
30-PROGRAM=https 43-PROGRAM=https
31-SLIBS = -lapt-pkg -lcurl $(INTLLIBS) 44-SLIBS = -lapt-pkg -lcurl $(INTLLIBS) -lresolv
32-LIB_MAKES = apt-pkg/makefile 45-LIB_MAKES = apt-pkg/makefile
33-SOURCE = https.cc server.cc 46-SOURCE = https.cc server.cc
34-include $(PROGRAM_H) 47-include $(PROGRAM_H)
35- 48-
36 # The ftp method 49 # The ftp method
37 PROGRAM=ftp 50 PROGRAM=ftp
38 SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS) 51 SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS) -lresolv
52--
532.1.4
54