summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-06-30 13:32:23 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-06-30 13:32:23 +0000
commitbc194fe321f262c1081bbbd0b2176488578d57f0 (patch)
treed903d5ebbe84ed546f485809387680d01f03cc0a
parent5ec2c0bcdf7c05cc51ff88d37fc4262d3a73f82e (diff)
downloadpoky-bc194fe321f262c1081bbbd0b2176488578d57f0.tar.gz
apt-native: remove db-native and curl-native dependencies
idea from: http://excogito.wordpress.com/2008/06/30/hacks-to-reduce-pokylinux-build-time/ git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4747 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/apt/apt-native.inc3
-rw-r--r--meta/packages/apt/apt-native_0.7.14.bb5
-rw-r--r--meta/packages/apt/files/no-curl.patch44
3 files changed, 48 insertions, 4 deletions
diff --git a/meta/packages/apt/apt-native.inc b/meta/packages/apt/apt-native.inc
index c3814842e0..b3527e7361 100644
--- a/meta/packages/apt/apt-native.inc
+++ b/meta/packages/apt/apt-native.inc
@@ -1,7 +1,7 @@
1require apt.inc 1require apt.inc
2inherit native 2inherit native
3 3
4DEPENDS += "dpkg-native curl-native db-native gettext-native" 4DEPENDS += "dpkg-native gettext-native"
5FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/apt-${PV}" 5FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/apt-${PV}"
6PACKAGES = "" 6PACKAGES = ""
7USE_NLS = "yes" 7USE_NLS = "yes"
@@ -37,7 +37,6 @@ do_stage_base () {
37 install -m 0755 bin/apt-get ${bindir}/ 37 install -m 0755 bin/apt-get ${bindir}/
38 install -m 0755 bin/apt-config ${bindir}/ 38 install -m 0755 bin/apt-config ${bindir}/
39 install -m 0755 bin/apt-cache ${bindir}/ 39 install -m 0755 bin/apt-cache ${bindir}/
40 install -m 0755 bin/apt-ftparchive ${bindir}/
41 install -m 0755 bin/apt-sortpkgs ${bindir}/ 40 install -m 0755 bin/apt-sortpkgs ${bindir}/
42 install -m 0755 bin/apt-extracttemplates ${bindir}/ 41 install -m 0755 bin/apt-extracttemplates ${bindir}/
43 42
diff --git a/meta/packages/apt/apt-native_0.7.14.bb b/meta/packages/apt/apt-native_0.7.14.bb
index ef8decc748..268e9df720 100644
--- a/meta/packages/apt/apt-native_0.7.14.bb
+++ b/meta/packages/apt/apt-native_0.7.14.bb
@@ -1,6 +1,7 @@
1require apt-native.inc 1require apt-native.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5SRC_URI += "file://nodoc.patch;patch=1 \ 5SRC_URI += "file://nodoc.patch;patch=1 \
6 file://noconfigure.patch;patch=1" 6 file://noconfigure.patch;patch=1 \
7 file://no-curl.patch;patch=1"
diff --git a/meta/packages/apt/files/no-curl.patch b/meta/packages/apt/files/no-curl.patch
new file mode 100644
index 0000000000..4e07c8f2dc
--- /dev/null
+++ b/meta/packages/apt/files/no-curl.patch
@@ -0,0 +1,44 @@
1---
2 configure.in | 6 ------
3 methods/makefile | 7 -------
4 2 files changed, 13 deletions(-)
5
6--- apt-0.7.14.orig/configure.in
7+++ apt-0.7.14/configure.in
8@@ -84,16 +84,10 @@ AC_CHECK_HEADER(db.h,
9 )]
10 )
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 dnl Converts the ARCH to be something singular for this general CPU family
24 dnl This is often the dpkg architecture string.
25--- apt-0.7.14.orig/methods/makefile
26+++ apt-0.7.14/methods/makefile
27@@ -50,17 +50,10 @@ PROGRAM=http
28 SLIBS = -lapt-pkg $(SOCKETLIBS)
29 LIB_MAKES = apt-pkg/makefile
30 SOURCE = http.cc rfc2553emu.cc connect.cc
31 include $(PROGRAM_H)
32
33-# The https method
34-PROGRAM=https
35-SLIBS = -lapt-pkg -lcurl
36-LIB_MAKES = apt-pkg/makefile
37-SOURCE = https.cc
38-include $(PROGRAM_H)
39-
40 # The ftp method
41 PROGRAM=ftp
42 SLIBS = -lapt-pkg $(SOCKETLIBS)
43 LIB_MAKES = apt-pkg/makefile
44 SOURCE = ftp.cc rfc2553emu.cc connect.cc