[source] libtool: don't clobber host libtool infrastructure

LEDE Commits lede-commits at lists.infradead.org
Sat Jan 21 15:40:49 PST 2017


jow pushed a commit to source.git, branch master:
https://git.lede-project.org/f798776188eaf1a9c0345da66a848a5cbe3cfb71

commit f798776188eaf1a9c0345da66a848a5cbe3cfb71
Author: Jo-Philipp Wich <jo at mein.io>
AuthorDate: Sun Jan 22 00:28:54 2017 +0100

    libtool: don't clobber host libtool infrastructure
    
    The libtool target package stages its files into the host staging directory
    and moves the libltdl library parts from there into the target staging
    directory afterwards.
    
    By doing so, the package essentially renders the host libtool infrastructure
    unusable, leading to the below error in subsequent package builds:
    
        libtoolize: $pkgltdldir is not a directory: `.../hostpkg/share/libtool`
    
    Prevent this problem by using a dedicated libltdl install prefix in order to
    avoid overwriting and moving away preexisting files belonging to tools/libtool.
    
    Signed-off-by: Jo-Philipp Wich <jo at mein.io>
---
 package/libs/libtool/Makefile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/package/libs/libtool/Makefile b/package/libs/libtool/Makefile
index 2d5cedf..5eb521a 100644
--- a/package/libs/libtool/Makefile
+++ b/package/libs/libtool/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libtool
 PKG_VERSION:=2.4
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/libtool
@@ -34,14 +34,14 @@ endef
 
 define Build/InstallDev
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		bindir="$(2)/bin" \
-		datadir="$(2)/share" \
-		prefix="$(2)" \
-		exec_prefix="$(2)" \
+		bindir="$(2)/libltdl/bin" \
+		datadir="$(2)/libltdl/share" \
+		prefix="$(2)/libltdl" \
+		exec_prefix="$(2)/libltdl" \
 		install
 	$(INSTALL_DIR) $(1)/usr/lib $(1)/usr/include
-	mv $(2)/lib/* $(1)/usr/lib/
-	mv $(2)/include/* $(1)/usr/include/
+	mv $(2)/libltdl/lib/* $(1)/usr/lib/
+	mv $(2)/libltdl/include/* $(1)/usr/include/
 endef
 
 define Package/libltdl/install



More information about the lede-commits mailing list