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.patch26
1 files changed, 9 insertions, 17 deletions
diff --git a/meta/recipes-devtools/apt/files/no-curl.patch b/meta/recipes-devtools/apt/files/no-curl.patch
index eb2f100..9fd3b3a 100644
--- a/meta/recipes-devtools/apt/files/no-curl.patch
+++ b/meta/recipes-devtools/apt/files/no-curl.patch
@@ -5,11 +5,9 @@ Upstream-Status: Inappropriate [configuration]
methods/makefile | 7 -------
2 files changed, 13 deletions(-)
---- apt-0.7.14.orig/configure.in
-+++ apt-0.7.14/configure.in
-@@ -84,16 +84,10 @@ AC_CHECK_HEADER(db.h,
- )]
- )
+--- a/configure.in
++++ b/configure.in
+@@ -86,12 +86,6 @@ AC_CHECK_HEADER(db.h,
LIBS="$saveLIBS"
@@ -22,25 +20,19 @@ Upstream-Status: Inappropriate [configuration]
AC_SUBST(BDBLIB)
- dnl Converts the ARCH to be something singular for this general CPU family
- dnl This is often the dpkg architecture string.
---- apt-0.7.14.orig/methods/makefile
-+++ apt-0.7.14/methods/makefile
-@@ -50,17 +50,10 @@ PROGRAM=http
- SLIBS = -lapt-pkg $(SOCKETLIBS)
- LIB_MAKES = apt-pkg/makefile
- SOURCE = http.cc rfc2553emu.cc connect.cc
+--- a/methods/makefile
++++ b/methods/makefile
+@@ -51,13 +51,6 @@ LIB_MAKES = apt-pkg/makefile
+ SOURCE = http.cc http_main.cc rfc2553emu.cc connect.cc
include $(PROGRAM_H)
-# The https method
-PROGRAM=https
--SLIBS = -lapt-pkg -lcurl
+-SLIBS = -lapt-pkg -lcurl $(INTLLIBS)
-LIB_MAKES = apt-pkg/makefile
-SOURCE = https.cc
-include $(PROGRAM_H)
-
# The ftp method
PROGRAM=ftp
- SLIBS = -lapt-pkg $(SOCKETLIBS)
- LIB_MAKES = apt-pkg/makefile
- SOURCE = ftp.cc rfc2553emu.cc connect.cc
+ SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS)
OpenPOWER on IntegriCloud