Sfoglia il codice sorgente

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]>

SVN-Revision: 47950
Felix Fietkau 10 anni fa
parent
commit
ea1cc733af
1 ha cambiato i file con 1 aggiunte e 3 eliminazioni
  1. 1 3
      package/utils/bzip2/Makefile

+ 1 - 3
package/utils/bzip2/Makefile

@@ -97,10 +97,8 @@ HOST_CONFIGURE_ARGS+= \
 	--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))