diff options
author | Ross Burton <ross.burton@intel.com> | 2017-02-07 14:35:43 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-23 12:29:12 -0800 |
commit | 3506898dbd62bb028349b83e1538a7ea665c3d1c (patch) | |
tree | f80f357c77c35c5e36b7892db05686c695f2a100 /meta/recipes-extended/slang/slang/no-x.patch | |
parent | 50feffd0917b0ab408b34ded9c2f741a9c4e5b74 (diff) | |
download | openembedded-core-contrib-3506898dbd62bb028349b83e1538a7ea665c3d1c.tar.gz |
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)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/slang/slang/no-x.patch')
-rw-r--r-- | meta/recipes-extended/slang/slang/no-x.patch | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/recipes-extended/slang/slang/no-x.patch b/meta/recipes-extended/slang/slang/no-x.patch index d7666bfc89..7dc1602fe3 100644 --- a/meta/recipes-extended/slang/slang/no-x.patch +++ b/meta/recipes-extended/slang/slang/no-x.patch @@ -12,3 +12,7 @@ index b61e974..a3e5db2 100644 -# For the socket module -AC_PATH_XTRA - +--- a/modules/Makefile.in ++++ b/modules/Makefile.in +@@ -67 +66,0 @@ ZLIB_LIB = @Z_LIB@ -lz +-SOCKET_LIBS = @X_EXTRA_LIBS@ |