浏览代码

Fix bzip2 cross build error associated with host ranlib being
used instead of cross target ranlib.

"Steven J. Hill" 20 年之前
父节点
当前提交
d5871cf8ad
共有 2 个文件被更改,包括 3 次插入2 次删除
  1. 1 0
      package/Makefile.in
  2. 2 2
      package/bzip2/bzip2.mk

+ 1 - 0
package/Makefile.in

@@ -33,6 +33,7 @@ GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux
 KERNEL_CROSS=$(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)-linux-uclibc-
 KERNEL_CROSS=$(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)-linux-uclibc-
 TARGET_CROSS=$(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)-linux-uclibc-
 TARGET_CROSS=$(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)-linux-uclibc-
 TARGET_CC=$(TARGET_CROSS)gcc
 TARGET_CC=$(TARGET_CROSS)gcc
+TARGET_RANLIB=$(TARGET_CROSS)ranlib
 STRIP=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note
 STRIP=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note
 INSTALL=/usr/bin/install
 INSTALL=/usr/bin/install
 
 

+ 2 - 2
package/bzip2/bzip2.mk

@@ -31,9 +31,9 @@ endif
 
 
 $(STAGING_DIR)/lib/libbz2.so.$(BZIP2_VER): $(BZIP2_DIR)/.unpacked
 $(STAGING_DIR)/lib/libbz2.so.$(BZIP2_VER): $(BZIP2_DIR)/.unpacked
 	$(TARGET_CONFIGURE_OPTS) \
 	$(TARGET_CONFIGURE_OPTS) \
-	$(MAKE) CC=$(TARGET_CC) -C $(BZIP2_DIR) -f Makefile-libbz2_so
+	$(MAKE) CC=$(TARGET_CC) RANLIB=$(TARGET_RANLIB) -C $(BZIP2_DIR) -f Makefile-libbz2_so
 	$(TARGET_CONFIGURE_OPTS) \
 	$(TARGET_CONFIGURE_OPTS) \
-	$(MAKE) CC=$(TARGET_CC) -C $(BZIP2_DIR) libbz2.a
+	$(MAKE) CC=$(TARGET_CC) RANLIB=$(TARGET_RANLIB) -C $(BZIP2_DIR) libbz2.a
 	cp $(BZIP2_DIR)/bzlib.h $(STAGING_DIR)/include/
 	cp $(BZIP2_DIR)/bzlib.h $(STAGING_DIR)/include/
 	cp $(BZIP2_DIR)/libbz2.so.$(BZIP2_VER) $(STAGING_DIR)/lib/
 	cp $(BZIP2_DIR)/libbz2.so.$(BZIP2_VER) $(STAGING_DIR)/lib/
 	cp $(BZIP2_DIR)/libbz2.a $(STAGING_DIR)/lib/
 	cp $(BZIP2_DIR)/libbz2.a $(STAGING_DIR)/lib/