Patchwork [57/58] slang: Update to 2.2.4

login
register
mail settings
Submitter Saul Wold
Date April 16, 2011, 6:55 a.m.
Message ID <bf95413b1958790c02c1e116621da04a42738a84.1302936483.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/2397/
State New, archived
Headers show

Comments

Saul Wold - April 16, 2011, 6:55 a.m.
From: Saul Wold <sgw@linux.intel.com>

- 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

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/slang/slang/fix-uclibc.patch |   11 -----------
 .../slang/{slang_2.2.2.bb => slang_2.2.4.bb}       |   18 ++++++++++--------
 2 files changed, 10 insertions(+), 19 deletions(-)
 delete mode 100644 meta/recipes-extended/slang/slang/fix-uclibc.patch
 rename meta/recipes-extended/slang/{slang_2.2.2.bb => slang_2.2.4.bb} (61%)

Patch

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 c2b8225..0000000
--- 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
similarity index 61%
rename from meta/recipes-extended/slang/slang_2.2.2.bb
rename to meta/recipes-extended/slang/slang_2.2.4.bb
index 29d9e46..2b000a4 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 = ""