mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-07 05:10:20 +00:00
Code Issues Projects Releases Wiki Activity

abiword: Fix build when S != B

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj
2014-04-26 13:34:44 -07:00
committed by Martin Jansa
parent 9df13b4140
commit 8e1213bd66
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb
+5 -6
View File
@@ -4,7 +4,7 @@ SECTION = "x11/office"
LICENSE = "GPLv2" LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=ecd3ac329fca77e2d0e412bec38e1c20" LIC_FILES_CHKSUM = "file://COPYING;md5=ecd3ac329fca77e2d0e412bec38e1c20"
DEPENDS = "perl-native wv libglade libfribidi jpeg libpng \ DEPENDS = "perl-native wv libglade libfribidi jpeg libpng \
librsvg libwmf-native gtkmathview asio gtk+" librsvg libwmf-native gtkmathview asio gtk+ evolution-data-server"
RDEPENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ RDEPENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \
glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
RCONFLICTS_${PN} = "${PN}-embedded" RCONFLICTS_${PN} = "${PN}-embedded"
@@ -22,7 +22,7 @@ SRC_URI[sha256sum] = "d17e318c00ff4eb353e0e7994b098b1d4f9ddd8712ac0261a0e38b8908
#want 3.x from 3.x.y for the installation directory #want 3.x from 3.x.y for the installation directory
SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
inherit autotools pkgconfig inherit autotools-brokensep pkgconfig
PACKAGECONFIG ??= "collab-backend-xmpp collab-backend-tcp collab-backend-service" PACKAGECONFIG ??= "collab-backend-xmpp collab-backend-tcp collab-backend-service"
PACKAGECONFIG[spell] = "--enable-spell,--disable-spell,enchant" PACKAGECONFIG[spell] = "--enable-spell,--disable-spell,enchant"
@@ -44,17 +44,16 @@ EXTRA_OECONF = " --disable-static \
# AbiWord configure.ac does not play nicely with autoreconf # AbiWord configure.ac does not play nicely with autoreconf
# so use the autogen.sh script that comes with AbiWord # so use the autogen.sh script that comes with AbiWord
do_configure() { do_configure() {
install -m 0755 ${WORKDIR}/autogen-common.sh ${S}/autogen-common.sh install -m 0755 ${WORKDIR}/autogen-common.sh ${B}/autogen-common.sh
cd ${S}
./autogen-common.sh ./autogen-common.sh
autotools_do_configure autotools_do_configure
} }
do_compile() { do_compile() {
cd ${S}/goffice-bits2 cd goffice-bits2
make goffice-paths.h make goffice-paths.h
make libgoffice.la make libgoffice.la
cd ${S} cd ${B}
oe_runmake oe_runmake
} }