summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Novoa III <mjn3@codepoet.org>2003-11-29 19:19:10 +0000
committerManuel Novoa III <mjn3@codepoet.org>2003-11-29 19:19:10 +0000
commitb6e2231fa3467a643359af2b9f80b6d130914f80 (patch)
treead2eab8a8d30cd74a3ca72a165b59171a5b1bef5
parentbbf2a9074b076ab88b09a4cf5992da410ef2ab23 (diff)
downloadbuildroot-novena-b6e2231fa3467a643359af2b9f80b6d130914f80.tar.gz
buildroot-novena-b6e2231fa3467a643359af2b9f80b6d130914f80.zip
Various fixes. Should now build when cross compiling and install correctly.
-rw-r--r--make/jpeg.mk14
1 files changed, 8 insertions, 6 deletions
diff --git a/make/jpeg.mk b/make/jpeg.mk
index e3489b28a..d3f99676d 100644
--- a/make/jpeg.mk
+++ b/make/jpeg.mk
@@ -32,10 +32,12 @@ jpeg-source: $(DL_DIR)/$(JPEG_SOURCE)
$(JPEG_DIR)/.unpacked: $(DL_DIR)/$(JPEG_SOURCE)
$(JPEG_CAT) $(DL_DIR)/$(JPEG_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+ # The config.guess distributed with the package is not able
+ # to handle cross compilation. Use the one from binutils.
+ cp $(BINUTILS_DIR)/config.guess $(JPEG_DIR)/
touch $(JPEG_DIR)/.unpacked
$(JPEG_DIR)/.configured: $(JPEG_DIR)/.unpacked
- zcat $(DL_DIR)/$(JPEG_SOURCE) | tar -C $(BUILD_DIR) -xvf -
(cd $(JPEG_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
./configure \
@@ -57,13 +59,13 @@ $(JPEG_DIR)/.configured: $(JPEG_DIR)/.unpacked
touch $(JPEG_DIR)/.configured
$(STAGING_DIR)/lib/libjpeg.so.62.0.0: $(JPEG_DIR)/.configured
- $(MAKE) -C $(JPEG_DIR) CC=$(TARGET_CROSS)gcc all
- $(MAKE) -C $(JPEG_DIR) install-lib
- $(MAKE) -C $(JPEG_DIR) install-headers
+ $(MAKE) -C $(JPEG_DIR) all
+ # Note: This does not install the utilities.
+ $(MAKE) -C $(JPEG_DIR) prefix=$(STAGING_DIR) exec_prefix=$(STAGING_DIR) install-headers install-lib
$(TARGET_DIR)/lib/libjpeg.so.62.0.0: $(STAGING_DIR)/lib/libjpeg.so.62.0.0
- cp -dpf $(STAGING_DIR)/lib/libjpeg.so* $(TARGET_DIR)/lib/
- -$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libjpeg.so.62.0.0
+ cp -dpf $(STAGING_DIR)/lib/libjpeg.so* $(TARGET_DIR)/usr/lib/
+ -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libjpeg.so.62.0.0
jpeg: uclibc $(TARGET_DIR)/lib/libjpeg.so.62.0.0