| Submitter | Eric BENARD |
|---|---|
| Date | Dec. 30, 2010, 8:55 a.m. |
| Message ID | <1293699334-4159-1-git-send-email-eric@eukrea.com> |
| Download | mbox | patch |
| Permalink | /patch/146/ |
| State | Accepted |
| Headers | show |
Comments
Am Donnerstag, den 30.12.2010, 09:55 +0100 schrieb Eric Bénard: I would prefer if the error message `libtool: Command not found` (if it is that short) is noted in the commit summary. gnome-power-manager: fix compilation: `libtool: Command not found` > * libtool is hardcoded in src/Makefile and leads to > libtool: Command not found > > Signed-off-by: Eric Bénard <eric@eukrea.com> > --- > recipes/gnome/gnome-power-manager_2.30.0.bb | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/recipes/gnome/gnome-power-manager_2.30.0.bb b/recipes/gnome/gnome-power-manager_2.30.0.bb > index a752852..0c7bcb5 100644 > --- a/recipes/gnome/gnome-power-manager_2.30.0.bb > +++ b/recipes/gnome/gnome-power-manager_2.30.0.bb > @@ -27,6 +27,7 @@ do_configure_append() { > for i in $(find ${S} -name "Makefile") ; do > sed -i -e s:-Werror::g $i > done > + sed -e "s/libtool --/${TARGET_SYS}-libtool --/" -i ${S}/src/Makefile > } > > PACKAGES =+ "${PN}-applets" Acked-by: Paul Menzel <paulepanter@users.sourceforge.net> What is the proper patch to send upstream? Is `${TARGET_SYS}` always defined? But »-« would still make problems, wouldn’t it? Is there a program implementing this correctly in `Makefile`? Thanks, Paul
Hi Paul, On 30/12/2010 11:20, Paul Menzel wrote: > Am Donnerstag, den 30.12.2010, 09:55 +0100 schrieb Eric Bénard: > > I would prefer if the error message `libtool: Command not found` (if it > is that short) is noted in the commit summary. > > gnome-power-manager: fix compilation: `libtool: Command not found` > OK fixed and pushed. >> * libtool is hardcoded in src/Makefile and leads to >> libtool: Command not found >> >> Signed-off-by: Eric Bénard<eric@eukrea.com> >> --- >> recipes/gnome/gnome-power-manager_2.30.0.bb | 1 + >> 1 files changed, 1 insertions(+), 0 deletions(-) >> >> diff --git a/recipes/gnome/gnome-power-manager_2.30.0.bb b/recipes/gnome/gnome-power-manager_2.30.0.bb >> index a752852..0c7bcb5 100644 >> --- a/recipes/gnome/gnome-power-manager_2.30.0.bb >> +++ b/recipes/gnome/gnome-power-manager_2.30.0.bb >> @@ -27,6 +27,7 @@ do_configure_append() { >> for i in $(find ${S} -name "Makefile") ; do >> sed -i -e s:-Werror::g $i >> done >> + sed -e "s/libtool --/${TARGET_SYS}-libtool --/" -i ${S}/src/Makefile >> } >> >> PACKAGES =+ "${PN}-applets" > > Acked-by: Paul Menzel<paulepanter@users.sourceforge.net> > > What is the proper patch to send upstream? Is `${TARGET_SYS}` always > defined? But »-« would still make problems, wouldn’t it? Is there a > program implementing this correctly in `Makefile`? > - TARGET_SYS is OE specific. - The "--" is here to only replace the 2 or 3 instances of libtool concerned by the workaround. - I don't know what would be the proper patch to send upstream (and don't have time to check for this now). I've just seen there are several new release of gnome-power-manager so the problem may already be fixed, will see when I have some time. Eric
Dear Eric, Am Donnerstag, den 30.12.2010, 11:43 +0100 schrieb Eric Bénard: > On 30/12/2010 11:20, Paul Menzel wrote: > > Am Donnerstag, den 30.12.2010, 09:55 +0100 schrieb Eric Bénard: > > > > I would prefer if the error message `libtool: Command not found` (if it > > is that short) is noted in the commit summary. > > > > gnome-power-manager: fix compilation: `libtool: Command not found` > > OK fixed and pushed. great! This is ae6002 [1]. > >> * libtool is hardcoded in src/Makefile and leads to > >> libtool: Command not found > >> > >> Signed-off-by: Eric Bénard<eric@eukrea.com> > >> --- > >> recipes/gnome/gnome-power-manager_2.30.0.bb | 1 + > >> 1 files changed, 1 insertions(+), 0 deletions(-) > >> > >> diff --git a/recipes/gnome/gnome-power-manager_2.30.0.bb b/recipes/gnome/gnome-power-manager_2.30.0.bb > >> index a752852..0c7bcb5 100644 > >> --- a/recipes/gnome/gnome-power-manager_2.30.0.bb > >> +++ b/recipes/gnome/gnome-power-manager_2.30.0.bb > >> @@ -27,6 +27,7 @@ do_configure_append() { > >> for i in $(find ${S} -name "Makefile") ; do > >> sed -i -e s:-Werror::g $i > >> done > >> + sed -e "s/libtool --/${TARGET_SYS}-libtool --/" -i ${S}/src/Makefile > >> } > >> > >> PACKAGES =+ "${PN}-applets" > > > > Acked-by: Paul Menzel<paulepanter@users.sourceforge.net> > > > > What is the proper patch to send upstream? Is `${TARGET_SYS}` always > > defined? But »-« would still make problems, wouldn’t it? Is there a > > program implementing this correctly in `Makefile`? > > > - TARGET_SYS is OE specific. > - The "--" is here to only replace the 2 or 3 instances of libtool concerned > by the workaround. I meant the `-` in `${TARGET_SYS}-libtool`, so if `${TARGET_SYS}` would be empty than `-libtool` is not usable. > - I don't know what would be the proper patch to send upstream (and don't have > time to check for this now). I've just seen there are several new release of > gnome-power-manager so the problem may already be fixed, will see when I have > some time. Well as you wrote it is hard coded twice `src/Makefile.am`, also in 2.32.0. But I cannot find it in the current in master branch. It was removed in commit 756876 [2]. But I guess this will not be compatible with the current GNOME stuff in OE and is for the migration to GNOME 3. But I have no idea. `system-tools-backend_2.10.1.bb` also has to deal with hard coded `libtool` and just copies it over [3]. do_configure() { sed -i -e 's:CC=$(CC):CC="$(CC)":g' ${S}/Net-DBus/Makefile.am sed -i -e 's:CC=$(CC):CC="$(CC)":g' ${S}/Net-DBus/Makefile.in libtoolize --force --install aclocal gnu-configize oe_runconf cp ${STAGING_BINDIR_CROSS}/${TARGET_PREFIX}libtool ${S} } To summarize, it is not useful to prepare a patch for upstream inclusion since there will not be a 2.34 or 2.32.x release, I guess. Thanks, Paul [1] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=ae600202dbf68be4cc7515b877ef143c1f5f8c31 [2] http://git.gnome.org/browse/gnome-power-manager/commit/?id=7568769fb1e46de1b8ed8601fe106df9b367bb45 [3] http://cgit.openembedded.org/cgit.cgi/openembedded/tree/recipes/gnome/system-tools-backends_2.10.1.bb?id=8d914cdf124e940b7a06ad3343077b68e01e6019
Patch
diff --git a/recipes/gnome/gnome-power-manager_2.30.0.bb b/recipes/gnome/gnome-power-manager_2.30.0.bb index a752852..0c7bcb5 100644 --- a/recipes/gnome/gnome-power-manager_2.30.0.bb +++ b/recipes/gnome/gnome-power-manager_2.30.0.bb @@ -27,6 +27,7 @@ do_configure_append() { for i in $(find ${S} -name "Makefile") ; do sed -i -e s:-Werror::g $i done + sed -e "s/libtool --/${TARGET_SYS}-libtool --/" -i ${S}/src/Makefile } PACKAGES =+ "${PN}-applets"
* libtool is hardcoded in src/Makefile and leads to libtool: Command not found Signed-off-by: Eric Bénard <eric@eukrea.com> --- recipes/gnome/gnome-power-manager_2.30.0.bb | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)