domenico/openwrt-R7800-nss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Somebody should probably check all packages using c++ with a dependency on stdlibc++
if uclibc++ can be used instead now.

SVN-Revision: 16317
This commit is contained in:
Lars-Peter Clausen
2009-06-04 00:20:01 +00:00
parent 782cd2cf27
commit 246a5b334d
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/autotools.mk
View File

@@ -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. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
# #
define replace 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); \ 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 fi
endef endef
# replace copies of ltmain.sh with the build system's version # 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 # prevent libtool from linking against host development libraries
define libtool_fixup_libdir define libtool_fixup_libdir
@@ -38,3 +41,11 @@ ifneq ($(filter libtool,$(PKG_FIXUP)),)
Hooks/Configure/Post += update_libtool Hooks/Configure/Post += update_libtool
Hooks/InstallDev/Post += libtool_fixup_libdir Hooks/InstallDev/Post += libtool_fixup_libdir
endif 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

2
package/libtool/Makefile
View File

@@ -45,6 +45,8 @@ define Build/InstallDev
mv $(2)/lib/* $(1)/usr/lib/ mv $(2)/lib/* $(1)/usr/lib/
mv $(2)/include/* $(1)/usr/include/ mv $(2)/include/* $(1)/usr/include/
$(SED) 's,\(hardcode_into_libs\)=yes,\1=no,g' $(2)/bin/libtool $(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 endef
define Package/libltdl/install define Package/libltdl/install