PATCH:fix Bug 812
cover PATCH:fix Bug 812
From: Kang Kai <[email protected]>
When cross build slang, it links to build machine's libraries, so remove the absolute path to fix it. I confirm it is ok to do native build too.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: kangkai/distro01
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/distro01
Thanks,
Kang Kai <[email protected]>
---
Kang Kai (1):
PATCH: fix Bug 812 about slang
.../slang/slang/fix-cross-configure.patch | 16 ++++++++++++++++ meta/recipes-extended/slang/slang_2.2.2.bb | 7 +++++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-extended/slang/slang/fix-cross-configure.patch
PATCH 1/1 PATCH: fix Bug 812 about slang
From: Kang Kai <[email protected]>
Fix cross compile warnings: when bitbake slang, it links to building machine's library, add fix-cross-configure.patch to fix it.
Add necessary files to run slsh.
--- .../slang/slang/fix-cross-configure.patch | 16 ++++++++++++++++ meta/recipes-extended/slang/slang_2.2.2.bb | 7 +++++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-extended/slang/slang/fix-cross-configure.patch
meta/recipes-extended/slang/slang/fix-cross-configure.patch new file +16 -0
@@ -0,0 +1,16 @@ +$(SLANG_INST_LIB) refer to absolute dir /usr/lib, it will make link to build machine's library +when do cross compilation, remove it. + +create by Kang Kai <[email protected]> +--- slang-2.2.2/slsh/Makefile.in.orig 2011-03-09 10:17:25.315245968 +0800 ++++ slang-2.2.2/slsh/Makefile.in 2011-03-09 10:17:48.425245969 +0800 +@@ -65,7 +65,8 @@ + @SET_MAKE@ + SHELL = /bin/sh + #INST_LIBS = $(RPATH) $(SLANG_INST_LIB) $(DEST_LIB_DIR) -lslang $(READLINE_LIB) $(OTHER_LIBS) +-INST_LIBS = $(DEST_LIB_DIR) $(RPATH) $(SLANG_INST_LIB) -lslang $(READLINE_LIB) $(OTHER_LIBS) ++#INST_LIBS = $(DEST_LIB_DIR) $(RPATH) $(SLANG_INST_LIB) -lslang $(READLINE_LIB) $(OTHER_LIBS) ++INST_LIBS = $(DEST_LIB_DIR) $(RPATH) -lslang $(READLINE_LIB) $(OTHER_LIBS) + DEFS = -DSLSH_CONF_DIR='"$(SLSH_CONF_DIR)"' -DSLSH_PATH='"$(SLSH_LIB_DIR)"' \ + -DSLSH_CONF_DIR_ENV='$(SLSH_CONF_DIR_ENV)' -DSLSH_LIB_DIR_ENV='$(SLSH_LIB_DIR_ENV)' \ + -DSLSH_PATH_ENV='$(SLSH_PATH_ENV)'
meta/recipes-extended/slang/slang_2.2.2.bb +5 -2
@@ -10,16 +10,19 @@ to recode S-Lang procedures in C if you need to." SECTION = "libs" PRIORITY = "optional" DEPENDS = "pcre" -PR = "r0" +PR = "r1" LICENSE = "GPL Artistic" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" SRC_URI = "ftp://space.mit.edu/pub/davis/slang/v2.2/OLD/slang-${PV}.tar.bz2 \ - file://fix-uclibc.patch" + file://fix-uclibc.patch \ + file://fix-cross-configure.patch" inherit autotools SRC_URI[md5sum] = "974437602a781cfe92ab61433dd16d03" SRC_URI[sha256sum] = "cfaf8551fa3855f9b0043309bb553ef6d457f931b404df5a6ba6a5a69371fc42" + +FILES_${PN} += "/usr/share/slsh/"
Signature · 1 line
1.7.1
Re: [PATCH 1/1] PATCH: fix Bug 812 about slang
Quoted 26 lines · Kang Kai
From: Kang Kai<[email protected]>
Fix cross compile warnings: when bitbake slang, it links to building machine's library, add fix-cross-configure.patch to fix it.
Add necessary files to run slsh.
Signed-off-by Kang Kai<[email protected]>--- .../slang/slang/fix-cross-configure.patch | 16 ++++++++++++++++ meta/recipes-extended/slang/slang_2.2.2.bb | 7 +++++-- 2 files changed, 21 insertions(+), 2 deletions(-)create mode 100644
meta/recipes-extended/slang/slang/fix-cross-configure.patchmeta/recipes-extended/slang/slang/fix-cross-configure.patch new file +6
-0@@ -0,0 +1,16 @@ +$(SLANG_INST_LIB) refer to absolute dir /usr/lib, it will make link to build machine's library +when do cross compilation, remove it. + +create by Kang Kai<[email protected]> +--- slang-2.2.2/slsh/Makefile.in.orig 2011-03-09 10:17:25.315245968 +0800 ++++ slang-2.2.2/slsh/Makefile.in 2011-03-09 10:17:48.425245969 +0800
meta/recipes-extended/slang/slang/fix-cross-configure.patch line 16
Quoted 10 lines
meta/recipes-extended/slang/slang/fix-cross-configure.patch new file +10
-0+@@ -65,7 +65,8 @@ + @SET_MAKE@ + SHELL = /bin/sh + #INST_LIBS = $(RPATH) $(SLANG_INST_LIB) $(DEST_LIB_DIR) -lslang $(READLINE_LIB) $(OTHER_LIBS) +-INST_LIBS = $(DEST_LIB_DIR) $(RPATH) $(SLANG_INST_LIB) -lslang $(READLINE_LIB) $(OTHER_LIBS) ++#INST_LIBS = $(DEST_LIB_DIR) $(RPATH) $(SLANG_INST_LIB) -lslang $(READLINE_LIB) $(OTHER_LIBS) ++INST_LIBS = $(DEST_LIB_DIR) $(RPATH) -lslang $(READLINE_LIB) $(OTHER_LIBS) + DEFS = -DSLSH_CONF_DIR='"$(SLSH_CONF_DIR)"' -DSLSH_PATH='"$(SLSH_LIB_DIR)"' \ + -DSLSH_CONF_DIR_ENV='$(SLSH_CONF_DIR_ENV)' -DSLSH_LIB_DIR_ENV='$(SLSH_LIB_DIR_ENV)' \ + -DSLSH_PATH_ENV='$(SLSH_PATH_ENV)'
This is not the right approach, you should be looking at modifiying the configure script.
Quoted 12 lines
meta/recipes-extended/slang/slang_2.2.2.bb +1
-2--- a/meta/recipes-extended/slang/slang DEPENDS = "pcre" -PR = "r0" +PR = "r1" LICENSE = "GPL Artistic" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" SRC_URI = "ftp://space.mit.edu/pub/davis/slang/v2.2/OLD/slang-${PV}.tar.bz2 \
meta/recipes-extended/slang/slang_2.2.2.bb to recode S-Lang procedures in C if you need to." · line 28
Quoted 10 lines
meta/recipes-extended/slang/slang_2.2.2.bb +4
-1- file://fix-uclibc.patch" + file://fix-uclibc.patch \ + file://fix-cross-configure.patch" inherit autotools SRC_URI[md5sum] = "974437602a781cfe92ab61433dd16d03" SRC_URI[sha256sum] = "cfaf8551fa3855f9b0043309bb553ef6d457f931b404df5a6ba6a5a69371fc42" + +FILES_${PN} += "/usr/share/slsh/"
This should be ${datadir}/slsh
Sau!