projects
/
openwrt
/
staging
/
chunkeey.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f3f3be3
)
autotools.mk: allow disabling autoreconf, remove libdir fixup
author
Jo-Philipp Wich
<jow@openwrt.org>
Wed, 8 Dec 2010 02:24:21 +0000
(
02:24
+0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Wed, 8 Dec 2010 02:24:21 +0000
(
02:24
+0000)
SVN-Revision: 24321
include/autotools.mk
patch
|
blob
|
history
diff --git
a/include/autotools.mk
b/include/autotools.mk
index df5e85a5f5a07b6bab9791b436732886b7ea1f17..9ba3fc33b9e901a1e8fe80ef18094c6cab0c2264 100644
(file)
--- a/
include/autotools.mk
+++ b/
include/autotools.mk
@@
-9,13
+9,6
@@
PKG_LIBTOOL_PATHS?=$(CONFIGURE_PATH)
autoconf_bool = $(patsubst %,$(if $($(1)),--enable,--disable)-%,$(2))
autoconf_bool = $(patsubst %,$(if $($(1)),--enable,--disable)-%,$(2))
-# prevent libtool from linking against host development libraries
-define libtool_fixup_libdir
- find $(1) -name '*.la' | $(XARGS) \
- $(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g" \
- -e "s,$(STAGING_DIR)/usr/lib/\(libstdc++\|libsupc++\).la,$(TOOLCHAIN_DIR)/lib/\1.la,g";
-endef
-
# delete *.la-files from staging_dir - we can not yet remove respective lines within all package
# Makefiles, since backfire still uses libtool v1.5.x which (may) require those files
define libtool_remove_files
# delete *.la-files from staging_dir - we can not yet remove respective lines within all package
# Makefiles, since backfire still uses libtool v1.5.x which (may) require those files
define libtool_remove_files
@@
-37,13
+30,15
@@
Hooks/InstallDev/Post += libtool_remove_files
ifneq ($(filter libtool,$(PKG_FIXUP)),)
PKG_BUILD_DEPENDS += libtool
ifneq ($(filter libtool,$(PKG_FIXUP)),)
PKG_BUILD_DEPENDS += libtool
+ ifeq ($(filter no-autoreconf,$(PKG_FIXUP)),)
Hooks/Configure/Pre += autoreconf
Hooks/Configure/Pre += autoreconf
- Hooks/InstallDev/Post += libtool_fixup_libdir
+ endif
endif
ifneq ($(filter libtool-ucxx,$(PKG_FIXUP)),)
PKG_BUILD_DEPENDS += libtool
endif
ifneq ($(filter libtool-ucxx,$(PKG_FIXUP)),)
PKG_BUILD_DEPENDS += libtool
+ ifeq ($(filter no-autoreconf,$(PKG_FIXUP)),)
Hooks/Configure/Pre += autoreconf
Hooks/Configure/Pre += autoreconf
- Hooks/InstallDev/Post += libtool_fixup_libdir
+ endif
endif
endif