diff options
-rw-r--r-- | meta/packages/fakeroot/fakeroot-native_1.9.4.bb | 21 | ||||
-rw-r--r-- | meta/packages/fakeroot/fakeroot/configure-libtool.patch (renamed from meta/packages/fakeroot/files/configure-libtool.patch) | 0 | ||||
-rw-r--r-- | meta/packages/fakeroot/fakeroot_1.9.4.bb | 15 | ||||
-rw-r--r-- | meta/packages/fakeroot/files/fix-prefix.patch | 18 |
4 files changed, 11 insertions, 43 deletions
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 @@ | |||
1 | require fakeroot_${PV}.bb | ||
2 | |||
3 | RDEPENDS="util-linux-native" | ||
4 | |||
5 | SRC_URI += "file://fix-prefix.patch;patch=1 " | ||
6 | S = "${WORKDIR}/fakeroot-${PV}" | ||
7 | |||
8 | inherit native | ||
9 | |||
10 | EXTRA_OECONF = " --program-prefix=" | ||
11 | |||
12 | # Compatability for the rare systems not using or having SYSV | ||
13 | python () { | ||
14 | if bb.data.getVar('HOST_NONSYSV', d, True) and bb.data.getVar('HOST_NONSYSV', d, True) != '0': | ||
15 | bb.data.setVar('EXTRA_OECONF', ' --with-ipc=tcp --program-prefix= ', d) | ||
16 | } | ||
17 | |||
18 | do_stage_append () { | ||
19 | oe_libinstall -so libfakeroot ${STAGING_LIBDIR}/libfakeroot/ | ||
20 | } | ||
21 | |||
diff --git a/meta/packages/fakeroot/files/configure-libtool.patch b/meta/packages/fakeroot/fakeroot/configure-libtool.patch index 8830328eb5..8830328eb5 100644 --- a/meta/packages/fakeroot/files/configure-libtool.patch +++ b/meta/packages/fakeroot/fakeroot/configure-libtool.patch | |||
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" | |||
4 | LICENSE = "GPL" | 4 | LICENSE = "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 |
6 | RDEPENDS = "util-linux" | 6 | RDEPENDS = "util-linux" |
7 | PR = "r1" | 7 | PR = "r2" |
8 | 8 | ||
9 | SRC_URI = "${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz \ | 9 | SRC_URI = "${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz \ |
10 | file://configure-libtool.patch;patch=1" | 10 | file://configure-libtool.patch;patch=1" |
11 | 11 | ||
12 | inherit autotools | 12 | inherit autotools_stage |
13 | 13 | ||
14 | do_stage() { | 14 | do_stage_append() { |
15 | install -d ${STAGING_INCDIR}/fakeroot | 15 | install -d ${STAGING_INCDIR}/fakeroot |
16 | install -m 644 *.h ${STAGING_INCDIR}/fakeroot | 16 | install -m 644 *.h ${STAGING_INCDIR}/fakeroot |
17 | autotools_stage_all | ||
18 | } | 17 | } |
18 | |||
19 | # Compatability for the rare systems not using or having SYSV | ||
20 | python () { | ||
21 | if bb.data.inherits_class("native", d) and bb.data.getVar('HOST_NONSYSV', d, True) and bb.data.getVar('HOST_NONSYSV', d, True) != '0': | ||
22 | bb.data.setVar('EXTRA_OECONF', ' --with-ipc=tcp ', d) | ||
23 | } | ||
24 | |||
25 | BBCLASSEXTEND = "native" \ No newline at end of file | ||
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 @@ | |||
1 | |||
2 | # | ||
3 | # Patch managed by http://www.holgerschurig.de/patcher.html | ||
4 | # | ||
5 | |||
6 | --- fakeroot-1.2.13/scripts/fakeroot.in~fix-prefix | ||
7 | +++ fakeroot-1.2.13/scripts/fakeroot.in | ||
8 | @@ -15,8 +15,8 @@ | ||
9 | } | ||
10 | |||
11 | # strip /bin/fakeroot to find install prefix | ||
12 | -PREFIX=@prefix@ | ||
13 | -BINDIR=@bindir@ | ||
14 | +BINDIR=`dirname $0` | ||
15 | +PREFIX=`dirname ${BINDIR}` | ||
16 | |||
17 | LIB=lib@fakeroot_transformed@.so.0 | ||
18 | PATHS=@libdir@:${PREFIX}/lib64/libfakeroot:${PREFIX}/lib32/libfakeroot | ||