summaryrefslogtreecommitdiff
path: root/recipes
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2010-03-12 21:51:25 +0100
committerDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2010-03-28 18:14:44 +0200
commitd895ad91df52dcc0f7525152025f5378a2c05f60 (patch)
treeba8804f68fa80b1277c5302316b57c8ac134de8c /recipes
parent19e65afbd280bfd4a05d7b8c499da3e0010a3a5f (diff)
fbreader 0.12.1: fix QA issues and bump PR
There were 2 QA issues: * GNU_HASH (fixed with LDFLAGS='${LDFLAGS}' in EXTRA_OEMAKE ) * .debug included in the main package (fixed by FILES_${PN}-dbg += "${libdir}/zlibrary/ui/.debug/") Both were fixed and PR was bumped. Note that buildsys(fbreader-0.8.2a_buildsys_oe.patch is an example of them) patches were not ported because it built correctly without. OE_CFLAGS='${CXXFLAGS}' was removed because without the buildsys patches, it doesn't have any effect.
Diffstat (limited to 'recipes')
-rw-r--r--recipes/fbreader/fbreader_0.12.1.bb5
1 files changed, 3 insertions, 2 deletions
diff --git a/recipes/fbreader/fbreader_0.12.1.bb b/recipes/fbreader/fbreader_0.12.1.bb
index 0fd1c7c904..1be99e0619 100644
--- a/recipes/fbreader/fbreader_0.12.1.bb
+++ b/recipes/fbreader/fbreader_0.12.1.bb
@@ -4,7 +4,7 @@ SECTION = "x11/utils"
PRIORITY = "optional"
LICENSE = "GPLv2"
DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv liblinebreak libfribidi"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://www.fbreader.org/fbreader-sources-${PV}.tgz \
file://Makefile.patch;patch=1"
@@ -16,9 +16,10 @@ READER_UI ?= "gtk"
READER_STATUS ?= "release"
FILES_${PN} += "${datadir}/FBReader ${datadir}/zlibrary ${libdir}/zlibrary"
+FILES_${PN}-dbg += "${libdir}/zlibrary/ui/.debug/"
CFLAGS_append = " RESOLUTION=${READER_RESOLUTION} INSTALLDIR=${prefix}"
-EXTRA_OEMAKE = "CC='${CXX}' LD='${CXX}' OE_CFLAGS='${CXXFLAGS}' INCPATH='${STAGING_INCDIR}' LIBPATH='${STAGING_LIBDIR}'"
+EXTRA_OEMAKE = "CC='${CXX}' LD='${CXX}' LDFLAGS='${LDFLAGS}' INCPATH='${STAGING_INCDIR}' LIBPATH='${STAGING_LIBDIR}'"
inherit pkgconfig