summaryrefslogtreecommitdiffstats
path: root/meta/packages/fakeroot
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-04-08 15:15:09 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-04-08 15:15:09 +0000
commit06976c635a486ec8412db552b6fb1193f650bf1f (patch)
tree8ecab72816b1542b90593f6ee2702c6f17e5114b /meta/packages/fakeroot
parentb3dddcdde5d10f382f71413aad67f7ef2e2420a2 (diff)
downloadpoky-06976c635a486ec8412db552b6fb1193f650bf1f.tar.gz
fakeroot: merge 1.9.4 from OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4205 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/fakeroot')
-rw-r--r--meta/packages/fakeroot/fakeroot-native_1.9.4.bb (renamed from meta/packages/fakeroot/fakeroot-native_1.7.1.bb)8
-rw-r--r--meta/packages/fakeroot/fakeroot_1.9.4.bb (renamed from meta/packages/fakeroot/fakeroot_1.7.1.bb)11
-rw-r--r--meta/packages/fakeroot/files/autofoo.patch13
-rw-r--r--meta/packages/fakeroot/files/configure-libtool.patch18
4 files changed, 27 insertions, 23 deletions
diff --git a/meta/packages/fakeroot/fakeroot-native_1.7.1.bb b/meta/packages/fakeroot/fakeroot-native_1.9.4.bb
index 0eb101e6b5..77d6f58651 100644
--- a/meta/packages/fakeroot/fakeroot-native_1.7.1.bb
+++ b/meta/packages/fakeroot/fakeroot-native_1.9.4.bb
@@ -1,11 +1,12 @@
1SECTION = "base"
2require fakeroot_${PV}.bb 1require fakeroot_${PV}.bb
3inherit native 2
4RDEPENDS="util-linux-native" 3RDEPENDS="util-linux-native"
5 4
6SRC_URI += "file://fix-prefix.patch;patch=1" 5SRC_URI += "file://fix-prefix.patch;patch=1 "
7S = "${WORKDIR}/fakeroot-${PV}" 6S = "${WORKDIR}/fakeroot-${PV}"
8 7
8inherit native
9
9EXTRA_OECONF = " --program-prefix=" 10EXTRA_OECONF = " --program-prefix="
10 11
11# Compatability for the rare systems not using or having SYSV 12# Compatability for the rare systems not using or having SYSV
@@ -17,3 +18,4 @@ python () {
17do_stage_append () { 18do_stage_append () {
18 oe_libinstall -so libfakeroot ${STAGING_LIBDIR}/libfakeroot/ 19 oe_libinstall -so libfakeroot ${STAGING_LIBDIR}/libfakeroot/
19} 20}
21
diff --git a/meta/packages/fakeroot/fakeroot_1.7.1.bb b/meta/packages/fakeroot/fakeroot_1.9.4.bb
index 6abf8a6702..aaf696d79d 100644
--- a/meta/packages/fakeroot/fakeroot_1.7.1.bb
+++ b/meta/packages/fakeroot/fakeroot_1.9.4.bb
@@ -1,19 +1,16 @@
1DESCRIPTION = "Gives a fake root environment" 1DESCRIPTION = "Gives a fake root environment"
2HOMEPAGE = "http://joostje.op.het.net/fakeroot/index.html" 2HOMEPAGE = "http://fakeroot.alioth.debian.org/"
3SECTION = "base" 3SECTION = "base"
4LICENSE = "GPL" 4LICENSE = "GPL"
5# fakeroot needs getopt which is provided by the util-linux package 5# fakeroot needs getopt which is provided by the util-linux package
6RDEPENDS = "util-linux" 6RDEPENDS = "util-linux"
7PR = "r2" 7PR = "r1"
8 8
9SRC_URI = "${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz \ 9SRC_URI = "${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz \
10 file://autofoo.patch;patch=1" 10 file://configure-libtool.patch;patch=1"
11 11
12inherit autotools 12inherit autotools
13 13
14# The fakeroot script requires the .so link to be present
15FILES_${PN} =+ "${libdir}/libfakeroot-*.so ${libdir}/libfakeroot.so"
16
17do_stage() { 14do_stage() {
18 install -d ${STAGING_INCDIR}/fakeroot 15 install -d ${STAGING_INCDIR}/fakeroot
19 install -m 644 *.h ${STAGING_INCDIR}/fakeroot 16 install -m 644 *.h ${STAGING_INCDIR}/fakeroot
diff --git a/meta/packages/fakeroot/files/autofoo.patch b/meta/packages/fakeroot/files/autofoo.patch
deleted file mode 100644
index f3949386d6..0000000000
--- a/meta/packages/fakeroot/files/autofoo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: fakeroot-1.7.1/configure.ac
2===================================================================
3--- fakeroot-1.7.1.orig/configure.ac 2007-04-13 16:57:48.000000000 +0000
4+++ fakeroot-1.7.1/configure.ac 2007-08-21 14:19:59.000000000 +0000
5@@ -7,8 +7,6 @@
6 AC_CONFIG_HEADERS([config.h])
7 AC_PROG_MAKE_SET
8 AM_PROG_LIBTOOL
9-LT_INIT
10-LT_LANG(C)
11
12 AC_ARG_WITH([ipc],
13 AS_HELP_STRING([--with-ipc@<:@=IPCTYPE@:>@],
diff --git a/meta/packages/fakeroot/files/configure-libtool.patch b/meta/packages/fakeroot/files/configure-libtool.patch
new file mode 100644
index 0000000000..8830328eb5
--- /dev/null
+++ b/meta/packages/fakeroot/files/configure-libtool.patch
@@ -0,0 +1,18 @@
1--- fakeroot-1.8.3/configure.ac.orig 2007-10-31 00:17:27.000000000 -0500
2+++ fakeroot-1.8.3/configure.ac 2007-10-31 00:18:12.000000000 -0500
3@@ -1,14 +1,12 @@
4 dnl Process this file with autoconf to produce a configure script.
5 AC_INIT([fakeroot],[FAKEROOT_VERSION],[schizo@debian.org],[fakeroot])
6 AC_PREREQ(2.61)
7-LT_PREREQ(2.1a)
8 AC_CANONICAL_TARGET
9 AM_INIT_AUTOMAKE
10 AM_MAINTAINER_MODE
11 AC_CONFIG_HEADERS([config.h])
12 AC_PROG_MAKE_SET
13-LT_INIT
14-LT_LANG(C)
15+AC_PROG_LIBTOOL
16
17 AC_ARG_WITH([ipc],
18 AS_HELP_STRING([--with-ipc@<:@=IPCTYPE@:>@],