From 43bd7936793701839df4dd4e49ef91985ee11e06 Mon Sep 17 00:00:00 2001 From: Kevin Tian Date: Wed, 7 Jul 2010 19:15:40 +0800 Subject: fakeroot: upgrade to 1.14.4 [Patches] KEEP _absolutepaths.patch_: solve python link issue REMOVE _configure-libtool.patch_: an old patch, not required now [Recipe] manually create build-aux since its own bootstrap contains more than we want Signed-off-by: Kevin Tian --- .../fakeroot/fakeroot-1.14.4/absolutepaths.patch | 47 ++++++++++++++++++++++ .../packages/fakeroot/fakeroot/absolutepaths.patch | 47 ---------------------- .../fakeroot/fakeroot/configure-libtool.patch | 18 --------- meta/packages/fakeroot/fakeroot_1.14.4.bb | 32 +++++++++++++++ meta/packages/fakeroot/fakeroot_1.9.4.bb | 27 ------------- 5 files changed, 79 insertions(+), 92 deletions(-) create mode 100644 meta/packages/fakeroot/fakeroot-1.14.4/absolutepaths.patch delete mode 100644 meta/packages/fakeroot/fakeroot/absolutepaths.patch delete mode 100644 meta/packages/fakeroot/fakeroot/configure-libtool.patch create mode 100644 meta/packages/fakeroot/fakeroot_1.14.4.bb delete mode 100644 meta/packages/fakeroot/fakeroot_1.9.4.bb (limited to 'meta/packages/fakeroot') diff --git a/meta/packages/fakeroot/fakeroot-1.14.4/absolutepaths.patch b/meta/packages/fakeroot/fakeroot-1.14.4/absolutepaths.patch new file mode 100644 index 0000000000..ae18e8a28c --- /dev/null +++ b/meta/packages/fakeroot/fakeroot-1.14.4/absolutepaths.patch @@ -0,0 +1,47 @@ +Image creation runs under a fakeroot context and calls a script which refers +to the build systems's python. This loads but can find a libpython from staging +if these are incompatible, anything can break. These scripts should *not* be +changing LD_LIBRARY_PATH, just adding an LD_PRELOAD with an absolute path. The +dyanmic linker can figure out anything else with rpaths. + +RP - 23/1/10 + +Index: fakeroot-1.9.4/configure.ac +=================================================================== +--- fakeroot-1.9.4.orig/configure.ac 2010-01-23 22:34:39.000000000 +0000 ++++ fakeroot-1.9.4/configure.ac 2010-01-23 22:35:14.000000000 +0000 +@@ -414,6 +414,8 @@ + ;; + esac + ++LDPRELOADABS=1 ++ + AC_DEFINE_UNQUOTED([LIBCPATH], "$libcpath", [path to libc shared object]) + AC_SUBST(DLSUFFIX) + AC_SUBST(LDLIBPATHVAR) +Index: fakeroot-1.9.4/scripts/fakeroot.in +=================================================================== +--- fakeroot-1.9.4.orig/scripts/fakeroot.in 2010-01-23 22:34:53.000000000 +0000 ++++ fakeroot-1.9.4/scripts/fakeroot.in 2010-01-23 22:37:17.000000000 +0000 +@@ -135,7 +135,7 @@ + if [ "$WAITINTRAP" -eq 0 ]; then + trap "kill -s @signal@ $PID" EXIT INT + else +- trap 'FAKEROOTKEY=$FAKEROOTKEY LD_LIBRARY_PATH="$PATHS" LD_PRELOAD="$LIB" /bin/ls -l / >/dev/null 2>&1; while kill -s @signal@ $PID 2>/dev/null; do sleep 0.1; done' EXIT INT ++ trap 'FAKEROOTKEY=$FAKEROOTKEY LD_PRELOAD="$LIB" /bin/ls -l / >/dev/null 2>&1; while kill -s @signal@ $PID 2>/dev/null; do sleep 0.1; done' EXIT INT + fi + + if test -z "$FAKEROOTKEY" || test -z "$PID"; then +@@ -158,10 +158,10 @@ + export FAKEROOT_FD_BASE + + if test -z "$*"; then +- FAKEROOTKEY=$FAKEROOTKEY @LDLIBPATHVAR@="$PATHS" @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" ${SHELL:-/bin/sh} ++ FAKEROOTKEY=$FAKEROOTKEY @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" ${SHELL:-/bin/sh} + RESULT=$? + else +- FAKEROOTKEY=$FAKEROOTKEY @LDLIBPATHVAR@="$PATHS" @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" "$@" ++ FAKEROOTKEY=$FAKEROOTKEY @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" "$@" + RESULT=$? + fi + diff --git a/meta/packages/fakeroot/fakeroot/absolutepaths.patch b/meta/packages/fakeroot/fakeroot/absolutepaths.patch deleted file mode 100644 index ae18e8a28c..0000000000 --- a/meta/packages/fakeroot/fakeroot/absolutepaths.patch +++ /dev/null @@ -1,47 +0,0 @@ -Image creation runs under a fakeroot context and calls a script which refers -to the build systems's python. This loads but can find a libpython from staging -if these are incompatible, anything can break. These scripts should *not* be -changing LD_LIBRARY_PATH, just adding an LD_PRELOAD with an absolute path. The -dyanmic linker can figure out anything else with rpaths. - -RP - 23/1/10 - -Index: fakeroot-1.9.4/configure.ac -=================================================================== ---- fakeroot-1.9.4.orig/configure.ac 2010-01-23 22:34:39.000000000 +0000 -+++ fakeroot-1.9.4/configure.ac 2010-01-23 22:35:14.000000000 +0000 -@@ -414,6 +414,8 @@ - ;; - esac - -+LDPRELOADABS=1 -+ - AC_DEFINE_UNQUOTED([LIBCPATH], "$libcpath", [path to libc shared object]) - AC_SUBST(DLSUFFIX) - AC_SUBST(LDLIBPATHVAR) -Index: fakeroot-1.9.4/scripts/fakeroot.in -=================================================================== ---- fakeroot-1.9.4.orig/scripts/fakeroot.in 2010-01-23 22:34:53.000000000 +0000 -+++ fakeroot-1.9.4/scripts/fakeroot.in 2010-01-23 22:37:17.000000000 +0000 -@@ -135,7 +135,7 @@ - if [ "$WAITINTRAP" -eq 0 ]; then - trap "kill -s @signal@ $PID" EXIT INT - else -- trap 'FAKEROOTKEY=$FAKEROOTKEY LD_LIBRARY_PATH="$PATHS" LD_PRELOAD="$LIB" /bin/ls -l / >/dev/null 2>&1; while kill -s @signal@ $PID 2>/dev/null; do sleep 0.1; done' EXIT INT -+ trap 'FAKEROOTKEY=$FAKEROOTKEY LD_PRELOAD="$LIB" /bin/ls -l / >/dev/null 2>&1; while kill -s @signal@ $PID 2>/dev/null; do sleep 0.1; done' EXIT INT - fi - - if test -z "$FAKEROOTKEY" || test -z "$PID"; then -@@ -158,10 +158,10 @@ - export FAKEROOT_FD_BASE - - if test -z "$*"; then -- FAKEROOTKEY=$FAKEROOTKEY @LDLIBPATHVAR@="$PATHS" @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" ${SHELL:-/bin/sh} -+ FAKEROOTKEY=$FAKEROOTKEY @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" ${SHELL:-/bin/sh} - RESULT=$? - else -- FAKEROOTKEY=$FAKEROOTKEY @LDLIBPATHVAR@="$PATHS" @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" "$@" -+ FAKEROOTKEY=$FAKEROOTKEY @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" "$@" - RESULT=$? - fi - diff --git a/meta/packages/fakeroot/fakeroot/configure-libtool.patch b/meta/packages/fakeroot/fakeroot/configure-libtool.patch deleted file mode 100644 index 8830328eb5..0000000000 --- a/meta/packages/fakeroot/fakeroot/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/fakeroot_1.14.4.bb b/meta/packages/fakeroot/fakeroot_1.14.4.bb new file mode 100644 index 0000000000..11ae015a83 --- /dev/null +++ b/meta/packages/fakeroot/fakeroot_1.14.4.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "Provides a fake \"root environment\" by means of LD_PRELOAD and SYSV IPC or TCP trickery" +HOMEPAGE = "http://fakeroot.alioth.debian.org/" +SECTION = "base" +LICENSE = "GPLv2" +# fakeroot needs getopt which is provided by the util-linux package +RDEPENDS = "util-linux" +RDEPENDS_virtclass-native = "util-linux-native" +PR = "r0" + +SRC_URI = "${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.orig.tar.bz2 \ + file://absolutepaths.patch" + +inherit autotools + +do_configure_prepend() { + # fakeroot's own bootstrap includes other autoreconf stuff we don't need here + # so manually create the aux directory + mkdir -p ${S}/build-aux +} + +do_install_append() { + install -d ${D}${STAGING_INCDIR}/fakeroot/ + install -m 644 *.h ${D}${STAGING_INCDIR}/fakeroot +} + +# 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" diff --git a/meta/packages/fakeroot/fakeroot_1.9.4.bb b/meta/packages/fakeroot/fakeroot_1.9.4.bb deleted file mode 100644 index 66193171fc..0000000000 --- a/meta/packages/fakeroot/fakeroot_1.9.4.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "Provides a fake \"root environment\" by means of LD_PRELOAD and SYSV IPC or TCP trickery" -HOMEPAGE = "http://fakeroot.alioth.debian.org/" -SECTION = "base" -LICENSE = "GPLv2" -# fakeroot needs getopt which is provided by the util-linux package -RDEPENDS = "util-linux" -RDEPENDS_virtclass-native = "util-linux-native" -PR = "r3" - -SRC_URI = "${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz \ - file://configure-libtool.patch; \ - file://absolutepaths.patch;" - -inherit autotools - -do_install_append() { - install -d ${D}${STAGING_INCDIR}/fakeroot/ - install -m 644 *.h ${D}${STAGING_INCDIR}/fakeroot -} - -# 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" -- cgit v1.2.3-54-g00ecf