diff options
| author | Abdoulaye Walsimou Gaye <walsimou@walsimou.com> | 2009-10-11 15:29:56 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <walsimou@walsimou.com> | 2009-10-11 15:29:56 +0200 |
| commit | 680fc5afee8ed4d709c98b2a53affc3f6b9f50c2 (patch) | |
| tree | 73be4eadfd22664a30175dff1edffd8fa9f4201a /packages | |
| parent | 2c2e7876fa0a5c498600c650239feab0775066d3 (diff) | |
| download | embtoolkit-680fc5afee8ed4d709c98b2a53affc3f6b9f50c2.tar.gz embtoolkit-680fc5afee8ed4d709c98b2a53affc3f6b9f50c2.tar.bz2 embtoolkit-680fc5afee8ed4d709c98b2a53affc3f6b9f50c2.tar.xz | |
Packages: Improve libjpeg build
Signed-off-by: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/graphics/libjpeg/libjpeg.mk | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/packages/graphics/libjpeg/libjpeg.mk b/packages/graphics/libjpeg/libjpeg.mk index 256f17d..b983691 100644 --- a/packages/graphics/libjpeg/libjpeg.mk +++ b/packages/graphics/libjpeg/libjpeg.mk @@ -33,7 +33,9 @@ $(LIBJPEG_BUILD_DIR)/.installed: download_libjpeg \ $(LIBJPEG_BUILD_DIR)/.decompressed $(LIBJPEG_BUILD_DIR)/.configured $(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \ jpeg-$(LIBJPEG_VERSION) in your root filesystem...") - $(Q)cd $(LIBJPEG_BUILD_DIR); $(MAKE) $(J) ; $(MAKE) install + $(Q)$(MAKE) -C $(LIBJPEG_BUILD_DIR) $(J) + $(Q)$(MAKE) -C $(LIBJPEG_BUILD_DIR) DESTDIR=$(ROOTFS) install + $(Q)$(MAKE) $(LIBJPEG_BUILD_DIR)/.libtoolpatched @touch $@ download_libjpeg: @@ -50,10 +52,26 @@ $(LIBJPEG_BUILD_DIR)/.decompressed: $(LIBJPEG_BUILD_DIR)/.configured: cd $(LIBJPEG_BUILD_DIR); \ + PKG_CONFIG=$(PKGCONFIG_BIN) \ + PKG_CONFIG_PATH=$(ROOTFS)/usr/lib/pkgconfig \ + PKG_CONFIG_SYSROOT_DIR=$(ROOTFS) \ CC=$(TARGETCC_CACHED) CFLAGS=$(TARGET_CFLAGS) \ ./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \ --target=$(STRICT_GNU_TARGET) \ - --prefix=$(ROOTFS)/usr --includedir=$(SYSROOT)/usr/include \ - --datarootdir=$(SYSROOT)/usr --enable-static=no + --prefix=/usr --includedir=$(SYSROOT)/usr/include \ + --datarootdir=$(SYSROOT)/usr --enable-static=no --program-suffix="" @touch $@ +$(LIBJPEG_BUILD_DIR)/.libtoolpatched: +ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) + $(Q)cd $(ROOTFS)/usr/lib32; \ + cat libjpeg.la | sed -e 's;\/usr\/lib;$(ROOTFS)\/usr\/lib32;' \ + > libjpeg.la.new;\ + cp libjpeg.la.new libjpeg.la; rm libjpeg.la.new +else + $(Q)cd $(ROOTFS)/usr/lib; \ + cat libjpeg.la | sed -e 's;\/usr\/lib;$(ROOTFS)\/usr\/lib;' \ + > libjpeg.la.new;\ + cp libjpeg.la.new libjpeg.la; rm libjpeg.la.new +endif + |