uboot-mvebu: backport patch for Turris Omnia to enable LTO

[openwrt/openwrt.git] / package / libs / libubox / Makefile

diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile
index 19d91455097e70542bc31151c7139728728c69e9..22abfd4372e38b49f1049100122f1a768a0266ad 100644 (file)
--- a/package/libs/libubox/Makefile
+++ b/package/libs/libubox/Makefile
@@ -5,9 +5,9 @@ PKG_RELEASE=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/libubox.git
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/libubox.git

-PKG_MIRROR_HASH:=97dc4eba01cf2c5d6a6d0db3747e0cdc0d95cb87e51b3115272e7d3e69a8b255
-PKG_SOURCE_DATE:=2020-12-12
-PKG_SOURCE_VERSION:=357877693ca363b12e6e7e14d345639b2440cd07
+PKG_MIRROR_HASH:=a4f671d10840fd8487394335636051a6df5edf6d8854af4fcb834a590efb240a
+PKG_SOURCE_DATE:=2024-03-29
+PKG_SOURCE_VERSION:=eb9bcb64185ac155c02cc1a604692c4b00368324

 PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE))
 CMAKE_INSTALL:=1
 
 PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE))
 CMAKE_INSTALL:=1
 


@@ -67,17 +67,18 @@ define Package/libubox-lua
 endef
 
 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
 endef
 
 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include

-CMAKE_OPTIONS = \
-       -DLUAPATH=/usr/lib/lua
+CMAKE_OPTIONS += \
+       -DLUAPATH=/usr/lib/lua \
+       -DABIVERSION="$(PKG_ABI_VERSION)"

 
 define Package/libubox/install
        $(INSTALL_DIR) $(1)/lib/
 
 define Package/libubox/install
        $(INSTALL_DIR) $(1)/lib/

-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libubox.so $(1)/lib/
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libubox.so.* $(1)/lib/

 endef
 
 define Package/libblobmsg-json/install
        $(INSTALL_DIR) $(1)/lib/
 endef
 
 define Package/libblobmsg-json/install
        $(INSTALL_DIR) $(1)/lib/

-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libblobmsg_json.so $(1)/lib/
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libblobmsg_json.so.* $(1)/lib/

 endef
 
 define Package/jshn/install
 endef
 
 define Package/jshn/install


@@ -88,7 +89,7 @@ endef
 
 define Package/libjson-script/install
        $(INSTALL_DIR) $(1)/lib/
 
 define Package/libjson-script/install
        $(INSTALL_DIR) $(1)/lib/

-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libjson_script.so $(1)/lib/
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libjson_script.so.* $(1)/lib/

 endef
 
 define Package/libubox-lua/install
 endef
 
 define Package/libubox-lua/install


@@ -104,6 +105,14 @@ CMAKE_HOST_OPTIONS += \
        -DCMAKE_MACOSX_RPATH=1 \
        -DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOST}/lib" \
 
        -DCMAKE_MACOSX_RPATH=1 \
        -DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOST}/lib" \
 

+ifeq ($(HOST_OS),Darwin)
+  define Host/Install
+       $(Host/Install/Default)
+       $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/lib
+       cd "$(STAGING_DIR_HOSTPKG)/lib" && ln -sf ../../host/lib/libubox.* .
+  endef
+endif
+

 $(eval $(call BuildPackage,libubox))
 $(eval $(call BuildPackage,libblobmsg-json))
 $(eval $(call BuildPackage,jshn))
 $(eval $(call BuildPackage,libubox))
 $(eval $(call BuildPackage,libblobmsg-json))
 $(eval $(call BuildPackage,jshn))