[oe-commits] org.oe.dev packages/apt/apt_0.6.46.2.bb

[xora commit]

packages/apt/apt_0.6.46.2.bb
packages/apt/apt.inc
packages/apt/apt-package.inc : build and package shared libs at all times.

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 30dd54ac9c9985ec3beded8b3d5f22e3a7bbfc88
ViewMTN: http://monotone.openembedded.org/revision.psp?id=30dd54ac9c9985ec3beded8b3d5f22e3a7bbfc88
Files:
1
packages/apt/files/environment.patch
packages/apt/apt-package.inc
packages/apt/apt.inc
packages/apt/apt_0.6.46.2.bb
Diffs:

#
# mt diff -r87608895ce98e113b19dd23bd6806618d7a8b38d -r30dd54ac9c9985ec3beded8b3d5f22e3a7bbfc88
#
# 
# 
# add_file "packages/apt/files/environment.patch"
#  content [a07debf48ad4ba5ff6474b36a12d8e7cd46f1138]
# 
# patch "packages/apt/apt-package.inc"
#  from [964bd2365243283d34a5ed2a76a9ce3e041aea89]
#    to [98879b990295f5dc07b4370ea749543c96919432]
# 
# patch "packages/apt/apt.inc"
#  from [8864d0a603639e04053b30fb161dfe3d64f2407a]
#    to [d01a03f1fea82e806188ad1f18eed043f522763e]
# 
# patch "packages/apt/apt_0.6.46.2.bb"
#  from [385fd9a20abac5dfb1c4419a595bb5eedb71885b]
#    to [f19c6a43f30f0f7b3b2bb4f99efa8133afc8082c]
# 
============================================================
--- packages/apt/files/environment.patch	a07debf48ad4ba5ff6474b36a12d8e7cd46f1138
+++ packages/apt/files/environment.patch	a07debf48ad4ba5ff6474b36a12d8e7cd46f1138
@@ -0,0 +1,13 @@
+Index: apt-0.6.46.2/buildlib/environment.mak.in
+===================================================================
+--- apt-0.6.46.2.orig/buildlib/environment.mak.in	2007-03-29 11:38:58.000000000 +0100
++++ apt-0.6.46.2/buildlib/environment.mak.in	2007-03-29 11:39:12.000000000 +0100
+@@ -62,7 +62,7 @@
+ 
+ # Shared library things
+ HOST_OS = @host_os@
+-ifneq ($(words $(filter linux-gnu gnu% %gnu,$(HOST_OS))),0)
++ifneq ($(words $(filter linux-gnu linux-gnueabi gnu% %gnu,$(HOST_OS))),0)
+    SONAME_MAGIC=-Wl,-soname -Wl,
+    LFLAGS_SO=
+ else
============================================================
--- packages/apt/apt-package.inc	964bd2365243283d34a5ed2a76a9ce3e041aea89
+++ packages/apt/apt-package.inc	98879b990295f5dc07b4370ea749543c96919432
@@ -77,11 +77,18 @@ do_install () {
 	install -m 0755 bin/apt-sortpkgs ${D}${bindir}/
 	install -m 0755 bin/apt-extracttemplates ${D}${bindir}/
 
-	#eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'`
-	#oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${D}${libdir}/ || true
-	#ln -sf libapt-pkg$GLIBC_VER-6.so ${D}${libdir}/libapt-pkg.so
-	#oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${D}${libdir}/ || true
-	#ln -sf libapt-inst$GLIBC_VER-6.so ${D}${libdir}/libapt-inst.so
+	install -d ${D}${libdir}
+	eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'`
+	eval `cat apt-pkg/makefile | grep ^MAJOR | sed -e's, = ,=,'`
+	eval `cat apt-pkg/makefile | grep ^MINOR | sed -e's, = ,=,'`
+	install bin/libapt-pkg$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/
+	ln -sf libapt-pkg$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/libapt-pkg$GLIBC_VER-6.so.$MAJOR
+	ln -sf libapt-pkg$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/libapt-pkg.so
+	eval `cat apt-inst/makefile | grep ^MAJOR | sed -e's, = ,=,'`
+	eval `cat apt-inst/makefile | grep ^MINOR | sed -e's, = ,=,'`
+	install bin/libapt-inst$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/
+	ln -sf libapt-inst$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/libapt-inst$GLIBC_VER-6.so.$MAJOR
+	ln -sf libapt-inst$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/libapt-inst.so
 
 	install -d ${D}${libdir}/apt/methods
 	install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/
============================================================
--- packages/apt/apt.inc	8864d0a603639e04053b30fb161dfe3d64f2407a
+++ packages/apt/apt.inc	d01a03f1fea82e806188ad1f18eed043f522763e
@@ -1,8 +1,9 @@ SECTION = "base"
 DESCRIPTION = "Advanced front-end for dpkg."
 LICENSE = "GPL"
 SECTION = "base"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz"
+SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \
+           file://environment.patch;patch=1"
 S = "${WORKDIR}/apt-${PV}"
 
 inherit autotools gettext
@@ -12,4 +13,5 @@ EXTRA_AUTORECONF = "--exclude=autopoint,
 # Apt wants to know the glibc version by running a binary file, which will fail, so we have to tell configure which version to use
 # Since I don't know the impliations of setting a wrong value I only provide one for angstrom, which uses glibc 2.5 (which claims to be 2.4)
 # Koen - 20070327
+EXTRA_OECONF_append_angstrom = " ac_cv_glibc_ver=libc6.4"
+
-EXTRA_OECONF_angstrom += " ac_cv_glibc_ver=libc6.4"
============================================================
--- packages/apt/apt_0.6.46.2.bb	385fd9a20abac5dfb1c4419a595bb5eedb71885b
+++ packages/apt/apt_0.6.46.2.bb	f19c6a43f30f0f7b3b2bb4f99efa8133afc8082c
@@ -6,3 +6,6 @@ apt-manpages += "doc/apt-key.8"
 
 FILES_${PN} += "${bindir}/apt-key"
 apt-manpages += "doc/apt-key.8"
+
+PR = "r1"
+