1
0
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2024-10-18 21:48:23 +02:00

jansson: revert ABI version bump

The soversion of the shipped libjansson.so library didn't change, so the
ABI version change is unwarranted and leads to opkg file clashes.

Also stop shipping an unversioned library symlink while we're at it as
it only needed at compile/link time and leading to file level clashes
between packages on future ABI bumps.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2022-08-09 00:08:13 +02:00
parent 1bfe42beb4
commit 737671bcce

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=jansson PKG_NAME:=jansson
PKG_VERSION:=2.14 PKG_VERSION:=2.14
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/akheron/$(PKG_NAME)/tar.gz/v$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/akheron/$(PKG_NAME)/tar.gz/v$(PKG_VERSION)?
@ -33,7 +33,7 @@ define Package/jansson
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=Jansson library TITLE:=Jansson library
URL:=http://www.digip.org/jansson/ URL:=http://www.digip.org/jansson/
ABI_VERSION:=5 ABI_VERSION:=4
endef endef
define Package/jansson/description define Package/jansson/description
@ -45,7 +45,7 @@ TARGET_LDFLAGS += -flto
define Package/jansson/install define Package/jansson/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libjansson*so* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjansson*so.* $(1)/usr/lib/
endef endef
$(eval $(call BuildPackage,jansson)) $(eval $(call BuildPackage,jansson))