summaryrefslogtreecommitdiff
path: root/packages/fakeroot/files
diff options
context:
space:
mode:
authorMichael 'Mickey' Lauer <mickey@vanille-media.de>2009-02-22 19:43:14 +0100
committerMichael 'Mickey' Lauer <mickey@vanille-media.de>2009-02-22 19:43:14 +0100
commit26820377cb13c6e65c9d83426c21777ce998e10c (patch)
tree7c05e8ff31eaa2f8336f96d006e6da51440ac421 /packages/fakeroot/files
parent392689e0808f4ccad964075863ad8d263dfad9f2 (diff)
fakeroot: 1.9.6 -> 1.12.1
remove 1.7
Diffstat (limited to 'packages/fakeroot/files')
-rw-r--r--packages/fakeroot/files/configure-libtool.patch14
-rw-r--r--packages/fakeroot/files/fix-prefix.patch19
-rw-r--r--packages/fakeroot/files/work-with-older-libtool.patch11
3 files changed, 16 insertions, 28 deletions
diff --git a/packages/fakeroot/files/configure-libtool.patch b/packages/fakeroot/files/configure-libtool.patch
index 8830328eb5..46f7df7025 100644
--- a/packages/fakeroot/files/configure-libtool.patch
+++ b/packages/fakeroot/files/configure-libtool.patch
@@ -1,9 +1,11 @@
---- 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.
+Index: fakeroot-1.12.1/configure.ac
+===================================================================
+--- fakeroot-1.12.1.orig/configure.ac
++++ fakeroot-1.12.1/configure.ac
+@@ -2,14 +2,12 @@
AC_INIT([fakeroot],[FAKEROOT_VERSION],[schizo@debian.org],[fakeroot])
AC_PREREQ(2.61)
+ AC_CONFIG_MACRO_DIR([build-aux])
-LT_PREREQ(2.1a)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE
@@ -14,5 +16,5 @@
-LT_LANG(C)
+AC_PROG_LIBTOOL
- AC_ARG_WITH([ipc],
- AS_HELP_STRING([--with-ipc@<:@=IPCTYPE@:>@],
+ AH_BOTTOM([#if ! HAVE_BUILTIN_EXPECT
+ #define __builtin_expect(x, expected_value) (x)
diff --git a/packages/fakeroot/files/fix-prefix.patch b/packages/fakeroot/files/fix-prefix.patch
index 3884aca01c..3c47bd7650 100644
--- a/packages/fakeroot/files/fix-prefix.patch
+++ b/packages/fakeroot/files/fix-prefix.patch
@@ -1,11 +1,8 @@
-
-#
-# 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 @@
+Index: fakeroot-1.12.1/scripts/fakeroot.in
+===================================================================
+--- fakeroot-1.12.1.orig/scripts/fakeroot.in
++++ fakeroot-1.12.1/scripts/fakeroot.in
+@@ -30,8 +30,8 @@
}
# strip /bin/fakeroot to find install prefix
@@ -13,6 +10,6 @@
-BINDIR=@bindir@
+BINDIR=`dirname $0`
+PREFIX=`dirname ${BINDIR}`
-
- LIB=lib@fakeroot_transformed@.so.0
- PATHS=@libdir@:${PREFIX}/lib64/libfakeroot:${PREFIX}/lib32/libfakeroot
+
+ USEABSLIBPATH=@LDPRELOADABS@
+ LIB=lib@fakeroot_transformed@@DLSUFFIX@
diff --git a/packages/fakeroot/files/work-with-older-libtool.patch b/packages/fakeroot/files/work-with-older-libtool.patch
deleted file mode 100644
index 05f9be87b6..0000000000
--- a/packages/fakeroot/files/work-with-older-libtool.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fakeroot-1.7.1/configure.ac.orig 2007-08-09 16:03:34.000000000 -0500
-+++ fakeroot-1.7.1/configure.ac 2007-08-09 18:26:11.000000000 -0500
-@@ -7,8 +7,6 @@
- AC_CONFIG_HEADERS([config.h])
- AC_PROG_MAKE_SET
- AM_PROG_LIBTOOL
--LT_INIT
--LT_LANG(C)
-
- AC_ARG_WITH([ipc],
- AS_HELP_STRING([--with-ipc@<:@=IPCTYPE@:>@],