Modify

Opened 7 years ago

Closed 6 years ago

#8351 closed defect (fixed)

jpeg-6b broken because of new libtool

Reported by: Ernesto Owned by: mirko
Priority: normal Milestone:
Component: packages Version: Trunk
Keywords: JPEG-6B LIBTOOL Cc:

Description

"jpeg-6b" is the next broken package, that´s no longer compiles, because of newer libtool.

Attachments (0)

Change History (4)

comment:1 Changed 7 years ago by Ernesto

me/openwrt/orion-trunk-2.6.36/staging_dir/toolchain-arm_v5t_gcc-4.3.3+cs_uClibc-0.9.31_eabi/include  -I. -c ./jcapimin.c
make[4]: ./libtool: Command not found
make[4]: *** [jcapimin.lo] Error 127
make[4]: Leaving directory `/home/openwrt/orion-trunk-2.6.36/build_dir/target-arm_v5t_uClibc-0.9.31_eabi/jpeg-6b'
make[3]: *** [/home/openwrt/orion-trunk-2.6.36/build_dir/target-arm_v5t_uClibc-0.9.31_eabi/jpeg-6b/.built] Error 2
make[3]: Leaving directory `/home/openwrt/orion-trunk-2.6.36/feeds/packages/libs/jpeg'
make[2]: *** [package/feeds/packages/jpeg/compile] Error 2
make[2]: Leaving directory `/home/openwrt/orion-trunk-2.6.36'
make[1]: *** [/home/openwrt/orion-trunk-2.6.36/staging_dir/target-arm_v5t_uClibc-0.9.31_eabi/stamp/.package_compile] Error 2
make[1]: Leaving directory `/home/openwrt/orion-trunk-2.6.36'
make: *** [world] Error 2
openwrt@develope:~/orion-trunk-2.6.36$

comment:2 Changed 7 years ago by mirko

This patch fixes building jpeg in trunk with libtool2.
Testing needs to be done with backfire/libtool1.5.x before committing.

diff --git a/packages/libs/jpeg/Makefile b/packages/libs/jpeg/Makefile
index a1522c0..ab940ca 100644
--- a/packages/libs/jpeg/Makefile
+++ b/packages/libs/jpeg/Makefile
@@ -52,20 +52,9 @@ HOST_CONFIGURE_ARGS += \
        --enable-shared \
        --enable-static \
 
-define Build/Prepare
-       $(call Build/Prepare/Default)
-       # replace the old upstream libtool stuff with our own
-       ln -sf $(STAGING_DIR)/host/bin/libtool $(PKG_BUILD_DIR)/
-       ln -sf $(STAGING_DIR)/host/share/libtool/config.sub $(PKG_BUILD_DIR)/
-       ln -sf $(STAGING_DIR)/host/share/libtool/config.guess $(PKG_BUILD_DIR)/
-       ln -sf $(STAGING_DIR)/host/share/libtool/ltmain.sh $(PKG_BUILD_DIR)/
-       ln -sf /bin/true $(PKG_BUILD_DIR)/ltconfig
-endef
-
 define Build/Compile
        $(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/{include,lib,bin,man/man1}
        $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
-               LIBTOOL="./libtool --tag=CC" \
                prefix="$(PKG_INSTALL_DIR)/usr" \
                exec_prefix="$(PKG_INSTALL_DIR)/usr" \
                all install install-headers install-lib

comment:3 Changed 7 years ago by mirko

  • Owner changed from developers to mirko
  • Status changed from new to accepted

comment:4 Changed 6 years ago by swalker

  • Resolution set to fixed
  • Status changed from accepted to closed

Fixed in r24256 & r25654.

Add Comment

Modify Ticket

Action
as closed .
The resolution will be deleted. Next status will be 'reopened'.
Author


E-mail address and user name can be saved in the Preferences.

 
Note: See TracTickets for help on using tickets.