diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-12-19 11:29:42 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-12-19 11:29:42 +0000 |
| commit | d901b9689ec22bb49e017040d66c59702970d0e3 (patch) | |
| tree | 78dc40aafc9d0f5ce045e348f3b3fd14adefb848 /package/utils | |
| parent | fd86cd2272f4b2f862fbdc4dfc1cf21c267ec5bc (diff) | |
| download | upstream-d901b9689ec22bb49e017040d66c59702970d0e3.tar.gz upstream-d901b9689ec22bb49e017040d66c59702970d0e3.tar.bz2 upstream-d901b9689ec22bb49e017040d66c59702970d0e3.zip | |
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@universe-factory.net>
Backport of r47950
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@47951 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/utils')
| -rw-r--r-- | package/utils/bzip2/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/package/utils/bzip2/Makefile b/package/utils/bzip2/Makefile index ba47cfb7e3..4ad9684217 100644 --- a/package/utils/bzip2/Makefile +++ b/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)) |