ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-01-21 20:08:24 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Revert "libubox: use PKG_ABI_VERSION"

Browse Source 
This fixes the build on MIPS BE like ath25 and ath79 target.
We get this error message when linking libubox:
mips-openwrt-linux-musl/bin/ld: /home/hauke/openwrt/openwrt/staging_dir/target-mips_mips32_musl/usr/lib/libubox.so: unknown type [0x7000002a] section `.MIPS.abiflags'
mips-openwrt-linux-musl/bin/ld: /home/hauke/openwrt/openwrt/staging_dir/target-mips_mips32_musl/usr/lib/libubox.so: unknown type [0x7000002a] section `.MIPS.abiflags'
mips-openwrt-linux-musl/bin/ld: skipping incompatible /home/hauke/openwrt/openwrt/staging_dir/target-mips_mips32_musl/usr/lib/libubox.so when searching for -lubox

This reverts commit f421fefa8a.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: maurerr <mariusd84@gmail.com>
This commit is contained in:
Hauke Mehrtens 2021-02-15 00:13:07 +01:00 committed by maurerr
parent d32dda10d5
commit 6a04db9d51
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/libs/libubox/Makefile
View File

@ -8,7 +8,6 @@ PKG_SOURCE_URL=$(PROJECT_GIT)/project/libubox.git
PKG_MIRROR_HASH:=97dc4eba01cf2c5d6a6d0db3747e0cdc0d95cb87e51b3115272e7d3e69a8b255 PKG_MIRROR_HASH:=97dc4eba01cf2c5d6a6d0db3747e0cdc0d95cb87e51b3115272e7d3e69a8b255
PKG_SOURCE_DATE:=2020-12-12 PKG_SOURCE_DATE:=2020-12-12
PKG_SOURCE_VERSION:=357877693ca363b12e6e7e14d345639b2440cd07 PKG_SOURCE_VERSION:=357877693ca363b12e6e7e14d345639b2440cd07
PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE))
CMAKE_INSTALL:=1 CMAKE_INSTALL:=1
PKG_LICENSE:=ISC PKG_LICENSE:=ISC
@ -28,7 +27,7 @@ define Package/libubox
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=Basic utility library TITLE:=Basic utility library
ABI_VERSION:=$(PKG_ABI_VERSION) ABI_VERSION:=20201212
DEPENDS:= DEPENDS:=
endef endef
@ -36,7 +35,6 @@ define Package/libblobmsg-json
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=blobmsg <-> json conversion library TITLE:=blobmsg <-> json conversion library
ABI_VERSION:=$(PKG_ABI_VERSION)
DEPENDS:=+libjson-c +libubox DEPENDS:=+libjson-c +libubox
endef endef
@ -55,7 +53,6 @@ define Package/libjson-script
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
DEPENDS:=+libubox DEPENDS:=+libubox
ABI_VERSION:=$(PKG_ABI_VERSION)
TITLE:=Minimalistic JSON based scripting engine TITLE:=Minimalistic JSON based scripting engine
endef endef