From 66b6014139d4e4c0b0c2e21c6a08cc31c31652b0 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 3 Jan 2009 18:33:03 +0000 Subject: fakeroot: Clean up and convert to BBCLASSEXTEND --- meta/packages/fakeroot/fakeroot-native_1.9.4.bb | 21 --------------------- .../fakeroot/fakeroot/configure-libtool.patch | 18 ++++++++++++++++++ meta/packages/fakeroot/fakeroot_1.9.4.bb | 15 +++++++++++---- .../packages/fakeroot/files/configure-libtool.patch | 18 ------------------ meta/packages/fakeroot/files/fix-prefix.patch | 18 ------------------ 5 files changed, 29 insertions(+), 61 deletions(-) delete mode 100644 meta/packages/fakeroot/fakeroot-native_1.9.4.bb create mode 100644 meta/packages/fakeroot/fakeroot/configure-libtool.patch delete mode 100644 meta/packages/fakeroot/files/configure-libtool.patch delete mode 100644 meta/packages/fakeroot/files/fix-prefix.patch (limited to 'meta/packages/fakeroot') diff --git a/meta/packages/fakeroot/fakeroot-native_1.9.4.bb b/meta/packages/fakeroot/fakeroot-native_1.9.4.bb deleted file mode 100644 index 77d6f58651..0000000000 --- a/meta/packages/fakeroot/fakeroot-native_1.9.4.bb +++ /dev/null @@ -1,21 +0,0 @@ -require fakeroot_${PV}.bb - -RDEPENDS="util-linux-native" - -SRC_URI += "file://fix-prefix.patch;patch=1 " -S = "${WORKDIR}/fakeroot-${PV}" - -inherit native - -EXTRA_OECONF = " --program-prefix=" - -# Compatability for the rare systems not using or having SYSV -python () { - if bb.data.getVar('HOST_NONSYSV', d, True) and bb.data.getVar('HOST_NONSYSV', d, True) != '0': - bb.data.setVar('EXTRA_OECONF', ' --with-ipc=tcp --program-prefix= ', d) -} - -do_stage_append () { - oe_libinstall -so libfakeroot ${STAGING_LIBDIR}/libfakeroot/ -} - diff --git a/meta/packages/fakeroot/fakeroot/configure-libtool.patch b/meta/packages/fakeroot/fakeroot/configure-libtool.patch new file mode 100644 index 0000000000..8830328eb5 --- /dev/null +++ b/meta/packages/fakeroot/fakeroot/configure-libtool.patch @@ -0,0 +1,18 @@ +--- fakeroot-1.8.3/configure.ac.orig 2007-10-31 00:17:27.000000000 -0500 ++++ fakeroot-1.8.3/configure.ac 2007-10-31 00:18:12.000000000 -0500 +@@ -1,14 +1,12 @@ + dnl Process this file with autoconf to produce a configure script. + AC_INIT([fakeroot],[FAKEROOT_VERSION],[schizo@debian.org],[fakeroot]) + AC_PREREQ(2.61) +-LT_PREREQ(2.1a) + AC_CANONICAL_TARGET + AM_INIT_AUTOMAKE + AM_MAINTAINER_MODE + AC_CONFIG_HEADERS([config.h]) + AC_PROG_MAKE_SET +-LT_INIT +-LT_LANG(C) ++AC_PROG_LIBTOOL + + AC_ARG_WITH([ipc], + AS_HELP_STRING([--with-ipc@<:@=IPCTYPE@:>@], diff --git a/meta/packages/fakeroot/fakeroot_1.9.4.bb b/meta/packages/fakeroot/fakeroot_1.9.4.bb index aaf696d79d..04219519ed 100644 --- a/meta/packages/fakeroot/fakeroot_1.9.4.bb +++ b/meta/packages/fakeroot/fakeroot_1.9.4.bb @@ -4,15 +4,22 @@ SECTION = "base" LICENSE = "GPL" # fakeroot needs getopt which is provided by the util-linux package RDEPENDS = "util-linux" -PR = "r1" +PR = "r2" SRC_URI = "${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz \ file://configure-libtool.patch;patch=1" -inherit autotools +inherit autotools_stage -do_stage() { +do_stage_append() { install -d ${STAGING_INCDIR}/fakeroot install -m 644 *.h ${STAGING_INCDIR}/fakeroot - autotools_stage_all } + +# Compatability for the rare systems not using or having SYSV +python () { + if bb.data.inherits_class("native", d) and bb.data.getVar('HOST_NONSYSV', d, True) and bb.data.getVar('HOST_NONSYSV', d, True) != '0': + bb.data.setVar('EXTRA_OECONF', ' --with-ipc=tcp ', d) +} + +BBCLASSEXTEND = "native" \ No newline at end of file diff --git a/meta/packages/fakeroot/files/configure-libtool.patch b/meta/packages/fakeroot/files/configure-libtool.patch deleted file mode 100644 index 8830328eb5..0000000000 --- a/meta/packages/fakeroot/files/configure-libtool.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- fakeroot-1.8.3/configure.ac.orig 2007-10-31 00:17:27.000000000 -0500 -+++ fakeroot-1.8.3/configure.ac 2007-10-31 00:18:12.000000000 -0500 -@@ -1,14 +1,12 @@ - dnl Process this file with autoconf to produce a configure script. - AC_INIT([fakeroot],[FAKEROOT_VERSION],[schizo@debian.org],[fakeroot]) - AC_PREREQ(2.61) --LT_PREREQ(2.1a) - AC_CANONICAL_TARGET - AM_INIT_AUTOMAKE - AM_MAINTAINER_MODE - AC_CONFIG_HEADERS([config.h]) - AC_PROG_MAKE_SET --LT_INIT --LT_LANG(C) -+AC_PROG_LIBTOOL - - AC_ARG_WITH([ipc], - AS_HELP_STRING([--with-ipc@<:@=IPCTYPE@:>@], diff --git a/meta/packages/fakeroot/files/fix-prefix.patch b/meta/packages/fakeroot/files/fix-prefix.patch deleted file mode 100644 index 3884aca01c..0000000000 --- a/meta/packages/fakeroot/files/fix-prefix.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- fakeroot-1.2.13/scripts/fakeroot.in~fix-prefix -+++ fakeroot-1.2.13/scripts/fakeroot.in -@@ -15,8 +15,8 @@ - } - - # strip /bin/fakeroot to find install prefix --PREFIX=@prefix@ --BINDIR=@bindir@ -+BINDIR=`dirname $0` -+PREFIX=`dirname ${BINDIR}` - - LIB=lib@fakeroot_transformed@.so.0 - PATHS=@libdir@:${PREFIX}/lib64/libfakeroot:${PREFIX}/lib32/libfakeroot -- cgit v1.2.3-54-g00ecf