package/giblib: fix breakage
PATCH 1/1 package/giblib: fix breakage
Do *NOT* apply this patch!
This is *absolutely untested* and is posted only for reference, after our discussion on IRC late last night with 'kos_tom' and 'Kanibal'.
Fix two things in the giblib package:
1- fix prefix breakage
- prefix is .../usr, not .../usr/lib or .../usr/bin
2- fix the imlib2 breakage
- imlib2 sets IMLIB2_(LIBS|CFLAGS), not IMLIB_(LIBS|CFLAGS)
- because I was not able to autoreconf giblib properly, I simply fixed the few files that had references to the bad variables
Further testing should be done on this patch, and probably it can be cleaned up somewhat...
--- package/giblib/giblib.mk | 4 +- package/giblib/giblib.patch | 206 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 208 insertions(+), 2 deletions(-)
package/giblib/giblib.mk +2 -2
@@ -8,7 +8,7 @@ GIBLIB_SOURCE = giblib-$(GIBLIB_VERSION).tar.gz GIBLIB_SITE = http://linuxbrit.co.uk/downloads/ GIBLIB_INSTALL_STAGING = YES GIBLIB_DEPENDENCIES = imlib2 -GIBLIB_CONF_OPT = --with-imlib2-prefix=$(STAGING)/usr/lib \ - --with-imlib2-exec-prefix=$(STAGING)/usr/bin +GIBLIB_CONF_OPT = --with-imlib2-prefix=$(STAGING)/usr \ + --with-imlib2-exec-prefix=$(STAGING)/usr $(eval $(call AUTOTARGETS))
package/giblib/giblib.patch new file +206 -0
206 lines not on this page · raw message
Signature · 1 line
1.7.2.5
PATCH 1/1 package/giblib: fix breakage
Le Wed, 14 Mar 2012 00:21:39 +0100,
"Yann E. MORIN" <[email protected]> a ?crit :
package/giblib/giblib.mk GIBLIB_SOURCE = giblib-$(GIBLIB_VERSION).tar.gz · line 12
Quoted 12 lines
package/giblib/giblib.mk +2
-2@@ -8,7 +8,7 @@ GIBLIB_SOURCE = giblib-$(GIBLIB_VERSION).tar.gz GIBLIB_SITE = http://linuxbrit.co.uk/downloads/ GIBLIB_INSTALL_STAGING = YES GIBLIB_DEPENDENCIES = imlib2 -GIBLIB_CONF_OPT = --with-imlib2-prefix=$(STAGING)/usr/lib \ - --with-imlib2-exec-prefix=$(STAGING)/usr/bin +GIBLIB_CONF_OPT = --with-imlib2-prefix=$(STAGING)/usr \ + --with-imlib2-exec-prefix=$(STAGING)/usr
s/STAGING/STAGING_DIR/.
Also, the modification on ./configure should be removed, and instead the package marked AUTORECONF=YES. I'll test this this evening.
Thanks for working on this!
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 1/1 package/giblib: fix breakage
Thomas, All,
Quoted 17 lines · On Wednesday 14 March 2012 07:57:21 Thomas Petazzoni wrote:
Le Wed, 14 Mar 2012 00:21:39 +0100,
"Yann E. MORIN" <[email protected]> a ?crit :package/giblib/giblib.mk GIBLIB_SOURCE = giblib-$(GIBLIB_VERSION).tar.gz · line 12
Quoted 12 lines
package/giblib/giblib.mk +2
-2@@ -8,7 +8,7 @@ GIBLIB_SOURCE = giblib-$(GIBLIB_VERSION).tar.gz GIBLIB_SITE = http://linuxbrit.co.uk/downloads/ GIBLIB_INSTALL_STAGING = YES GIBLIB_DEPENDENCIES = imlib2 -GIBLIB_CONF_OPT = --with-imlib2-prefix=$(STAGING)/usr/lib \ - --with-imlib2-exec-prefix=$(STAGING)/usr/bin +GIBLIB_CONF_OPT = --with-imlib2-prefix=$(STAGING)/usr \ + --with-imlib2-exec-prefix=$(STAGING)/usrs/STAGING/STAGING_DIR/.
As I said: totaly untested! ;-)
Quoted 2 lines
Also, the modification on ./configure should be removed, and instead the package marked AUTORECONF=YES. I'll test this this evening.
I tried to run 'autoreconf' manually, and it broke on my machine, so I decided to make it manually, so that at least we could test the end result (too late for me yesterday to test it). And if it were to work, then the patch could be cleaned-up in a second step.
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +0/33 662376056 | Software Designer | \ / CAMPAIGN | ^ | | --==< O_o >==-- '------------.-------: X AGAINST | /e\ There is no | | http://ymorin.is-a-geek.org/ | (*_*) | / \ HTML MAIL | """ conspiracy. | '------------------------------'-------'------------------'--------------------'