X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=include%2Fpackage.mk;h=81296b8446244c64d0d08528f8c47fbc73b25c95;hb=cb11efc85b0b404eb4bf01cce6cd857e491f2628;hp=4ef34892946e28ff1f359b9dd925ea6eaa1e9207;hpb=12c49b6a6adbbcb0c7a19119c8a8c94b5f025f79;p=openwrt.git

diff --git a/include/package.mk b/include/package.mk
index 4ef3489294..81296b8446 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -67,9 +67,9 @@ define Build/DefaultTargets
 	touch $$@
 
   ifdef Build/InstallDev
-    compile: $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed
-    $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed: $(STAMP_BUILT)
-	mkdir -p $(STAGING_DIR)/stampfiles
+    compile: $(STAGING_DIR)/stamp/.$(PKG_NAME)-installed
+    $(STAGING_DIR)/stamp/.$(PKG_NAME)-installed: $(STAMP_BUILT)
+	mkdir -p $(STAGING_DIR)/stamp
 	$(Build/InstallDev)
 	touch $$@
   endif
@@ -104,6 +104,18 @@ endif
   $(BuildIPKG)
 endef
 
+# prevent libtool from setting rpath when linking
+define Build/Fix/libtool/rpath
+	find $(PKG_BUILD_DIR) -name 'libtool' | xargs \
+		$(SED) 's,^hardcode_libdir_flag_spec=.*,hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ ",g'
+endef
+
+# prevent libtool from linking against host development libraries
+define Build/Fix/libtool/libdir
+	find $(PKG_BUILD_DIR) -name '*.la' | xargs \
+		$(SED) "s,^libdir='/usr/lib',libdir='$(STAGING_DIR)/usr/lib',g"
+endef
+
 define Build/Prepare
   $(call Build/Prepare/Default,)
 endef
@@ -128,5 +140,5 @@ install:
 clean: FORCE
 	$(Build/UninstallDev)
 	$(Build/Clean)
-	@rm -f $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed
+	@rm -f $(STAGING_DIR)/stamp/.$(PKG_NAME)-installed
 	@rm -rf $(PKG_BUILD_DIR)