From 9199c3391380f9ac56a33409c25194486062d7d4 Mon Sep 17 00:00:00 2001 From: Constantin Musca Date: Fri, 1 Mar 2013 17:06:41 +0200 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-devtools/apt/files/no-curl.patch | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) (limited to 'meta/recipes-devtools/apt/files') 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] 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) -- cgit v1.2.3-54-g00ecf