From d30dc9bd55c883dcb8ee683d682d3972fab2646a Mon Sep 17 00:00:00 2001 From: Ricardo Salveti de Araujo Date: Thu, 5 Nov 2009 16:40:19 -0300 Subject: [PATCH 021/118] apt-0.7.20.2: using dpkg-architecture to find the correct architecture So it can be fully compatible with dpkg. With latest versions, dpkg finds that arm compilers should set the architecture as armel, so we should trust in dpkg instead of getting the value by hand. Signed-off-by: Ricardo Salveti de Araujo --- recipes/apt/apt-0.7.20.2/use-host.patch | 15 --------------- recipes/apt/apt_0.7.20.2.bb | 2 +- 2 files changed, 1 insertions(+), 16 deletions(-) diff --git a/recipes/apt/apt-0.7.20.2/use-host.patch b/recipes/apt/apt-0.7.20.2/use-host.patch index 894a697..1ffd759 100644 --- a/recipes/apt/apt-0.7.20.2/use-host.patch +++ b/recipes/apt/apt-0.7.20.2/use-host.patch @@ -27,18 +27,3 @@ -m32r big 1 4 2 4 \ No newline at end of file +m32r big 1 4 2 4 ---- apt-0.7.14.orig/configure.in -+++ apt-0.7.14/configure.in -@@ -86,11 +86,11 @@ AC_SUBST(BDBLIB) - dnl Converts the ARCH to be something singular for this general CPU family - dnl This is often the dpkg architecture string. - dnl First check against the full canonical canoncial-system-type in $target - dnl and if that fails, just look for the cpu - AC_MSG_CHECKING(debian architecture) --archset="`dpkg-architecture -qDEB_HOST_ARCH`" -+archset="`echo $host_alias|cut -d'-' -f1`" - if test "x$archset" = "x"; then - AC_MSG_ERROR([failed: use --host= or output from dpkg-architecture]) - fi - AC_MSG_RESULT($archset) - AC_DEFINE_UNQUOTED(COMMON_ARCH,"$archset") diff --git a/recipes/apt/apt_0.7.20.2.bb b/recipes/apt/apt_0.7.20.2.bb index d696ca2..7fb5edf 100644 --- a/recipes/apt/apt_0.7.20.2.bb +++ b/recipes/apt/apt_0.7.20.2.bb @@ -6,7 +6,7 @@ require apt.inc SRC_URI += "file://no-doxygen.patch;patch=1 \ file://no-ko-translation.patch;patch=1 \ file://use-host.patch;patch=1 " -PR = "r1" +PR = "r2" require apt-package.inc -- 1.6.3.3