Link all used libraries to libisc

Library should link all required libraries. Link all used libraries
directly to libisc. Should help with dynamic linking of -lisc alone.
This commit is contained in:
Petr Menšík 2020-04-01 19:56:12 +02:00
parent fcefdeb129
commit 29036faad7
2 changed files with 33 additions and 1 deletions

View File

@ -0,0 +1,27 @@
From 5ee0a7ace7588b986f41ac68f51b315fece69094 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Wed, 1 Apr 2020 14:28:42 +0200
Subject: [PATCH] Link all required libraries to libisc
It would fail to link -lisc without additional libraries, which should
not be required.
---
lib/isc/Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in
index 1b6b4466cd..e9df8d1e17 100644
--- a/lib/isc/Makefile.in
+++ b/lib/isc/Makefile.in
@@ -81,7 +81,7 @@ SRCS = pk11.c pk11_result.c \
symtab.c task.c taskpool.c timer.c \
tm.c version.c
-LIBS = ${OPENSSL_LIBS} @LIBS@
+LIBS = ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} ${ZLIB_LIBS} @LIBS@
# Note: the order of SUBDIRS is important.
# Attempt to disable parallel processing.
--
2.21.1

View File

@ -68,7 +68,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
Name: bind
License: MPLv2.0
Version: 9.16.1
Release: 1%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
Release: 2%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
Epoch: 32
Url: https://www.isc.org/downloads/bind/
#
@ -138,6 +138,7 @@ Patch164:bind-9.11-rh1666814.patch
Patch170:bind-9.11-feature-test-named.patch
Patch171:bind-9.11-tests-variants.patch
Patch172:bind-9.11-tests-pkcs11.patch
Patch173:bind-9.16-libisc-link.patch
# SDB patches
Patch12: bind-9.10-sdb.patch
@ -486,6 +487,7 @@ This package provides a module which allows commands to be sent to rndc directly
%patch170 -p1 -b .featuretest-named
%patch171 -p1 -b .test-variant
%patch172 -p1 -b .test-pkcs11
%patch173 -p1 -b .link-isc
%if %{with PKCS11}
%patch135 -p1 -b .config-pkcs11
@ -1373,6 +1375,9 @@ fi;
%changelog
* Wed Apr 01 2020 Petr Menšík <pemensik@redhat.com> - 32:9.16.1-2
- Link all used libraries to libisc
* Thu Mar 26 2020 Petr Menšík <pemensik@redhat.com> - 32:9.16.1-1
- Update to 9.16.1