Skip to contentSkip to conversation

gnome-power-manager: fix compilation

PATCH In review Eric Bénard 2 participants 4 messages Dec 30, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gnome-power-manager: fix compilation

* libtool is hardcoded in src/Makefile and leads to
libtool: Command not found

---
 recipes/gnome/gnome-power-manager_2.30.0.bb |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
recipes/gnome/gnome-power-manager_2.30.0.bb +1 -0
index a752852..0c7bcb5 100644
@@ -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"
Signature · 1 line
1.7.0.4
Acked-by on v1 1/1
#1 lore raw

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

Quoted 13 lines

* libtool is hardcoded in src/Makefile and leads to
libtool: Command not found

---
 recipes/gnome/gnome-power-manager_2.30.0.bb |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
recipes/gnome/gnome-power-manager_2.30.0.bb +0 -0
index a752852..0c7bcb5 100644

recipes/gnome/gnome-power-manager_2.30.0.bb do_configure_append() { · line 33

Quoted 7 lines
recipes/gnome/gnome-power-manager_2.30.0.bb +1 -0
@@ -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"

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

#2 lore raw

Hi Paul,

Quoted 7 lines · Paul Menzel

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.

Quoted 19 lines
Quoted 19 lines

* libtool is hardcoded in src/Makefile and leads to
libtool: Command not found

---
  recipes/gnome/gnome-power-manager_2.30.0.bb |    1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
recipes/gnome/gnome-power-manager_2.30.0.bb +1 -0
index a752852..0c7bcb5 100644
@@ -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
  }
 
Quoted 8 lines

recipes/gnome/gnome-power-manager_2.30.0.bb do_configure_append() { · line 33

Quoted 1 line
recipes/gnome/gnome-power-manager_2.30.0.bb +0 -0
  PACKAGES =+ "${PN}-applets"

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

#3 lore raw

[RFC] dealing with hard coded `libtool` in `Makefile.*` (was: [PATCH] gnome-power-manager: fix compilation)

Dear Eric,

Am Donnerstag, den 30.12.2010, 11:43 +0100 schrieb Eric Bénard:

Quoted 9 lines · Paul Menzel
Quoted 6 lines

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].

Quoted 23 lines
Quoted 23 lines
Quoted 13 lines

* libtool is hardcoded in src/Makefile and leads to
libtool: Command not found

---
  recipes/gnome/gnome-power-manager_2.30.0.bb |    1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
recipes/gnome/gnome-power-manager_2.30.0.bb +0 -0
index a752852..0c7bcb5 100644

recipes/gnome/gnome-power-manager_2.30.0.bb do_configure_append() { · line 33

Quoted 7 lines
recipes/gnome/gnome-power-manager_2.30.0.bb +1 -0
@@ -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"
Quoted 7 lines
Quoted 4 lines

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.

Quoted 4 lines

- 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