Changeset 47951


Ignore:
Timestamp:
2015-12-19T12:29:42+01:00 (2 years ago)
Author:
nbd
Message:

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 <mschiffer@…>

Backport of r47950

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/chaos_calmer/package/utils/bzip2/Makefile

    r47269 r47951  
    9898 
    9999define Host/Install 
    100         $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/ $(STAGING_DIR_HOST)/usr/lib 
     100        $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/ 
    101101        $(MAKE) -C $(HOST_BUILD_DIR) PREFIX=$(STAGING_DIR_HOST)/usr/ install 
    102         $(CP) $(HOST_BUILD_DIR)/libbz2.so* $(STAGING_DIR_HOST)/usr/lib/ 
    103         $(CP) $(HOST_BUILD_DIR)/libbz2.so.1.0 $(STAGING_DIR_HOST)/usr/lib/libbz2.so 
    104102endef 
    105103 
Note: See TracChangeset for help on using the changeset viewer.