diff options
| -rw-r--r-- | meta-oe/recipes-dbs/postgresql/postgresql.inc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/meta-oe/recipes-dbs/postgresql/postgresql.inc b/meta-oe/recipes-dbs/postgresql/postgresql.inc index 2dd7dd6fda..d2d3225be9 100644 --- a/meta-oe/recipes-dbs/postgresql/postgresql.inc +++ b/meta-oe/recipes-dbs/postgresql/postgresql.inc | |||
| @@ -19,7 +19,7 @@ DESCRIPTION = "\ | |||
| 19 | " | 19 | " |
| 20 | HOMEPAGE = "http://www.postgresql.com" | 20 | HOMEPAGE = "http://www.postgresql.com" |
| 21 | LICENSE = "0BSD" | 21 | LICENSE = "0BSD" |
| 22 | DEPENDS = "libnsl2 readline tzcode-native" | 22 | DEPENDS = "libnsl2 readline tzcode-native perl" |
| 23 | 23 | ||
| 24 | ARM_INSTRUCTION_SET = "arm" | 24 | ARM_INSTRUCTION_SET = "arm" |
| 25 | 25 | ||
| @@ -37,7 +37,7 @@ LEAD_SONAME = "libpq.so" | |||
| 37 | export LDFLAGS_SL = "${LDFLAGS}" | 37 | export LDFLAGS_SL = "${LDFLAGS}" |
| 38 | export LDFLAGS_EX_BE = "-Wl,--export-dynamic" | 38 | export LDFLAGS_EX_BE = "-Wl,--export-dynamic" |
| 39 | 39 | ||
| 40 | inherit autotools pkgconfig perlnative python3native python3targetconfig useradd update-rc.d systemd gettext cpan-base multilib_header | 40 | inherit autotools pkgconfig perlnative python3native python3targetconfig useradd update-rc.d systemd gettext perl-version multilib_header |
| 41 | 41 | ||
| 42 | CFLAGS += "-I${STAGING_INCDIR}/${PYTHON_DIR} -I${STAGING_INCDIR}/tcl8.6" | 42 | CFLAGS += "-I${STAGING_INCDIR}/${PYTHON_DIR} -I${STAGING_INCDIR}/tcl8.6" |
| 43 | 43 | ||
| @@ -122,6 +122,12 @@ python populate_packages:prepend() { | |||
| 122 | 122 | ||
| 123 | } | 123 | } |
| 124 | 124 | ||
| 125 | # Same as the function in cpan-base.bbclass (but without the perl RDEPENDS) | ||
| 126 | def is_target(d): | ||
| 127 | if not bb.data.inherits_class('native', d): | ||
| 128 | return "yes" | ||
| 129 | return "no" | ||
| 130 | |||
| 125 | # This will make native perl use target settings (for include dirs etc.) | 131 | # This will make native perl use target settings (for include dirs etc.) |
| 126 | export PERLCONFIGTARGET = "${@is_target(d)}" | 132 | export PERLCONFIGTARGET = "${@is_target(d)}" |
| 127 | export PERL_ARCHLIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl5/${@get_perl_version(d)}/${@get_perl_arch(d)}" | 133 | export PERL_ARCHLIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl5/${@get_perl_version(d)}/${@get_perl_arch(d)}" |
