summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/apt/files
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2013-03-01 17:06:41 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-05 13:14:54 +0000
commit9199c3391380f9ac56a33409c25194486062d7d4 (patch)
treef9331ca0f403b90bff695433058c3346df888324 /meta/recipes-devtools/apt/files
parent7e2e2cf50855cd3f3546f0ec33d88075156011a0 (diff)
downloadpoky-9199c3391380f9ac56a33409c25194486062d7d4.tar.gz
apt: upgrade to 0.9.7.7
bb files: remove invalid config.sub/config.guess files (autotools will generate the correct files) allocate-larger-memory.patch: not needed anymore fix-gcc-4.6-null-not-defined.patch: added - include header that defines NULL includes-fix.patch: not needed anymore localefixes.patch: removed - not necessary anymore (no compiling errors) makerace.patch: adapted to the new version no-ko-translation.patch: adapted to the new version no-nls-dpkg.patch: added - fix build without nls noconfigure.patch: adapted to the new version nodoc.patch: adapted to the new version (apply patch on all cases because the doc generation needs docbook-xsl) remove-redeclaration.patch: not needed anymore truncate-filename.patch: moved use-host.patch: adapted to the new version no-curl.patch: adapted to the new version disable-configure-in-makefile.patch: added - do not run configure at do_compile (From OE-Core rev: 97403b14765331c8c48bb570c6b98f2809214a9a) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/apt/files')
-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 eb2f100d1c..9fd3b3ab79 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]
5 methods/makefile | 7 ------- 5 methods/makefile | 7 -------
6 2 files changed, 13 deletions(-) 6 2 files changed, 13 deletions(-)
7 7
8--- apt-0.7.14.orig/configure.in 8--- a/configure.in
9+++ apt-0.7.14/configure.in 9+++ b/configure.in
10@@ -84,16 +84,10 @@ AC_CHECK_HEADER(db.h, 10@@ -86,12 +86,6 @@ AC_CHECK_HEADER(db.h,
11 )]
12 )
13 11
14 LIBS="$saveLIBS" 12 LIBS="$saveLIBS"
15 13
@@ -22,25 +20,19 @@ Upstream-Status: Inappropriate [configuration]
22 20
23 AC_SUBST(BDBLIB) 21 AC_SUBST(BDBLIB)
24 22
25 dnl Converts the ARCH to be something singular for this general CPU family 23--- a/methods/makefile
26 dnl This is often the dpkg architecture string. 24+++ b/methods/makefile
27--- apt-0.7.14.orig/methods/makefile 25@@ -51,13 +51,6 @@ LIB_MAKES = apt-pkg/makefile
28+++ apt-0.7.14/methods/makefile 26 SOURCE = http.cc http_main.cc rfc2553emu.cc connect.cc
29@@ -50,17 +50,10 @@ PROGRAM=http
30 SLIBS = -lapt-pkg $(SOCKETLIBS)
31 LIB_MAKES = apt-pkg/makefile
32 SOURCE = http.cc rfc2553emu.cc connect.cc
33 include $(PROGRAM_H) 27 include $(PROGRAM_H)
34 28
35-# The https method 29-# The https method
36-PROGRAM=https 30-PROGRAM=https
37-SLIBS = -lapt-pkg -lcurl 31-SLIBS = -lapt-pkg -lcurl $(INTLLIBS)
38-LIB_MAKES = apt-pkg/makefile 32-LIB_MAKES = apt-pkg/makefile
39-SOURCE = https.cc 33-SOURCE = https.cc
40-include $(PROGRAM_H) 34-include $(PROGRAM_H)
41- 35-
42 # The ftp method 36 # The ftp method
43 PROGRAM=ftp 37 PROGRAM=ftp
44 SLIBS = -lapt-pkg $(SOCKETLIBS) 38 SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS)
45 LIB_MAKES = apt-pkg/makefile
46 SOURCE = ftp.cc rfc2553emu.cc connect.cc