Skip to contentSkip to conversation

meta-webserver S != B fixes

PATCH New Paul Eggleton 1 participant 3 messages May 1, 2014

lore
Share & tools
lore

Paul Eggleton

author
#0 lore raw

cover meta-webserver S != B fixes

The following changes since commit ee6f88f28566acaada77a74ce02f66fee0219ab4:

radvd.init: fix path to radvd.conf sample (2014-04-24 21:07:47 -0400)

are available in the git repository at:

git://git.openembedded.org/meta-openembedded-contrib paule/webserver-s-b-fixes
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/webserver-s-b-fixes

Paul Eggleton (2):
modphp: fix for S != B
xdebug: fix for S != B

 meta-webserver/recipes-php/modphp/modphp5.inc     | 6 +++---
 meta-webserver/recipes-php/xdebug/xdebug_2.2.3.bb | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)
Signature · 1 line
1.9.0
author
#1 lore raw

PATCH 1/2 modphp: fix for S != B

Signed-off-by Paul Eggleton <[email protected]>
---
 meta-webserver/recipes-php/modphp/modphp5.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta-webserver/recipes-php/modphp/modphp5.inc +3 -3
index d646fd1..a1d550d 100644
@@ -51,8 +51,8 @@ PACKAGECONFIG[pgsql] = "--with-pgsql=${STAGING_DIR_TARGET}${exec_prefix},--witho
 acpaths = ""
 
 do_configure_prepend () {
-    rm -f build/libtool.m4 ltmain.sh aclocal.m4
-    find . -name config.m4 | xargs -n1 sed -i 's!APXS_HTTPD=.*!APXS_HTTPD=${STAGING_BINDIR_NATIVE}/httpd!'
+    rm -f ${S}/build/libtool.m4 ${S}/ltmain.sh ${S}/aclocal.m4
+    find ${S} -name config.m4 | xargs -n1 sed -i 's!APXS_HTTPD=.*!APXS_HTTPD=${STAGING_BINDIR_NATIVE}/httpd!'
 }
 
 do_configure_append() {

@@ -76,7 +76,7 @@ do_install  () {
     install -m 755 scripts/phpize ${D}${bindir}
     install -m 755 scripts/php-config ${D}${bindir}
     cat aclocal-copy/libtool.m4 aclocal-copy/lt~obsolete.m4 aclocal-copy/ltoptions.m4 \
-        aclocal-copy/ltsugar.m4 aclocal-copy/ltversion.m4 > build/libtool.m4
+        aclocal-copy/ltsugar.m4 aclocal-copy/ltversion.m4 > ${S}/build/libtool.m4
 
     oe_runmake install-build install-headers INSTALL_ROOT=${D}
 }
Signature · 1 line
1.9.0
author
#2 lore raw

PATCH 2/2 xdebug: fix for S != B

In reply to Paul Eggleton
Signed-off-by Paul Eggleton <[email protected]>
---
 meta-webserver/recipes-php/xdebug/xdebug_2.2.3.bb | 2 ++
 1 file changed, 2 insertions(+)
meta-webserver/recipes-php/xdebug/xdebug_2.2.3.bb +2 -0
index e57783b..3c4d8e4 100644
@@ -15,7 +15,9 @@ inherit autotools
 EXTRA_OECONF += "--enable-xdebug -with-php-config=${STAGING_BINDIR_CROSS}/php-config"
 
 do_configure() {
+    cd ${S}
     ${STAGING_BINDIR_CROSS}/phpize
+    cd ${B}
 
     # Running autoreconf as autotools_do_configure would do here
     # breaks the libtool configuration resulting in a failure later
Signature · 1 line
1.9.0