Browse Source

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

SVN-Revision: 24474
Jo-Philipp Wich 15 years ago
parent
commit
bf9e9b6a91
3 changed files with 1 additions and 5 deletions
  1. 1 0
      include/autotools.mk
  2. 0 2
      package/libtool/Makefile
  3. 0 3
      tools/Makefile

+ 1 - 0
include/autotools.mk

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

+ 0 - 2
package/libtool/Makefile

@@ -48,8 +48,6 @@ define Build/InstallDev
 	$(SED) 's,\(hardcode_into_libs\)=yes,\1=no,g' $(2)/bin/libtool
 	$(CP) $(2)/bin/libtool $(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
 
 define Package/libltdl/install

+ 0 - 3
tools/Makefile

@@ -65,9 +65,6 @@ endef
 # preparatory work
 $(STAGING_DIR)/.prepared: $(TMP_DIR)/.build $(STAGING_DIR_HOST)/.prepared
 	$(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
 	touch $@