RepoMirrors
/
openwrt
mirror of git://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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@mein.io>
This commit is contained in:
Jo-Philipp Wich 2017-01-22 00:28:54 +01:00
parent e5bc7bff85
commit d1d970e235
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package/libs/libtool/Makefile
View File

@ -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