[oe-commits] Mike Westerhof : SlugOS: reinstate fakeroot 1.9. 6 and set as the PREFERRED_VERSION

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: a64be907e3e038af29d7f4184971f10a7a0dec82
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=a64be907e3e038af29d7f4184971f10a7a0dec82

Author: Mike Westerhof <mwester at dls.net>
Date:   Wed Feb 25 20:34:02 2009 -0600

SlugOS: reinstate fakeroot 1.9.6 and set as the PREFERRED_VERSION

---

 conf/distro/include/preferred-slugos-versions.inc  |    3 +-
 .../fakeroot-1.9.6/configure-libtool.patch         |   18 +++++++++++++++++
 packages/fakeroot/fakeroot-1.9.6/fix-prefix.patch  |   18 +++++++++++++++++
 packages/fakeroot/fakeroot-native_1.9.6.bb         |   21 ++++++++++++++++++++
 packages/fakeroot/fakeroot_1.9.6.bb                |   18 +++++++++++++++++
 5 files changed, 77 insertions(+), 1 deletions(-)

diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc
index d495930..dd7856d 100644
--- a/conf/distro/include/preferred-slugos-versions.inc
+++ b/conf/distro/include/preferred-slugos-versions.inc
@@ -69,7 +69,8 @@ PREFERRED_VERSION_udev				?= "118"
 PREFERRED_VERSION_avahi				?= "0.6.23"
 PREFERRED_VERSION_gst-plugins-base		?= "0.10.17"
 PREFERRED_VERSION_tiff				?= "3.7.2"
-
+PREFERRED_VERSION_fakeroot			?= "1.9.6"
+PREFERRED_VERSION_fakeroot-native		?= "1.9.6"
 
 # Hack alert - selecting this version of libusb effectively selects
 # the use of libusb1 and libusb-compat in the case that something
diff --git a/packages/fakeroot/fakeroot-1.9.6/configure-libtool.patch b/packages/fakeroot/fakeroot-1.9.6/configure-libtool.patch
new file mode 100644
index 0000000..8830328
--- /dev/null
+++ b/packages/fakeroot/fakeroot-1.9.6/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 at 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/packages/fakeroot/fakeroot-1.9.6/fix-prefix.patch b/packages/fakeroot/fakeroot-1.9.6/fix-prefix.patch
new file mode 100644
index 0000000..3884aca
--- /dev/null
+++ b/packages/fakeroot/fakeroot-1.9.6/fix-prefix.patch
@@ -0,0 +1,18 @@
+
+#
+# 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 at fakeroot_transformed@.so.0
+ PATHS=@libdir@:${PREFIX}/lib64/libfakeroot:${PREFIX}/lib32/libfakeroot
diff --git a/packages/fakeroot/fakeroot-native_1.9.6.bb b/packages/fakeroot/fakeroot-native_1.9.6.bb
new file mode 100644
index 0000000..77d6f58
--- /dev/null
+++ b/packages/fakeroot/fakeroot-native_1.9.6.bb
@@ -0,0 +1,21 @@
+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/packages/fakeroot/fakeroot_1.9.6.bb b/packages/fakeroot/fakeroot_1.9.6.bb
new file mode 100644
index 0000000..aaf696d
--- /dev/null
+++ b/packages/fakeroot/fakeroot_1.9.6.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Gives a fake root environment"
+HOMEPAGE = "http://fakeroot.alioth.debian.org/"
+SECTION = "base"
+LICENSE = "GPL"
+# fakeroot needs getopt which is provided by the util-linux package
+RDEPENDS = "util-linux"
+PR = "r1"
+
+SRC_URI = "${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz \
+           file://configure-libtool.patch;patch=1"
+	    
+inherit autotools
+
+do_stage() {
+        install -d ${STAGING_INCDIR}/fakeroot
+        install -m 644 *.h ${STAGING_INCDIR}/fakeroot
+        autotools_stage_all
+}