diff options
| author | lars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-06-04 00:20:01 +0000 |
|---|---|---|
| committer | lars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-06-04 00:20:01 +0000 |
| commit | 95761f2647f36776f4f0c72d8f55c983c69c3eab (patch) | |
| tree | ffbbaad0d3816d7d0c474f7e8eb7092dfbf4e6af | |
| parent | 6c822bda7a1c24097d9c230bc30217b731509b1c (diff) | |
More libtool madness: Every package which was using c++ and libtool fixup
was linked against libstd++ even though if it should have been linked
against uclibc++. This is fixed by providing a special version of libtool
fixup for packages which should use uclibc++. Not pretty but functional.
Packages linking against uclibc++ should use PKG_FIXUP:=libtool-ucxx instead of
PKG_FIXUP:=libtool
Somebody should probably check all packages using c++ with a dependency on stdlibc++
if uclibc++ can be used instead now.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16317 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/autotools.mk | 19 | ||||
| -rw-r--r-- | package/libtool/Makefile | 2 |
2 files changed, 17 insertions, 4 deletions
diff --git a/include/autotools.mk b/include/autotools.mk index 558e247fd8..5d51d7a328 100644 --- a/include/autotools.mk +++ b/include/autotools.mk @@ -1,20 +1,23 @@ # -# Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # define replace - if [ -f "$(PKG_BUILD_DIR)/$(3)$(1)" -a -e "$(2)/$(1)" ]; then \ + if [ -f "$(PKG_BUILD_DIR)/$(3)$(1)" -a -e "$(2)/$(if $(4),$(4),$(1))" ]; then \ rm -f $(PKG_BUILD_DIR)/$(3)$(1); \ - ln -s $(2)/$(1) $(PKG_BUILD_DIR)/$(3); \ + ln -s $(2)/$(if $(4),$(4),$(1)) $(PKG_BUILD_DIR)/$(3)$(1); \ fi endef # replace copies of ltmain.sh with the build system's version -update_libtool=$(call replace,libtool,$(STAGING_DIR)/host/bin,$(CONFIGURE_PATH)/)$(call replace,ltmain.sh,$(STAGING_DIR)/host/share/libtool,$(CONFIGURE_PATH)/)$(call replace,libtool.m4,$(STAGING_DIR)/host/share/aclocal,$(CONFIGURE_PATH)/) +update_libtool_common=$(call replace,ltmain.sh,$(STAGING_DIR)/host/share/libtool,$(CONFIGURE_PATH)/)$(call replace,libtool.m4,$(STAGING_DIR)/host/share/aclocal,$(CONFIGURE_PATH)/) +update_libtool=$(call replace,libtool,$(STAGING_DIR)/host/bin,$(CONFIGURE_PATH)/)$(call update_libtool_common) +update_libtool_ucxx=$(call replace,libtool,$(STAGING_DIR)/host/bin,$(CONFIGURE_PATH)/,libtool-ucxx)$(call update_libtool_common) + # prevent libtool from linking against host development libraries define libtool_fixup_libdir @@ -38,3 +41,11 @@ ifneq ($(filter libtool,$(PKG_FIXUP)),) Hooks/Configure/Post += update_libtool Hooks/InstallDev/Post += libtool_fixup_libdir endif + +ifneq ($(filter libtool-ucxx,$(PKG_FIXUP)),) + PKG_BUILD_DEPENDS += libtool + Hooks/Configure/Pre += update_libtool_ucxx remove_version_check + Hooks/Configure/Post += update_libtool_ucxx + Hooks/InstallDev/Post += libtool_fixup_libdir +endif + diff --git a/package/libtool/Makefile b/package/libtool/Makefile index f179cd7c2a..8d50a7adac 100644 --- a/package/libtool/Makefile +++ b/package/libtool/Makefile @@ -45,6 +45,8 @@ define Build/InstallDev mv $(2)/lib/* $(1)/usr/lib/ mv $(2)/include/* $(1)/usr/include/ $(SED) 's,\(hardcode_into_libs\)=yes,\1=no,g' $(2)/bin/libtool + $(CP) $(2)/bin/libtool $(2)/bin/libtool-ucxx + $(SED) 's,-lstdc++,-luClibc++,g' $(2)/bin/libtool-ucxx endef define Package/libltdl/install |