KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rework aclocal handling, packages have issues writing through the symlink so keep the host aclocal as include path for now

Browse source 
SVN-Revision: 24474
This commit is contained in:
Jo-Philipp Wich 2010-12-11 03:15:10 +00:00
parent 9337c97584
commit bf9e9b6a91
3 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/autotools.mk
View file

@ -25,6 +25,7 @@ define autoreconf
[ -f ./aclocal.m4 ] && [ ! -f ./acinclude.m4 ] && mv aclocal.m4 acinclude.m4; \ [ -f ./aclocal.m4 ] && [ ! -f ./acinclude.m4 ] && mv aclocal.m4 acinclude.m4; \
[ -d ./autom4te.cache ] && rm -rf autom4te.cache; \ [ -d ./autom4te.cache ] && rm -rf autom4te.cache; \
$(STAGING_DIR_HOST)/bin/autoreconf -v -f -i -s \ $(STAGING_DIR_HOST)/bin/autoreconf -v -f -i -s \
-B $(STAGING_DIR_HOST)/share/aclocal \
-B $(STAGING_DIR)/host/share/aclocal \ -B $(STAGING_DIR)/host/share/aclocal \
$(patsubst %,-I %,$(PKG_LIBTOOL_PATHS)) $(PKG_LIBTOOL_PATHS) || true; \ $(patsubst %,-I %,$(PKG_LIBTOOL_PATHS)) $(PKG_LIBTOOL_PATHS) || true; \
fi \ fi \

2
package/libtool/Makefile
View file

@ -48,8 +48,6 @@ define Build/InstallDev
$(SED) 's,\(hardcode_into_libs\)=yes,\1=no,g' $(2)/bin/libtool $(SED) 's,\(hardcode_into_libs\)=yes,\1=no,g' $(2)/bin/libtool
$(CP) $(2)/bin/libtool $(2)/bin/libtool-ucxx $(CP) $(2)/bin/libtool $(2)/bin/libtool-ucxx
$(SED) 's,-lstdc++,-luClibc++,g' $(2)/bin/libtool-ucxx $(SED) 's,-lstdc++,-luClibc++,g' $(2)/bin/libtool-ucxx
[ -h $(STAGING_DIR)/host/share/aclocal ] && \
rm -rf $(TMP_DIR)/stage-$(PKG_NAME)/host/share/aclocal || true
endef endef
define Package/libltdl/install define Package/libltdl/install

3
tools/Makefile
View file

@ -65,9 +65,6 @@ endef
# preparatory work # preparatory work
$(STAGING_DIR)/.prepared: $(TMP_DIR)/.build $(STAGING_DIR_HOST)/.prepared $(STAGING_DIR)/.prepared: $(TMP_DIR)/.build $(STAGING_DIR_HOST)/.prepared
$(call PrepareStaging,$(STAGING_DIR)) $(call PrepareStaging,$(STAGING_DIR))
mkdir -p $(STAGING_DIR)/host/share
rm -rf $(STAGING_DIR)/host/share/aclocal
ln -s $(STAGING_DIR_HOST)/share/aclocal $(STAGING_DIR)/host/share/
mkdir -p $(BUILD_DIR)/stamp mkdir -p $(BUILD_DIR)/stamp
touch $@ touch $@