libpng: Revert "libpng: add symlink to debug library" as unnecessary
authorHannu Nyman <[email protected]>
Sun, 11 May 2025 06:26:03 +0000 (09:26 +0300)
committerHannu Nyman <[email protected]>
Sun, 11 May 2025 14:29:40 +0000 (17:29 +0300)
This reverts commit 5313dd9be from PR #25324 , related to #25323 and
https://github.com/openwrt/openwrt/pull/16899

The additional symlink libpng16.so -> libpng16d.so is now unnecessary as
OpenWrt main repo PR https://github.com/openwrt/openwrt/pull/18709
commit https://github.com/openwrt/openwrt/commit/703e7d2d5b58e68528cb5fadfc1185bd3904b3d9
changed the cmake build type from 'Debug' to 'RelWithDebInfo', which
causes libpng .so to be compiled with the normal name libpng16.so
(instead of the debug-styled libpng16d.so).

Signed-off-by: Hannu Nyman <[email protected]>
libs/libpng/Makefile

index 726f32fe207f4c2ffc99346c8be6a96cc936c0a3..748752faac03e05406454a3e8b425b18cc98db92 100644 (file)
@@ -46,9 +46,6 @@ CMAKE_OPTIONS += \
 
 define Build/InstallDev
        $(call Build/InstallDev/cmake,$(1))
-ifdef CONFIG_DEBUG
-       $(LN) libpng16d.so $(1)/usr/lib/libpng16.so
-endif
        $(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' $(1)/usr/bin/libpng{,16}-config
        $(SED) '/^includedir=/s|/usr|$$$${prefix}|' $(1)/usr/bin/libpng{,16}-config
        $(SED) '/^libdir=/s|/usr|$$$${prefix}|' $(1)/usr/bin/libpng{,16}-config
@@ -62,10 +59,7 @@ endef
 
 define Package/libpng/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpng16$(if $(CONFIG_DEBUG),d).so* $(1)/usr/lib/
-ifdef CONFIG_DEBUG
-       $(LN) libpng16d.so $(1)/usr/lib/libpng16.so
-endif
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpng16.so* $(1)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpng.so $(1)/usr/lib/
 endef