Author: nbd
Date: 2015-12-19 12:29:42 +0100 (Sat, 19 Dec 2015)
New Revision: 47951
Modified:
branches/chaos_calmer/package/utils/bzip2/Makefile
Log:
Revert "bzip2: extend/fix the Host/Install rule to install libbz2.so files"
This reverts r47245.
Linking to shared libraries under $STAGING_DIR_HOST{,/usr}/lib is harmful,
as these directories aren't added to LD_LIBRARY_PATH (see r47103 for an
explanation why LD_LIBRARY_PATH is not used).
Revert to static linking; in particular, this fixes the build of the python
bz2 module on OpenSUSE and Fedora (which in turn broke the build of
nodejs).
Signed-off-by: Matthias Schiffer <[email protected]>
Backport of r47950
Modified: branches/chaos_calmer/package/utils/bzip2/Makefile
===================================================================
--- branches/chaos_calmer/package/utils/bzip2/Makefile 2015-12-19 11:28:49 UTC
(rev 47950)
+++ branches/chaos_calmer/package/utils/bzip2/Makefile 2015-12-19 11:29:42 UTC
(rev 47951)
@@ -97,10 +97,8 @@
--prefix=$(STAGING_DIR_HOST)
define Host/Install
- $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/ $(STAGING_DIR_HOST)/usr/lib
+ $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/
$(MAKE) -C $(HOST_BUILD_DIR) PREFIX=$(STAGING_DIR_HOST)/usr/ install
- $(CP) $(HOST_BUILD_DIR)/libbz2.so* $(STAGING_DIR_HOST)/usr/lib/
- $(CP) $(HOST_BUILD_DIR)/libbz2.so.1.0
$(STAGING_DIR_HOST)/usr/lib/libbz2.so
endef
$(eval $(call HostBuild))
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
