diff options
author | Volker Christian <me@vchrist.at> | 2023-07-08 16:04:27 +0200 |
---|---|---|
committer | Marko Ratkaj <markoratkaj@gmail.com> | 2023-07-10 14:20:00 +0200 |
commit | 5362b272cbe6124519616052bf61a6faee60cd2b (patch) | |
tree | d321e3ce96256982fc9003c38190cfb5c3cab9e5 /libs/file/Makefile | |
parent | dae4f184f77aed1aae44edea7b10a5676f014693 (diff) |
File: Fix segfault
Executables depending on binary package libmagic segfault in case
package file is not installed. Libmagic needs file
/usr/share/misc/magic to not segfault. Thus, install
/usr/share/misc/magic along with libmagic and not with file.
Signed-off-by: Volker Christian <me@vchrist.at>
Diffstat (limited to 'libs/file/Makefile')
-rw-r--r-- | libs/file/Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libs/file/Makefile b/libs/file/Makefile index 7b502bfab..25941ecce 100644 --- a/libs/file/Makefile +++ b/libs/file/Makefile @@ -82,20 +82,22 @@ define Build/InstallDev $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/magic.h $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libmagic.{a,so*} $(1)/usr/lib/ + ${INSTALL_DIR} $(1)/usr/lib/pkgconfig + $(INSTALL_DATA) $(PKG_BUILD_DIR)/libmagic.pc $(1)/usr/lib/pkgconfig/ endef define Package/file/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/file $(1)/usr/bin/ - $(INSTALL_DIR) $(1)/usr/share/misc - $(SED) "/^#/d" $(PKG_INSTALL_DIR)/usr/share/file/magic - $(SED) "/^$$$$/d" $(PKG_INSTALL_DIR)/usr/share/file/magic - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/file/magic $(1)/usr/share/misc/ endef define Package/libmagic/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmagic.so.* $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/share/misc + $(SED) "/^#/d" $(PKG_INSTALL_DIR)/usr/share/file/magic + $(SED) "/^$$$$/d" $(PKG_INSTALL_DIR)/usr/share/file/magic + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/file/magic $(1)/usr/share/misc/ endef $(eval $(call BuildPackage,file)) |