[oe-commits] org.oe.dev merge of '5c07880b5834b7705ca79c09053c32f9161e0aeb'

[oe commit]

merge of '5c07880b5834b7705ca79c09053c32f9161e0aeb'
     and 'f76780cf5858e364ec4d16a3a725b62bad681348'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: bc323a952aba630290a88129003de1e975b4f4ee
ViewMTN: http://monotone.openembedded.org/revision.psp?id=bc323a952aba630290a88129003de1e975b4f4ee
Files:
1
packages/uclibc/uclibc.inc
packages/geos/geos_2.2.3+3.0.0rc4.bb
Diffs:

#
# mt diff -r5c07880b5834b7705ca79c09053c32f9161e0aeb -rbc323a952aba630290a88129003de1e975b4f4ee
#
# 
# 
# patch "packages/uclibc/uclibc.inc"
#  from [70cdb36f8087ed763c2c2837f43d4d34e86e9f1a]
#    to [8e5578d208eaebc7f9cec32d1f12aa26433b0678]
# 
============================================================
--- packages/uclibc/uclibc.inc	70cdb36f8087ed763c2c2837f43d4d34e86e9f1a
+++ packages/uclibc/uclibc.inc	8e5578d208eaebc7f9cec32d1f12aa26433b0678
@@ -128,7 +128,7 @@ do_configure() {
 
    	sed -i -e '/CONFIG_ARM_EABI/d' ${S}/.config
 
-        if [ "${TARGET_OS}" == "linux-gnueabi" -o  "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then
+        if [ "${TARGET_OS}" = "linux-gnueabi" -o  "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then
        		echo "CONFIG_ARM_EABI=y"                >> ${S}/.config
 	else
 		echo "# CONFIG_ARM_EABI is not set"     >> ${S}/.config


#
# mt diff -rf76780cf5858e364ec4d16a3a725b62bad681348 -rbc323a952aba630290a88129003de1e975b4f4ee
#
# 
# 
# patch "packages/geos/geos_2.2.3+3.0.0rc4.bb"
#  from [997eff184f0ca70c42be17a36bca18d3fdca3a13]
#    to [753613f3c08e82eaca328c2dcc3a44288144ffda]
# 
============================================================
--- packages/geos/geos_2.2.3+3.0.0rc4.bb	997eff184f0ca70c42be17a36bca18d3fdca3a13
+++ packages/geos/geos_2.2.3+3.0.0rc4.bb	753613f3c08e82eaca328c2dcc3a44288144ffda
@@ -1,14 +1,16 @@ DEPENDS = "boost"
 DESCRIPTION = "GEOS (Geometry Engine - Open Source) is a C++ port of the Java Topology Suite (JTS)."
 HOMEPAGE = "http://geos.refractions.net/"
 LICENSE = "GPLv2""
 
 DEPENDS = "boost"
 
+PR = "r1"
+
 SRC_URI = "http://geos.refractions.net/geos-3.0.0rc4.tar.bz2"
 
 S = "${WORKDIR}/geos-3.0.0rc4"
 
-inherit autotools pkgconfig lib_package
+inherit autotools pkgconfig lib_package binconfig
 
 EXTRA_OECONF = "--disable-swig"