* [PATCH 0/1] PATCH RESEND: fix Bug 812 about slang
@ 2011-03-14 6:29 Kang Kai
2011-03-14 6:29 ` [PATCH 1/1] PATCH: " Kang Kai
0 siblings, 1 reply; 6+ messages in thread
From: Kang Kai @ 2011-03-14 6:29 UTC (permalink / raw)
To: sgw; +Cc: poky
From: Kang Kai <kai.kang@windriver.com>
Hi Soul,
Resend patch for bug 812.
When do install, export "INST_LIB_DIR=${STAGING_DIR_HOST}/usr/lib" to slsh so
that it will go to the right place to search libraries.
And add necessary files to run slsh.
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 <kai.kang@windriver.com>
---
Kang Kai (1):
PATCH: fix Bug 812 about slang
meta/recipes-extended/slang/slang_2.2.2.bb | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/1] PATCH: fix Bug 812 about slang
2011-03-14 6:29 [PATCH 0/1] PATCH RESEND: fix Bug 812 about slang Kang Kai
@ 2011-03-14 6:29 ` Kang Kai
2011-03-15 1:17 ` Saul Wold
0 siblings, 1 reply; 6+ messages in thread
From: Kang Kai @ 2011-03-14 6:29 UTC (permalink / raw)
To: sgw; +Cc: poky
From: Kang Kai <kai.kang@windriver.com>
Export "INST_LIB_DIR" to slang/slsh to fix cross compile warnings
Add necessary files to run slsh.
Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
meta/recipes-extended/slang/slang_2.2.2.bb | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-extended/slang/slang_2.2.2.bb b/meta/recipes-extended/slang/slang_2.2.2.bb
index 7fe76af..8459e24 100644
--- a/meta/recipes-extended/slang/slang_2.2.2.bb
+++ b/meta/recipes-extended/slang/slang_2.2.2.bb
@@ -10,7 +10,7 @@ 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"
@@ -23,3 +23,9 @@ inherit autotools
SRC_URI[md5sum] = "974437602a781cfe92ab61433dd16d03"
SRC_URI[sha256sum] = "cfaf8551fa3855f9b0043309bb553ef6d457f931b404df5a6ba6a5a69371fc42"
+
+do_install() {
+ oe_runmake install DESTDIR=${D} -e 'INST_LIB_DIR=${STAGING_DIR_HOST}/usr/lib'
+}
+
+FILES_${PN} += "/usr/share/slsh/"
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 1/1] PATCH: fix Bug 812 about slang
2011-03-14 6:29 ` [PATCH 1/1] PATCH: " Kang Kai
@ 2011-03-15 1:17 ` Saul Wold
2011-03-15 3:23 ` Kang Kai
0 siblings, 1 reply; 6+ messages in thread
From: Saul Wold @ 2011-03-15 1:17 UTC (permalink / raw)
To: Kang Kai; +Cc: poky
Kang,
The proper first line of a commit (commit subject line) should contain
the package name followed by what you have done in this commit.
Also, the bug # should not be in the first line, it should be in the
Body of the commit message in the [YOCTO #XXX] format.
So your commit message should read something like:
slang: Export INST_LIB_DIR in do_install to fix compile problems
Export "INST_LIB_DIR" to slang/slsh to fix cross compile warnings
Fixes [YOCTO #812]
Signed-off-by: Kang Kai<kai.kang@windriver.com>
Sau!
On 03/13/2011 11:29 PM, Kang Kai wrote:
> From: Kang Kai<kai.kang@windriver.com>
>
> Export "INST_LIB_DIR" to slang/slsh to fix cross compile warnings
>
> Add necessary files to run slsh.
>
> Signed-off-by: Kang Kai<kai.kang@windriver.com>
> ---
> meta/recipes-extended/slang/slang_2.2.2.bb | 8 +++++++-
> 1 files changed, 7 insertions(+), 1 deletions(-)
>
> diff --git a/meta/recipes-extended/slang/slang_2.2.2.bb b/meta/recipes-extended/slang/slang_2.2.2.bb
> index 7fe76af..8459e24 100644
> --- a/meta/recipes-extended/slang/slang_2.2.2.bb
> +++ b/meta/recipes-extended/slang/slang_2.2.2.bb
> @@ -10,7 +10,7 @@ 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"
> @@ -23,3 +23,9 @@ inherit autotools
>
> SRC_URI[md5sum] = "974437602a781cfe92ab61433dd16d03"
> SRC_URI[sha256sum] = "cfaf8551fa3855f9b0043309bb553ef6d457f931b404df5a6ba6a5a69371fc42"
> +
> +do_install() {
> + oe_runmake install DESTDIR=${D} -e 'INST_LIB_DIR=${STAGING_DIR_HOST}/usr/lib'
> +}
> +
> +FILES_${PN} += "/usr/share/slsh/"
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/1] PATCH: fix Bug 812 about slang
2011-03-15 1:17 ` Saul Wold
@ 2011-03-15 3:23 ` Kang Kai
0 siblings, 0 replies; 6+ messages in thread
From: Kang Kai @ 2011-03-15 3:23 UTC (permalink / raw)
To: Saul Wold; +Cc: poky
On 2011年03月15日 09:17, Saul Wold wrote:
>
> Kang,
>
> The proper first line of a commit (commit subject line) should contain
> the package name followed by what you have done in this commit.
>
> Also, the bug # should not be in the first line, it should be in the
> Body of the commit message in the [YOCTO #XXX] format.
>
> So your commit message should read something like:
>
> slang: Export INST_LIB_DIR in do_install to fix compile problems
>
> Export "INST_LIB_DIR" to slang/slsh to fix cross compile warnings
> Fixes [YOCTO #812]
>
> Signed-off-by: Kang Kai<kai.kang@windriver.com>
>
Sau!
Thank you very much, I will obey the rule next time.
And is there any document about the rules, then I can be more careful
about my mails' format.
Regards,
Kang Kai
>
>
> On 03/13/2011 11:29 PM, Kang Kai wrote:
>> From: Kang Kai<kai.kang@windriver.com>
>>
>> Export "INST_LIB_DIR" to slang/slsh to fix cross compile warnings
>>
>> Add necessary files to run slsh.
>>
>> Signed-off-by: Kang Kai<kai.kang@windriver.com>
>> ---
>> meta/recipes-extended/slang/slang_2.2.2.bb | 8 +++++++-
>> 1 files changed, 7 insertions(+), 1 deletions(-)
>>
>> diff --git a/meta/recipes-extended/slang/slang_2.2.2.bb
>> b/meta/recipes-extended/slang/slang_2.2.2.bb
>> index 7fe76af..8459e24 100644
>> --- a/meta/recipes-extended/slang/slang_2.2.2.bb
>> +++ b/meta/recipes-extended/slang/slang_2.2.2.bb
>> @@ -10,7 +10,7 @@ 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"
>> @@ -23,3 +23,9 @@ inherit autotools
>>
>> SRC_URI[md5sum] = "974437602a781cfe92ab61433dd16d03"
>> SRC_URI[sha256sum] =
>> "cfaf8551fa3855f9b0043309bb553ef6d457f931b404df5a6ba6a5a69371fc42"
>> +
>> +do_install() {
>> + oe_runmake install DESTDIR=${D} -e
>> 'INST_LIB_DIR=${STAGING_DIR_HOST}/usr/lib'
>> +}
>> +
>> +FILES_${PN} += "/usr/share/slsh/"
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 0/1] PATCH:fix Bug 812
@ 2011-03-10 6:07 Kang Kai
2011-03-10 6:07 ` [PATCH 1/1] PATCH: fix Bug 812 about slang Kang Kai
0 siblings, 1 reply; 6+ messages in thread
From: Kang Kai @ 2011-03-10 6:07 UTC (permalink / raw)
To: poky
From: Kang Kai <kai.kang@windriver.com>
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 <kai.kang@windriver.com>
---
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
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/1] PATCH: fix Bug 812 about slang
2011-03-10 6:07 [PATCH 0/1] PATCH:fix Bug 812 Kang Kai
@ 2011-03-10 6:07 ` Kang Kai
2011-03-11 6:50 ` Saul Wold
0 siblings, 1 reply; 6+ messages in thread
From: Kang Kai @ 2011-03-10 6:07 UTC (permalink / raw)
To: poky
From: Kang Kai <kai.kang@windriver.com>
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 <kai.kang@windriver.com>
---
.../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
diff --git a/meta/recipes-extended/slang/slang/fix-cross-configure.patch b/meta/recipes-extended/slang/slang/fix-cross-configure.patch
new file mode 100644
index 0000000..0a22a1f
--- /dev/null
+++ b/meta/recipes-extended/slang/slang/fix-cross-configure.patch
@@ -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 <kai.kang@windriver.com>
+--- 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)'
diff --git a/meta/recipes-extended/slang/slang_2.2.2.bb b/meta/recipes-extended/slang/slang_2.2.2.bb
index 7fe76af..2498d85 100644
--- a/meta/recipes-extended/slang/slang_2.2.2.bb
+++ b/meta/recipes-extended/slang/slang_2.2.2.bb
@@ -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/"
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 1/1] PATCH: fix Bug 812 about slang
2011-03-10 6:07 ` [PATCH 1/1] PATCH: fix Bug 812 about slang Kang Kai
@ 2011-03-11 6:50 ` Saul Wold
0 siblings, 0 replies; 6+ messages in thread
From: Saul Wold @ 2011-03-11 6:50 UTC (permalink / raw)
To: Kang Kai; +Cc: poky
On 03/09/2011 10:07 PM, Kang Kai wrote:
> From: Kang Kai<kai.kang@windriver.com>
>
> 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<kai.kang@windriver.com>
> ---
> .../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
>
> diff --git a/meta/recipes-extended/slang/slang/fix-cross-configure.patch b/meta/recipes-extended/slang/slang/fix-cross-configure.patch
> new file mode 100644
> index 0000000..0a22a1f
> --- /dev/null
> +++ b/meta/recipes-extended/slang/slang/fix-cross-configure.patch
> @@ -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<kai.kang@windriver.com>
> +--- 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)'
This is not the right approach, you should be looking at modifiying the
configure script.
> diff --git a/meta/recipes-extended/slang/slang_2.2.2.bb b/meta/recipes-extended/slang/slang_2.2.2.bb
> index 7fe76af..2498d85 100644
> --- 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 \
> - 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!
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-03-15 3:25 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-14 6:29 [PATCH 0/1] PATCH RESEND: fix Bug 812 about slang Kang Kai
2011-03-14 6:29 ` [PATCH 1/1] PATCH: " Kang Kai
2011-03-15 1:17 ` Saul Wold
2011-03-15 3:23 ` Kang Kai
-- strict thread matches above, loose matches on Subject: below --
2011-03-10 6:07 [PATCH 0/1] PATCH:fix Bug 812 Kang Kai
2011-03-10 6:07 ` [PATCH 1/1] PATCH: fix Bug 812 about slang Kang Kai
2011-03-11 6:50 ` Saul Wold
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.