summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/dpkg/dpkg.inc14
1 files changed, 4 insertions, 10 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index 870117a325..3dd8193f7f 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -9,7 +9,7 @@ RDEPENDS_${PN}_class-native = ""
9 9
10UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/dpkg/" 10UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/dpkg/"
11 11
12inherit autotools gettext perlnative pkgconfig systemd 12inherit autotools gettext perlnative pkgconfig systemd perl-version
13 13
14python () { 14python () {
15 if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): 15 if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
@@ -20,8 +20,8 @@ python () {
20export PERL = "${bindir}/perl" 20export PERL = "${bindir}/perl"
21PERL_class-native = "${STAGING_BINDIR_NATIVE}/perl-native/perl" 21PERL_class-native = "${STAGING_BINDIR_NATIVE}/perl-native/perl"
22 22
23export PERL_LIBDIR = "${libdir}/perl" 23export PERL_LIBDIR = "${libdir}/perl/${@get_perl_version(d)}"
24PERL_LIBDIR_class-native = "${libdir}/perl-native/perl" 24PERL_LIBDIR_class-native = "${libdir}/perl-native/perl/${@get_perl_version(d)}"
25 25
26EXTRA_OECONF = "\ 26EXTRA_OECONF = "\
27 --disable-dselect \ 27 --disable-dselect \
@@ -37,12 +37,6 @@ PACKAGECONFIG[liblzma] = "--with-liblzma,--without-liblzma, xz"
37EXTRA_OECONF += "TAR=tar" 37EXTRA_OECONF += "TAR=tar"
38EXTRA_OECONF_append_class-target = " DEB_HOST_ARCH=${DPKG_ARCH}" 38EXTRA_OECONF_append_class-target = " DEB_HOST_ARCH=${DPKG_ARCH}"
39 39
40do_configure () {
41 echo >> ${S}/m4/compiler.m4
42 sed -i -e 's#PERL_LIBDIR=.*$#PERL_LIBDIR="${libdir}/perl"#' ${S}/configure
43 autotools_do_configure
44}
45
46do_install_append () { 40do_install_append () {
47 if [ "${PN}" = "dpkg-native" ]; then 41 if [ "${PN}" = "dpkg-native" ]; then
48 # update-alternatives doesn't have an offline mode 42 # update-alternatives doesn't have an offline mode
@@ -73,7 +67,7 @@ FILES_update-alternatives-dpkg = "${bindir}/update-alternatives ${localstatedir}
73RPROVIDES_update-alternatives-dpkg += "update-alternatives" 67RPROVIDES_update-alternatives-dpkg += "update-alternatives"
74 68
75PACKAGES += "${PN}-perl" 69PACKAGES += "${PN}-perl"
76FILES_${PN}-perl = "${libdir}/perl" 70FILES_${PN}-perl = "${libdir}/perl/${@get_perl_version(d)}"
77 71
78# Split out start-stop-daemon to its own package. Note that it 72# Split out start-stop-daemon to its own package. Note that it
79# is installed in a different directory than the one used for 73# is installed in a different directory than the one used for