Commit Graph

34 Commits

Author SHA1 Message Date
Robert Yang 35afc1f97c slang: 2.3.1 -> 2.3.1a
(From OE-Core rev: 8fd956d4706ee115b03b02a91c7e761576b42d0a)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-03-01 23:27:09 +00:00
Ross Burton 9a1ac06139 slang: rewrite recipe to run autoconf
I discovered that we were not running autoreconf (and cannot due to the
unconvential file structure upstream), so manually run autoconf and move the
generated configure to the right place as we do already for gnu-configize.

Update no-x.patch (now that it is actually being used) so that it doesn't break
the build.

Patch out the use of INST_LIB_DIR in slsh/Makefile.in as this is the *target*
path, so is inappropriate to link to. This means we can remove the custom
do_install() which was working around the problem.

Remove all rpath patches (now overwritten by autoconf) and replace
with just passing RPATH='' via oe_runmake.

Remove the library search path patches (now overwritten by autoconf) and replace
with passing explicit pointers to the sysroot in the options.

[ YOCTO #10969 ]

(From OE-Core rev: 48fe39b09fbac973ba188938ab2a080f71ee8d68)

(From OE-Core rev: 3506898dbd62bb028349b83e1538a7ea665c3d1c)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-02-23 12:49:49 -08:00
Huang Qiyu 839d9aaafd slang: 2.3.0 -> 2.3.1
1)Upgrade slang from 2.3.0 to 2.3.1.
2)Delete 0001-Fix-error-conflicting-types-for-posix_close.patch, since it is integrated upstream.

(From OE-Core rev: ff8865af3975fafcbe4cdf31e335a8c94c49304d)

Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-12-13 22:55:19 +00:00
David Vincent f21d147659 slang: Disable parallel make install
Installation task fails if run in parallel. This case happens if we
define PARALLEL_MAKEINST to a different value of PARALLEL_MAKE.

(From OE-Core rev: bbe59d7c49b540d65c871666c95cc89a23cab474)

Signed-off-by: David Vincent <freesilicon@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-11-30 15:48:07 +00:00
Ross Burton 503682d6b9 slang: clean up options and dependencies
The AC_PATH_XTRA check for X11 headers is never actually used, so patch that out
and remove the options in EXTRA_OECONF.

Move pcre/png/zlib toggles to PACKAGECONFIG, retaining the behaviour that only
PCRE is enabled by default.

Add missing libiconv dependency.

(From OE-Core rev: 3587053646c34002fa18b87834516ce27fbd0788)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-11-06 23:35:32 +00:00
Ross Burton 84387927c2 slang: add PREMIRRORS to handle upstream moving tarballs
The slang maintainer only puts the current release at
jedsoft.org/releases/slang/slang-1.2.3.tar.bz2, all previous releases are moved
into /releases/slang/old/.

As this breaks the fetch the moment a new version is released, use PREMIRRORS to
also look in the /old/ directory.

(From OE-Core rev: 50d49766ab76b67e312f6a1d91977a40d1020919)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-11-06 23:35:32 +00:00
Robert Yang 91a6f3a375 slang: 2.2.4 -> 2.3.0
* Removed:
  change-char-type-to-signed-char-in-macros.patch
  sprintf-bug-concerning-8-bit-characters.patch
  They are already in the source.

* Updated:
  fix-check-pcre.patch
  fix-check-pcre.patch
  slang-fix-the-iconv-existence-checking.patch

* Use SECURITY_NO_PIE_CFLAGS for SECURITY_CFLAGS, it can't be built with
  "-pie -fpie":
  tmp/sysroots/qemux86-64/usr/lib64/../lib64/Scrt1.o: In function `_start':
  /usr/src/debug/glibc/2.24-r0/git/csu/../sysdeps/x86_64/start.S:104: undefined reference to `main'
  /tmp/ccMFTA8A.o: In function `smg_char_at':
  /usr/src/debug/slang/2.3.0-r0/slang-2.3.0/modules/slsmg-module.c:134: undefined reference to `SLsmg_char_at'
  /tmp/ccMFTA8A.o: In function `smg_resume_smg':

(From OE-Core rev: b2d6e069b9ecc5a13754393200a6fa48cdaaf4c6)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-07-26 08:56:26 +01:00
Otavio Salvador b5508a85fa slang: Add dependency on ncurses
Slang links over ncurses' terminal information library thus it
requires it to be available for build.

(From OE-Core rev: 365d65b301a7bfbdafb463abaa53359ebc0e8f59)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-19 17:37:34 +00:00
Ross Burton 455ff32426 meta: more removals of redunant FILES_${PN}-dbg
In some recipes overly-split -dbg packages were merged into PN-dbg.  Unless
there's a very good reason, recipes should have a single -dev and -dbg package.

(From OE-Core rev: a3b000643898d7402b9e57c02e8d10e677cc9722)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-12-16 11:56:30 +00:00
Alexander Kanavin c27bbb4814 slang: update upstream URI to (official) jedsoft.org
(From OE-Core rev: 4a839105c7166390aed5f963918c03dbebf22ab5)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-12-12 23:42:54 +00:00
Ross Burton 1c914a844b meta: Fix Upstream-Status statements
Fix a variety of problems such as typos, bad punctuations, or incorrect
Upstream-Status values.

(From OE-Core rev: bd220fe6ce8c3a0805f13a14706d3130ea872604)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-09-12 23:01:53 +01:00
Khem Raj 27a850ab08 slang: Fix namespace conflict vis-a-vis posix_close
Fixes errors like

|
/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/work/core2-64-oe-linux-musl/slang/2.2.4-r12/slang-2.2.4/src/slpo
sio.c:366:12: error: conflicting types for 'posix_close'
|  static int posix_close (SLFile_FD_Type *f)
|             ^
| In file included from
/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/work/core2-64-oe-linux-musl/slang/2.2.4-r1
2/slang-2.2.4/src/slinclud.h:20:0,
|                  from
/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/work/core2-64-oe-linux-musl/slang/2.2.4-r1
2/slang-2.2.4/src/slposio.c:24:
|
/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/sysroots/qemux86-64/usr/include/unistd.h:38:5:
note: previous de
claration of 'posix_close' was here
|  int posix_close(int, int);
|      ^
| make[1]: ***
[/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/work/core2-64-oe-linux-musl/slang/2.2.4-r12/slang-
2.2.4/src/elfobjs/slposio.o] Error 1

(From OE-Core rev: 6b0cebe506b73cee7591089b624b69e009100c89)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-09-12 22:48:37 +01:00
Ross Burton 9f33c00a2f slang: enable native builds
(From OE-Core rev: 87b2874ff9faf935226fc42b4c9ff68d0fcdd439)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-07-16 15:09:19 +01:00
Robert Yang 4acf17f149 slang: set CLEANBROKEN
When make clean:
| Makefile is older than the configure script.
| Please re-run the configure script.
| make: *** [Makefile] Error 1

(From OE-Core rev: 6f9753b32176efe1390382fc5a0317ba267d640d)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-01-16 23:08:23 +00:00
Zheng Junling a350f26ca5 slang 2.2.4: fix the iconv existence checking
When checking whether there is iconv, the configure file always check
the host env.

Now we make it working properly by adding correct prefix for cross-
compiling environment.

(From OE-Core rev: ac588cc63315e4cb4ec84a1de87533e61d2dc6b6)

Signed-off-by: Zheng Junling <zhengjunling@huawei.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-08-06 10:23:38 +01:00
Richard Purdie 069de520ec autotools-brokensep: Mark recipes with broken separate build dir support
This patch goes through the OE-Core recipes and marks those which use autotools
but don't support a separate build directory (${S} != ${B}). A new class,
autotools-brokensep is used for this purpose.

This doesn't introduce any change in behaviour in its own right.

(From OE-Core rev: 006b8a7808a58713af16c326dc37d07765334b12)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-02-28 14:01:16 +00:00
Marius Avram 331159d90d slang: fix sprintf bug concerning 8-bit characters
Buffer used for copying a "%c" character was getting
out of scope when it was required by the sprintf operation.

[YOCTO #5272]

(From OE-Core rev: c7de71813c8f47438f44749136877442cf73d536)

Signed-off-by: Marius Avram <marius.avram@intel.com>
Signed-off-by: Irina Patru <irina.patru@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-09-30 22:11:58 +01:00
Richard Purdie c8fa23f3e3 slang: Fix .debug packaging warning after debug striping was fixed
(From OE-Core rev: 2cdec8044cef963a1cc376484b4c7fa29924d5dc)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-05 17:13:51 +00:00
Marcin Juszkiewicz abf0ad8102 slang: added gnu-configize for AArch64 support
(From OE-Core rev: 807aa2079c5884b6bd1afb705c31090c87d14dc5)

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-12-26 11:34:03 +00:00
Hongxu Jia 9a9710169d slang: explicity disable invoking onig module
We don't implement module onig in our recipes,
so we should explicity disable its invoke in slang
to avoid that slang's configure incorrectly tests
the existence of onig.

[YOCTO #2820]

(From OE-Core rev: 38c1b92f188b7e9b27d7ce3f6a8ffbdd7e19f90d)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-12-03 13:52:05 +00:00
Roy.Li 8c7480e3df slang: change char type to signed char in macros
[YOCTO 2726]

The patch of converting char type to signed char is only applied to arm,
in fact it should be applied to powerpc too since powerpc has the same
assumption for char type. To x86 and mips, this patch has not impact.

(From OE-Core rev: 8c6a9bd7b4fea62b5765caecad660d372379e412)

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-31 11:59:05 +01:00
Roy.Li 219583dcbe slang 2.2.4: fix the pcre existence checking
[YOCTO #2820]

when check if there is pcre, the configure file always check
the host dir. now we make it work by adding correct prefix for
cross-compile environment.

(From OE-Core rev: 18481095d237c84aef5cfb55b651443fed538550)

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-26 14:55:20 +01:00
Roy.Li ecd5308c90 slang: add header to patch
Add description, Signed-off-by and Upstream-Status to
change-char-type-to-signed-char-in-macros.patch

(From OE-Core rev: 25745cf72056efc2250e8fdd99d6f30384472694)

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-18 14:29:31 +01:00
Roy.Li 6c401a907c slang: change char type to signed char in macros
Fix [YOCTO 2726]

C language has 3 distinct char types:
         char
         unsigned char
         signed char
A char has the same range of values as signed char on X86,
but same as unsigned char on ARM which made Slang's typecast()
and array_sort() unable to work for char value on ARM, since
Slang is assuming "char" as "signed char".

Now we change "char" as "signed char" explicitly in
util/mkslarith2.sl, and use it to regenerate src/slarith2.inc

(From OE-Core rev: 0a1d842e2db63265a6a6708b1101e1f52f223fc9)

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-17 10:53:54 +01:00
Saul Wold a86e23e1fb slang: clean up FILE after PACKAGE reorder
(From OE-Core rev: 064265fde8b0be4915908f7356dce8575068d0bd)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-06-21 13:03:00 +01:00
Saul Wold 1104171c84 slang: fix typo in rpathfix.patch
(From OE-Core rev: b57bc6c8be06bf05b30f35c81e28828013e9fb2d)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-19 14:37:44 +00:00
Richard Purdie 8bae18bb35 slang: Fix rpath QA warnings
WARNING: QA Issue: slang: /work/i586-poky-linux/slang-2.2.4-r6/packages-split/slang/usr/bin/slsh contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: slang: /work/i586-poky-linux/slang-2.2.4-r6/packages-split/slang/usr/lib/slang/v2/modules/csv-module.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: slang: /work/i586-poky-linux/slang-2.2.4-r6/packages-split/slang/usr/lib/slang/v2/modules/rand-module.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: slang: /work/i586-poky-linux/slang-2.2.4-r6/packages-split/slang/usr/lib/slang/v2/modules/iconv-module.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: slang: /work/i586-poky-linux/slang-2.2.4-r6/packages-split/slang/usr/lib/slang/v2/modules/select-module.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: slang: /work/i586-poky-linux/slang-2.2.4-r6/packages-split/slang/usr/lib/slang/v2/modules/varray-module.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: slang: /work/i586-poky-linux/slang-2.2.4-r6/packages-split/slang/usr/lib/slang/v2/modules/fcntl-module.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: slang: /work/i586-poky-linux/slang-2.2.4-r6/packages-split/slang/usr/lib/slang/v2/modules/sysconf-module.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: slang: /work/i586-poky-linux/slang-2.2.4-r6/packages-split/slang/usr/lib/slang/v2/modules/socket-module.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: slang: /work/i586-poky-linux/slang-2.2.4-r6/packages-split/slang/usr/lib/slang/v2/modules/termios-module.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: slang: /work/i586-poky-linux/slang-2.2.4-r6/packages-split/slang/usr/lib/slang/v2/modules/slsmg-module.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: slang: /work/i586-poky-linux/slang-2.2.4-r6/packages-split/slang/usr/lib/slang/v2/modules/fork-module.so contains probably-redundant RPATH /usr/lib

(From OE-Core rev: b055075ba5b9ff5250bc66be1cd8b222bdb86161)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-15 00:11:40 +00:00
Kang Kai c7016bac66 slang: add homepage and update distro tracking fields
Add slang homepage and bump up PR.
Update distro tracking fields.

(From OE-Core rev: 86c9732728e2e29051d6e6059e19c015c06358cb)

Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-19 09:29:20 -07:00
Richard Purdie 8511d1ec1b Drop PRIORITY variable
As discussed on the mailing list, this variable isn't useful and if wanted
would be better implemented by distros using pn-X overrides.

This patch executes:

find . -regex ".*\.\(bb\|inc\)$" | xargs sed -i '/^PRIORITY = ".*"$/d'

against the tree removing the referenced. Thanks to Phil Blundell for
the command.

(From OE-Core rev: d122343362669c683acc4af295971a62cbc823fc)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-01 23:27:29 +01:00
Saul Wold b1c6f705fc slang: Fix host contamination issue
(From OE-Core rev: 39c044b6c329f4243dea3584d51ea4baf01465f4)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-24 22:48:25 +01:00
Saul Wold c51061112d 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>
2011-04-18 05:51:25 +01:00
Kevin Tian 34869c6d61 slang: specify --x-includes to pass qa sanity check
slang by default hardcodes a list of host dirs to search for X header
files, which may break qa sanity check. Use --x-includes to specify
sysroot as the fix.

Fix [YOCTO 907]

(From OE-Core rev: 35c9ed7d49309ce0babbf93e205fb2dab117c69f)

Signed-off-by: Kevin Tian <kevin.tian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-18 11:36:54 +00:00
Kang Kai a1f722aa9e slang: export INST_LIB_DIR to fix compile problems
Export "INST_LIB_DIR" in do_install to slang/slsh to fix cross compile warnings
Fixes [YOCTO #812]

Add necessary files to run slsh.

(From OE-Core rev: 71782f844552636bb0158e7a2271e849259a48c0)

Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-16 13:54:30 +00:00
Kang Kai 02b49e3c66 recipe: add slang from OE
slang is the shared library for the S-Lang extension language,
and required by newt because of LSB command check

(From OE-Core rev: 2ce924c19e8fe8fb67e7cd2aace483e3dffb24cc)

Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-03 23:49:17 +00:00