gdb: Always use system zlib
authorHauke Mehrtens <hauke@hauke-m.de>
Sat, 24 Oct 2020 21:34:18 +0000 (23:34 +0200)
committerHauke Mehrtens <hauke@hauke-m.de>
Sun, 1 Nov 2020 19:54:37 +0000 (20:54 +0100)
Instead of using the system zlib when the package is selected and using
the internal zlib if it is not selected in OpenWrt, just activate it
always. This should make the package more deterministic.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
package/devel/gdb/Makefile

index 9817599558cd9e2b0683a2a8ee45dcfafc4fdc7e..50d43e9fc193c3328b01e789eae20496d44ba471 100644 (file)
@@ -25,7 +25,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/gdb/Default
   SECTION:=devel
   CATEGORY:=Development
-  DEPENDS:=+!USE_MUSL:libthread-db +PACKAGE_zlib:zlib
+  DEPENDS:=+!USE_MUSL:libthread-db +zlib
   URL:=https://www.gnu.org/software/gdb/
 endef
 
@@ -55,6 +55,7 @@ endef
 # XXX: add --disable-werror to prevent build failure with arm
 CONFIGURE_ARGS+= \
        --with-system-readline \
+       --with-system-zlib \
        --without-expat \
        --without-lzma \
        --disable-sim \