diff options
| author | Felix Fietkau <nbd@nbd.name> | 2021-02-15 17:49:46 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2021-02-15 18:47:21 +0100 |
| commit | 075fa4cd9ae2ee5e9715fad2f70b2092ddc9ac2d (patch) | |
| tree | b7209cf91bf7c0313a83b17d1cac06e084cd394f /include | |
| parent | 26a899e3e84199db9e2807d6584e5fd6e11a702c (diff) | |
| download | upstream-075fa4cd9ae2ee5e9715fad2f70b2092ddc9ac2d.tar.gz upstream-075fa4cd9ae2ee5e9715fad2f70b2092ddc9ac2d.tar.bz2 upstream-075fa4cd9ae2ee5e9715fad2f70b2092ddc9ac2d.zip | |
Mostly revert "build: add support for fixing up library soname"
This reverts commit b12288fa69b171f7c9405518c9bed3581a06f7ce.
The patchelf approach is too fragile, and the only users of this have been
converted to make patching unnecessary
Leave the abi_version_str variable in place in rules.mk
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'include')
| -rw-r--r-- | include/package-ipkg.mk | 5 | ||||
| -rw-r--r-- | include/package.mk | 2 |
2 files changed, 0 insertions, 7 deletions
diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index e89276ed1a..eaa80ebc75 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -152,7 +152,6 @@ ifeq ($(DUMP),) mkdir -p $(PKG_BUILD_DIR)/.pkgdir/$(1) $(call Package/$(1)/install,$(PKG_BUILD_DIR)/.pkgdir/$(1)) $(call Package/$(1)/install_lib,$(PKG_BUILD_DIR)/.pkgdir/$(1)) - $(if $(PKG_ABI_VERSION),$(SET_ABI_VERSION) "$(PKG_ABI_VERSION)" "$(PKG_BUILD_DIR)/.pkgdir/$(1)" "$(STAGING_DIR)/packages/$(STAGING_FILES_LIST)") touch $$@ $(STAGING_DIR_ROOT)/stamp/.$(1)_installed: $(PKG_BUILD_DIR)/.pkgdir/$(1).installed @@ -197,15 +196,11 @@ $(_endef) $$(IPKG_$(1)) : export DESCRIPTION=$$(Package/$(1)/description) $$(IPKG_$(1)) : export PATH=$$(TARGET_PATH_PKG) $$(IPKG_$(1)) : export PKG_SOURCE_DATE_EPOCH:=$(PKG_SOURCE_DATE_EPOCH) - ifdef Build/InstallDev - $$(IPKG_$(1)): $(STAMP_INSTALLED) - endif $(PKG_INFO_DIR)/$(1).provides $$(IPKG_$(1)): $(STAMP_BUILT) $(INCLUDE_DIR)/package-ipkg.mk @rm -rf $$(IDIR_$(1)); \ $$(call remove_ipkg_files,$(1),$$(call opkg_package_files,$(call gen_ipkg_wildcard,$(1)))) mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/CONTROL $(PKG_INFO_DIR) $(call Package/$(1)/install,$$(IDIR_$(1))) - $(if $(PKG_ABI_VERSION),$(SET_ABI_VERSION) "$(PKG_ABI_VERSION)" "$$(IDIR_$(1))" "$(STAGING_DIR)/packages/$(STAGING_FILES_LIST)") $(if $(Package/$(1)/install-overlay),mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/rootfs-overlay) $(call Package/$(1)/install-overlay,$$(IDIR_$(1))/rootfs-overlay) -find $$(IDIR_$(1)) -name 'CVS' -o -name '.svn' -o -name '.#*' -o -name '*~'| $(XARGS) rm -rf diff --git a/include/package.mk b/include/package.mk index 0f1dd5cc50..d38d52908e 100644 --- a/include/package.mk +++ b/include/package.mk @@ -178,7 +178,6 @@ Build/Exports=$(Build/Exports/Default) define Build/CoreTargets STAMP_PREPARED:=$$(STAMP_PREPARED) STAMP_CONFIGURED:=$$(STAMP_CONFIGURED) - PKG_ABI_VERSION:=$$(PKG_ABI_VERSION) $(if $(QUILT),$(Build/Quilt)) $(call Build/Autoclean) @@ -237,7 +236,6 @@ define Build/CoreTargets "$(STAGING_DIR)/packages/$(STAGING_FILES_LIST)" \ "$(STAGING_DIR)"; \ fi - $(if $(PKG_ABI_VERSION),$(SET_ABI_VERSION) "$(PKG_ABI_VERSION)" $(TMP_DIR)/stage-$(PKG_DIR_NAME)) if [ -d $(TMP_DIR)/stage-$(PKG_DIR_NAME) ]; then \ (cd $(TMP_DIR)/stage-$(PKG_DIR_NAME); find ./ > $(TMP_DIR)/stage-$(PKG_DIR_NAME).files); \ $(call locked, \ |