aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster@mvista.com>2014-06-03 21:29:30 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2014-06-10 12:29:00 +0200
commita97e06713ece10b4da7fc11e5f11bf1eca02cdf9 (patch)
tree65c1535b9fbfbbfec0b4fc6d03064e8cbe2ec073
parenta3142cd44b322ce10bb719be1ceff44bef3300c2 (diff)
downloadmeta-openembedded-contrib-a97e06713ece10b4da7fc11e5f11bf1eca02cdf9.tar.gz
meta-openembedded-contrib-a97e06713ece10b4da7fc11e5f11bf1eca02cdf9.tar.bz2
meta-openembedded-contrib-a97e06713ece10b4da7fc11e5f11bf1eca02cdf9.zip
postgresql: B!=S fix
This fixes a configure issue do to incorrect directory reference. Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-support/postgresql/postgresql.inc12
1 files changed, 6 insertions, 6 deletions
diff --git a/meta-oe/recipes-support/postgresql/postgresql.inc b/meta-oe/recipes-support/postgresql/postgresql.inc
index e1374fb75f..2858a844e3 100644
--- a/meta-oe/recipes-support/postgresql/postgresql.inc
+++ b/meta-oe/recipes-support/postgresql/postgresql.inc
@@ -107,14 +107,14 @@ do_configure() {
# do_configure_append
# workaround perl package related bugs
sed -i -e "s:-L/usr/local/lib:-L=/usr/local/lib:g" \
- ${S}/src/Makefile.global
+ ${B}/src/Makefile.global
LIBPNA="\${STAGING_LIBDIR_NATIVE}/perl-native"
LIBNA="\${STAGING_LIBDIR_NATIVE}"
BLIBNA="\${STAGING_BASE_LIBDIR_NATIVE}"
sed -i -e "/^perl_archlibexp/s:${LIBPNA}:${STAGING_LIBDIR}:g" \
- ${S}/src/Makefile.global
+ ${B}/src/Makefile.global
sed -i -e "/^perl_privlibexp/s:${LIBPNA}:${STAGING_LIBDIR}:g" \
- ${S}/src/Makefile.global
+ ${B}/src/Makefile.global
# remove the rpath, replace with correct lib path
sed -i \
-e "/^perl_embed_ldflags/s:-Wl,-rpath,${LIBNA}::g" \
@@ -124,7 +124,7 @@ do_configure() {
-e "/^perl_embed_ldflags/s:${LIBPNA}:${STAGING_LIBDIR}:g" \
-e "/^perl_embed_ldflags/s:${LIBNA}:${STAGING_LIBDIR}:g" \
-e "/^perl_embed_ldflags/s:${BLIBNA}:${STAGING_BASELIBDIR}:g" \
- ${S}/src/Makefile.global
+ ${B}/src/Makefile.global
# workaround perl package's libperl.so problem
# we are using perlnative so this perl should have same version
@@ -158,11 +158,11 @@ do_install_append() {
oe_runmake DESTDIR=${D} -C contrib install
# install tutorial
install -d -m 0755 ${D}${libdir}/${BPN}/tutorial
- install ${S}/src/tutorial/* ${D}${libdir}/${BPN}/tutorial
+ install ${B}/src/tutorial/* ${D}${libdir}/${BPN}/tutorial
# install COPYRIGHT README HISTORY
install -d -m 0755 ${D}${docdir}/${BPN}
- for i in ${S}/{COPYRIGHT,README,HISTORY} ${S}/doc/{KNOWN_BUGS,MISSING_FEATURES,README*,bug.template}; do
+ for i in ${B}/{COPYRIGHT,README,HISTORY} ${B}/doc/{KNOWN_BUGS,MISSING_FEATURES,README*,bug.template}; do
[ -f $i ] && install $i ${D}${docdir}/${BPN}
done