aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-04-15 15:16:21 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-18 05:51:25 +0100
commitc51061112deef9b910e60632f37ce404f1c10bd5 (patch)
tree09a509b1efa9b7ba54b1811f7034b683f4d2e6ab
parent72ff13687700823adccfed1da670e951ff089677 (diff)
downloadpoky-c51061112deef9b910e60632f37ce404f1c10bd5.tar.gz
poky-c51061112deef9b910e60632f37ce404f1c10bd5.tar.bz2
poky-c51061112deef9b910e60632f37ce404f1c10bd5.zip
slang: Update to 2.2.4
- Removed fix-uclibc.patch as it's no longer required by the upstream - Removed requirment for png as we only need limited support for slang - fix license - disable Parallel Make (From OE-Core rev: 2f5ab5632e9c7be5fef5fcb57c52dbec7d0880f9) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/slang/slang/fix-uclibc.patch11
-rw-r--r--meta/recipes-extended/slang/slang_2.2.4.bb (renamed from meta/recipes-extended/slang/slang_2.2.2.bb)18
2 files changed, 10 insertions, 19 deletions
diff --git a/meta/recipes-extended/slang/slang/fix-uclibc.patch b/meta/recipes-extended/slang/slang/fix-uclibc.patch
deleted file mode 100644
index c2b8225d07..0000000000
--- a/meta/recipes-extended/slang/slang/fix-uclibc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- slang-2.1.3.orig/src/slcommon.c 2007-01-10 18:09:07.000000000 +0200
-+++ slang-2.1.3.orig/src/slcommon.c 2008-03-19 16:09:09.000000000 +0200
-@@ -191,7 +191,7 @@
- return p;
- }
-
--#if !defined(HAVE_ISSETUGID) && defined(__GLIBC__) && (__GLIBC__ >= 2)
-+#if !defined(HAVE_ISSETUGID) && defined(__GLIBC__) && (__GLIBC__ >= 2) && !defined(__UCLIBC__)
- extern int __libc_enable_secure;
- # define HAVE___LIBC_ENABLE_SECURE 1
- #endif
diff --git a/meta/recipes-extended/slang/slang_2.2.2.bb b/meta/recipes-extended/slang/slang_2.2.4.bb
index 29d9e46d51..2b000a4088 100644
--- a/meta/recipes-extended/slang/slang_2.2.2.bb
+++ b/meta/recipes-extended/slang/slang_2.2.4.bb
@@ -10,23 +10,25 @@ to recode S-Lang procedures in C if you need to."
SECTION = "libs"
PRIORITY = "optional"
DEPENDS = "pcre"
-PR = "r2"
+PR = "r5"
-LICENSE = "GPL Artistic"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a52a18a472d4f7e45479b06563717c02"
-SRC_URI = "ftp://space.mit.edu/pub/davis/slang/v2.2/OLD/slang-${PV}.tar.bz2 \
- file://fix-uclibc.patch"
+SRC_URI = "ftp://space.mit.edu/pub/davis/slang/v2.2/slang-${PV}.tar.bz2 \
+ "
inherit autotools
-SRC_URI[md5sum] = "974437602a781cfe92ab61433dd16d03"
-SRC_URI[sha256sum] = "cfaf8551fa3855f9b0043309bb553ef6d457f931b404df5a6ba6a5a69371fc42"
+SRC_URI[md5sum] = "7fcfd447e378f07dd0c0bae671fe6487"
+SRC_URI[sha256sum] = "9a8257a9a2a55099af858b13338dc8f3a06dd2069f46f0df2c9c3bb84a01d5db"
-EXTRA_OECONF += " --x-includes=${STAGING_DIR_HOST}/usr/X11/include"
+EXTRA_OECONF += " --without-png"
do_install() {
oe_runmake install DESTDIR=${D} -e 'INST_LIB_DIR=${STAGING_DIR_HOST}/usr/lib'
}
FILES_${PN} += "${datadir}/slsh/"
+
+PARALLEL_MAKE = ""