aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Pratt <mcpratt@pm.me>2023-03-15 21:22:37 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2023-03-27 00:41:50 +0200
commit83c1bf2cd43c89c6488cdae2891264593ee8c0c1 (patch)
treed21845e64b2c06e6a62a50e6a4ab0abbe1bcc6ef
parentb094c6976c161643d5c656b16738a65d28722b18 (diff)
downloadupstream-83c1bf2cd43c89c6488cdae2891264593ee8c0c1.tar.gz
upstream-83c1bf2cd43c89c6488cdae2891264593ee8c0c1.tar.bz2
upstream-83c1bf2cd43c89c6488cdae2891264593ee8c0c1.zip
autotools: remove specialized version of libtool
Remove the specialized copy of libtool which was used for linking to uClibc++, which is now removed. Also remove references to the deprecated fixup targets that invoked this specialized libtool, which no package uses. Ref: 6b2ed6101 ("uclibc++: remove") Ref: c10515db6 ("re-enable the libtool PKG_BUILD_DEPENDS for PKG_FIXUP") Ref: 246a5b334 ("More libtool madness") Signed-off-by: Michael Pratt <mcpratt@pm.me>
-rw-r--r--include/autotools.mk13
-rw-r--r--tools/libtool/Makefile2
2 files changed, 0 insertions, 15 deletions
diff --git a/include/autotools.mk b/include/autotools.mk
index cba36ccd9f..c378efe6f9 100644
--- a/include/autotools.mk
+++ b/include/autotools.mk
@@ -124,13 +124,6 @@ ifneq ($(filter libtool-abiver,$(PKG_FIXUP)),)
Hooks/Configure/Post += set_libtool_abiver
endif
-ifneq ($(filter libtool-ucxx,$(PKG_FIXUP)),)
- PKG_BUILD_DEPENDS += libtool
- ifeq ($(filter no-autoreconf,$(PKG_FIXUP)),)
- Hooks/Configure/Pre += autoreconf_target
- endif
-endif
-
ifneq ($(filter autoreconf,$(PKG_FIXUP)),)
ifeq ($(filter autoreconf,$(Hooks/Configure/Pre)),)
Hooks/Configure/Pre += autoreconf_target
@@ -166,12 +159,6 @@ ifneq ($(filter libtool,$(HOST_FIXUP)),)
endif
endif
-ifneq ($(filter libtool-ucxx,$(HOST_FIXUP)),)
- ifeq ($(filter no-autoreconf,$(HOST_FIXUP)),)
- Hooks/HostConfigure/Pre += autoreconf_host
- endif
-endif
-
ifneq ($(filter autoreconf,$(HOST_FIXUP)),)
ifeq ($(filter autoreconf,$(Hooks/HostConfigure/Pre)),)
Hooks/HostConfigure/Pre += autoreconf_host
diff --git a/tools/libtool/Makefile b/tools/libtool/Makefile
index 6626142294..cc9e8a68fb 100644
--- a/tools/libtool/Makefile
+++ b/tools/libtool/Makefile
@@ -35,8 +35,6 @@ endef
define Host/Install
$(MAKE) -C $(HOST_BUILD_DIR) install
$(SED) 's,\(hardcode_into_libs\)=yes,\1=no,g' $(STAGING_DIR_HOST)/bin/libtool
- $(CP) $(STAGING_DIR_HOST)/bin/libtool $(STAGING_DIR_HOST)/bin/libtool-ucxx
- $(SED) 's,-lstdc++,-luClibc++,g' $(STAGING_DIR_HOST)/bin/libtool-ucxx
endef
define Host/Uninstall