diff options
Diffstat (limited to 'external/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc')
| -rw-r--r-- | external/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/external/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc b/external/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc index dc852245..5b20098a 100644 --- a/external/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc +++ b/external/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc @@ -18,7 +18,7 @@ DESCRIPTION = "\ this package if you're installing the postgresql-server package. \ " HOMEPAGE = "http://www.postgresql.com" -LICENSE = "BSD" +LICENSE = "BSD-0-Clause" DEPENDS = "libnsl2 zlib readline tzcode-native" ARM_INSTRUCTION_SET = "arm" @@ -29,7 +29,6 @@ SRC_URI = "http://ftp.postgresql.org/pub/source/v${PV}/${BP}.tar.bz2 \ file://postgresql.pam \ file://postgresql-setup \ file://postgresql.service \ - file://0001-Use-pkg-config-for-libxml2-detection.patch \ " LEAD_SONAME = "libpq.so" @@ -37,7 +36,7 @@ LEAD_SONAME = "libpq.so" # LDFLAGS for shared libraries export LDFLAGS_SL = "${LDFLAGS}" -inherit autotools pkgconfig perlnative pythonnative useradd update-rc.d systemd gettext +inherit autotools pkgconfig perlnative python3native useradd update-rc.d systemd gettext cpan-base CFLAGS += "-I${STAGING_INCDIR}/${PYTHON_DIR} -I${STAGING_INCDIR}/tcl8.6" @@ -58,7 +57,7 @@ enable_pam = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" PACKAGECONFIG ??= "${enable_pam} openssl python uuid libxml tcl nls libxml perl" PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam," PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl," -PACKAGECONFIG[python] = "--with-python,--without-python,python,python" +PACKAGECONFIG[python] = "--with-python,--without-python,python3,python3" PACKAGECONFIG[uuid] = "--with-uuid=e2fs,--without-uuid,util-linux," PACKAGECONFIG[tcl] = "--with-tcl --with-tclconfig=${STAGING_BINDIR_CROSS},--without-tcl,tcl tcl-native," PACKAGECONFIG[nls] = "--enable-nls,--disable-nls,," @@ -72,6 +71,16 @@ EXTRA_OECONF += "--enable-thread-safety --disable-rpath \ EXTRA_OECONF_sh4 += "--disable-spinlocks" EXTRA_OECONF_aarch64 += "--disable-spinlocks" +DEBUG_OPTIMIZATION_remove_mips = " -Og" +DEBUG_OPTIMIZATION_append_mips = " -O" +BUILD_OPTIMIZATION_remove_mips = " -Og" +BUILD_OPTIMIZATION_append_mips = " -O" + +DEBUG_OPTIMIZATION_remove_mipsel = " -Og" +DEBUG_OPTIMIZATION_append_mipsel = " -O" +BUILD_OPTIMIZATION_remove_mipsel = " -Og" +BUILD_OPTIMIZATION_append_mipsel = " -O" + PACKAGES_DYNAMIC += "^${PN}-plperl \ ^${PN}-pltcl \ ^${PN}-plpython \ @@ -106,6 +115,10 @@ python populate_packages_prepend() { } +# This will make native perl use target settings (for include dirs etc.) +export PERLCONFIGTARGET = "${@is_target(d)}" +export PERL_ARCHLIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl5/${@get_perl_version(d)}/${@get_perl_arch(d)}" + do_configure() { # do_configure autotools_do_configure @@ -119,7 +132,7 @@ do_configure() { BLIBNA="\${STAGING_BASE_LIBDIR_NATIVE}" sed -i -e "/^perl_archlibexp/s:${LIBPNA}:${STAGING_LIBDIR}:g" \ ${B}/src/Makefile.global - sed -i -e "/^perl_privlibexp/s:${LIBPNA}:${STAGING_LIBDIR}:g" \ + sed -i -e "/^perl_privlibexp/s:${libdir}:${STAGING_LIBDIR}:g" \ ${B}/src/Makefile.global # remove the rpath, replace with correct lib path sed -i \ @@ -266,7 +279,9 @@ FILES_${PN}-timezone = "${datadir}/${BPN}/timezone \ ${datadir}/${BPN}/timezonesets \ " RDEPENDS_${PN} += "${PN}-timezone" -FILES_${PN}-server-dev = "${includedir}/${BPN}/server" +FILES_${PN}-server-dev = "${includedir}/${BPN}/server \ + ${libdir}/${BPN}/pgxs \ +" FILES_libecpg = "${libdir}/libecpg*${SOLIBS}" FILES_libecpg-dev = "${libdir}/libecpg*${SOLIBSDEV} \ |