diff options
Diffstat (limited to 'meta/recipes-devtools/apt/files')
-rw-r--r-- | meta/recipes-devtools/apt/files/apt.conf | 42 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/files/db_linking_hack.patch | 29 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/files/environment.patch | 15 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/files/no-curl.patch | 38 |
4 files changed, 124 insertions, 0 deletions
diff --git a/meta/recipes-devtools/apt/files/apt.conf b/meta/recipes-devtools/apt/files/apt.conf new file mode 100644 index 0000000000..03351356bc --- /dev/null +++ b/meta/recipes-devtools/apt/files/apt.conf | |||
@@ -0,0 +1,42 @@ | |||
1 | Dir "${STAGING_DIR_NATIVE}/" | ||
2 | { | ||
3 | State "var/lib/apt/" | ||
4 | { | ||
5 | Lists "#APTCONF#/lists/"; | ||
6 | status "#ROOTFS#/var/lib/dpkg/status"; | ||
7 | }; | ||
8 | Cache "var/cache/apt/" | ||
9 | { | ||
10 | Archives "archives/"; | ||
11 | pkgcache ""; | ||
12 | srcpkgcache ""; | ||
13 | }; | ||
14 | Bin "${STAGING_BINDIR_NATIVE}/" | ||
15 | { | ||
16 | methods "${STAGING_LIBDIR}/apt/methods/"; | ||
17 | gzip "/bin/gzip"; | ||
18 | dpkg "dpkg"; | ||
19 | dpkg-source "dpkg-source"; | ||
20 | dpkg-buildpackage "dpkg-buildpackage"; | ||
21 | apt-get "apt-get"; | ||
22 | apt-cache "apt-cache"; | ||
23 | }; | ||
24 | Etc "#APTCONF#" | ||
25 | { | ||
26 | Preferences "preferences"; | ||
27 | }; | ||
28 | }; | ||
29 | |||
30 | APT | ||
31 | { | ||
32 | Install-Recommends "true"; | ||
33 | Immediate-Configure "false"; | ||
34 | Architecture "i586"; | ||
35 | Get | ||
36 | { | ||
37 | Assume-Yes "true"; | ||
38 | Force-Yes "true" | ||
39 | }; | ||
40 | }; | ||
41 | |||
42 | DPkg::Options {"--root=#ROOTFS#";"--admindir=#ROOTFS#/var/lib/dpkg";"--force-all";"--no-debsig"}; | ||
diff --git a/meta/recipes-devtools/apt/files/db_linking_hack.patch b/meta/recipes-devtools/apt/files/db_linking_hack.patch new file mode 100644 index 0000000000..d2246b3d2b --- /dev/null +++ b/meta/recipes-devtools/apt/files/db_linking_hack.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | Index: apt-0.7.3/configure.in | ||
4 | =================================================================== | ||
5 | --- apt-0.7.3.orig/configure.in 2007-07-01 10:38:45.000000000 +0000 | ||
6 | +++ apt-0.7.3/configure.in 2007-08-21 13:39:26.000000000 +0000 | ||
7 | @@ -67,8 +67,20 @@ | ||
8 | [AC_DEFINE(HAVE_BDB) | ||
9 | BDBLIB="-ldb" | ||
10 | AC_MSG_RESULT(yes)], | ||
11 | - [BDBLIB="" | ||
12 | - AC_MSG_RESULT(no)] | ||
13 | + | ||
14 | + LIBS="$LIBS -lpthread" | ||
15 | + [AC_MSG_CHECKING(if we can link against BerkeleyDB with pthread) | ||
16 | + AC_LINK_IFELSE( | ||
17 | + [AC_LANG_PROGRAM( | ||
18 | + [#include <db.h>], | ||
19 | + [int r, s, t; db_version(&r, &s, &t);] | ||
20 | + )], | ||
21 | + [AC_DEFINE(HAVE_BDB) | ||
22 | + BDBLIB="-ldb -lpthread" | ||
23 | + AC_MSG_RESULT(yes)], | ||
24 | + [BDBLIB="" | ||
25 | + AC_MSG_RESULT(no)] | ||
26 | + )] | ||
27 | )] | ||
28 | ) | ||
29 | |||
diff --git a/meta/recipes-devtools/apt/files/environment.patch b/meta/recipes-devtools/apt/files/environment.patch new file mode 100644 index 0000000000..9a0303803e --- /dev/null +++ b/meta/recipes-devtools/apt/files/environment.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | Index: apt-0.6.46.2/buildlib/environment.mak.in | ||
4 | =================================================================== | ||
5 | --- apt-0.6.46.2.orig/buildlib/environment.mak.in 2007-03-29 11:38:58.000000000 +0100 | ||
6 | +++ apt-0.6.46.2/buildlib/environment.mak.in 2007-03-29 11:39:12.000000000 +0100 | ||
7 | @@ -62,7 +62,7 @@ | ||
8 | |||
9 | # Shared library things | ||
10 | HOST_OS = @host_os@ | ||
11 | -ifneq ($(words $(filter linux-gnu gnu% %gnu,$(HOST_OS))),0) | ||
12 | +ifneq ($(words $(filter linux-gnu linux-gnueabi gnu% %gnu,$(HOST_OS))),0) | ||
13 | SONAME_MAGIC=-Wl,-soname -Wl, | ||
14 | LFLAGS_SO= | ||
15 | else | ||
diff --git a/meta/recipes-devtools/apt/files/no-curl.patch b/meta/recipes-devtools/apt/files/no-curl.patch new file mode 100644 index 0000000000..9fd3b3ab79 --- /dev/null +++ b/meta/recipes-devtools/apt/files/no-curl.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | --- | ||
4 | configure.in | 6 ------ | ||
5 | methods/makefile | 7 ------- | ||
6 | 2 files changed, 13 deletions(-) | ||
7 | |||
8 | --- a/configure.in | ||
9 | +++ b/configure.in | ||
10 | @@ -86,12 +86,6 @@ AC_CHECK_HEADER(db.h, | ||
11 | |||
12 | LIBS="$saveLIBS" | ||
13 | |||
14 | -AC_CHECK_LIB(curl, curl_easy_init, | ||
15 | - [AC_CHECK_HEADER(curl/curl.h, | ||
16 | - curl_ok=yes, | ||
17 | - curl_ok=no)], | ||
18 | - AC_MSG_ERROR([failed: I need CURL due https support]), | ||
19 | -) | ||
20 | |||
21 | AC_SUBST(BDBLIB) | ||
22 | |||
23 | --- a/methods/makefile | ||
24 | +++ b/methods/makefile | ||
25 | @@ -51,13 +51,6 @@ LIB_MAKES = apt-pkg/makefile | ||
26 | SOURCE = http.cc http_main.cc rfc2553emu.cc connect.cc | ||
27 | include $(PROGRAM_H) | ||
28 | |||
29 | -# The https method | ||
30 | -PROGRAM=https | ||
31 | -SLIBS = -lapt-pkg -lcurl $(INTLLIBS) | ||
32 | -LIB_MAKES = apt-pkg/makefile | ||
33 | -SOURCE = https.cc | ||
34 | -include $(PROGRAM_H) | ||
35 | - | ||
36 | # The ftp method | ||
37 | PROGRAM=ftp | ||
38 | SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS) | ||