Changeset 12586


Ignore:
Timestamp:
2008-09-13T02:29:13+02:00 (8 years ago)
Author:
lars
Message:

Change libtool fixup behaviour. Still ugly but it works until we have a real
fix.
It uses a InstallDev/Post hook to find all .la files which are going to be
installed in the staging dir and prefixes every path in those files which starts
with /usr/lib with $(STAGING_DIR).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/autotools.mk

    • Property copyright set to Copyright (C) 2007-2008 Openwrt.org
    • Property licence set to GPLv2
    • Property svn:eol-style set to native
    • Property svn:keywords set to Author Date Id Revision
    r9943 r12586  
    1 #  
    2 # Copyright (C) 2007 OpenWrt.org 
     1# 
     2# Copyright (C) 2007-2008 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
    55# See /LICENSE for more information. 
    66# 
     7# $Id$ 
    78 
    89define replace 
     
    1920# prevent libtool from linking against host development libraries 
    2021define libtool_fixup_libdir 
    21         find $(PKG_BUILD_DIR) -name '*.la' | $(XARGS) \ 
    22                 $(SED) "s,^libdir='/usr/lib',libdir='$(if $(PKG_INSTALL_DIR),$(PKG_INSTALL_DIR),$(STAGING_DIR))/usr/lib',g" 
     22        find $(1) -name '*.la' | $(XARGS) \ 
     23                $(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g" 
     24        find $(2) -name '*.la' | $(XARGS) \ 
     25                $(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g" 
    2326endef 
    2427 
     
    3538  Hooks/Configure/Pre += update_libtool remove_version_check 
    3639  Hooks/Configure/Post += update_libtool 
    37   Hooks/Compile/Post += libtool_fixup_libdir 
     40  Hooks/InstallDev/Post += libtool_fixup_libdir 
    3841endif 
Note: See TracChangeset for help on using the changeset viewer.