mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-15 06:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

apt: Add db/db-native as a DEPENDS so apt-ftparchive gets built (needed by deb rootfs creation

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2531 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2007-08-21 14:00:13 +00:00
parent a4b8304b62
commit 2075cb72ac
5 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
meta/packages/apt/apt-native.inc
View File

@@ -1,11 +1,13 @@
require apt.inc require apt.inc
inherit native inherit native
DEPENDS += "dpkg-native curl-native" DEPENDS += "dpkg-native curl-native db-native"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/apt-${PV}" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/apt-${PV}"
PACKAGES = "" PACKAGES = ""
USE_NLS = "no" USE_NLS = "no"
SRC_URI += "file://db_linking_hack.patch;patch=1"
python do_stage () { python do_stage () {
bb.build.exec_func('do_stage_base', d) bb.build.exec_func('do_stage_base', d)
bb.build.exec_func('do_stage_config', d) bb.build.exec_func('do_stage_config', d)
@@ -35,7 +37,7 @@ do_stage_base () {
install -m 0755 bin/apt-get ${bindir}/ install -m 0755 bin/apt-get ${bindir}/
install -m 0755 bin/apt-config ${bindir}/ install -m 0755 bin/apt-config ${bindir}/
install -m 0755 bin/apt-cache ${bindir}/ install -m 0755 bin/apt-cache ${bindir}/
install -m 0755 bin/apt-ftparchive ${bindir}/
install -m 0755 bin/apt-sortpkgs ${bindir}/ install -m 0755 bin/apt-sortpkgs ${bindir}/
install -m 0755 bin/apt-extracttemplates ${bindir}/ install -m 0755 bin/apt-extracttemplates ${bindir}/

1
meta/packages/apt/apt-native_0.7.2.bb
View File

@@ -1,4 +1,5 @@
require apt-native.inc require apt-native.inc
PR = "r1"
SRC_URI += "file://nodoc.patch;patch=1 \ SRC_URI += "file://nodoc.patch;patch=1 \
file://noconfigure.patch;patch=1" file://noconfigure.patch;patch=1"

2
meta/packages/apt/apt-native_0.7.3.bb
View File

@@ -1,5 +1,5 @@
require apt-native.inc require apt-native.inc
PR = "r1" PR = "r2"
SRC_URI += "file://nodoc.patch;patch=1 \ SRC_URI += "file://nodoc.patch;patch=1 \
file://noconfigure.patch;patch=1" file://noconfigure.patch;patch=1"

2
meta/packages/apt/apt.inc
View File

@@ -1,7 +1,7 @@
DESCRIPTION = "Advanced front-end for dpkg." DESCRIPTION = "Advanced front-end for dpkg."
LICENSE = "GPL" LICENSE = "GPL"
SECTION = "base" SECTION = "base"
DEPENDS = "curl" DEPENDS = "curl db"
RDEPENDS = "dpkg" RDEPENDS = "dpkg"
SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \ SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \

27
meta/packages/apt/files/db_linking_hack.patch Normal file
View File

@@ -0,0 +1,27 @@
Index: apt-0.7.3/configure.in
===================================================================
--- apt-0.7.3.orig/configure.in 2007-07-01 10:38:45.000000000 +0000
+++ apt-0.7.3/configure.in 2007-08-21 13:39:26.000000000 +0000
@@ -67,8 +67,20 @@
[AC_DEFINE(HAVE_BDB)
BDBLIB="-ldb"
AC_MSG_RESULT(yes)],
- [BDBLIB=""
- AC_MSG_RESULT(no)]
+
+ LIBS="$LIBS -lpthread"
+ [AC_MSG_CHECKING(if we can link against BerkeleyDB with pthread)
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [#include <db.h>],
+ [int r, s, t; db_version(&r, &s, &t);]
+ )],
+ [AC_DEFINE(HAVE_BDB)
+ BDBLIB="-ldb -lpthread"
+ AC_MSG_RESULT(yes)],
+ [BDBLIB=""
+ AC_MSG_RESULT(no)]
+ )]
)]
)