Merge pull request #120 from alorbach/pr-issue-116b

Final Fix for librdkafka dependency
rsyslog · Nov 14, 2022 · 3e900b4 · 3e900b4
2 parents 76e2e61 + 36a46f3
commit 3e900b4
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 5 deletions.
diff --git a/etc-mock/epel-6-i386.cfg b/etc-mock/epel-6-i386.cfg
@@ -11,6 +11,9 @@ config_opts['package_manager'] = 'yum'
 #config_opts['yum_command'] = '/usr/bin/yum-deprecated'
 #config_opts['package_manager'] = 'dnf'
 
+config_opts['rpmbuild_networking'] = True
+config_opts['use_host_resolv'] = True
+
 config_opts['yum.conf'] = """
 [main]
 keepcache=1

diff --git a/etc-mock/epel-6-x86_64.cfg b/etc-mock/epel-6-x86_64.cfg
@@ -11,6 +11,9 @@ config_opts['package_manager'] = 'yum'
 #config_opts['yum_command'] = '/usr/bin/yum-deprecated'
 #config_opts['package_manager'] = 'dnf'
 
+config_opts['rpmbuild_networking'] = True
+config_opts['use_host_resolv'] = True
+
 config_opts['yum.conf'] = """
 [main]
 keepcache=1

diff --git a/etc-mock/epel-7-x86_64.cfg b/etc-mock/epel-7-x86_64.cfg
@@ -9,8 +9,10 @@ config_opts['bootstrap_image'] = 'quay.io/centos/centos:7'
 config_opts['package_manager'] = 'yum'
 config_opts['description'] = 'CentOS 7'
 
-config_opts['yum_install_command'] += "{% if target_arch in ['x86_64', 'ppc64le', 'aarch64'] %} --disablerepo=centos-sclo*{% endif %}"
+config_opts['rpmbuild_networking'] = True
+config_opts['use_host_resolv'] = True
 
+config_opts['yum_install_command'] += "{% if target_arch in ['x86_64', 'ppc64le', 'aarch64'] %} --disablerepo=centos-sclo*{% endif %}"
 config_opts['yum.conf'] = """
 [main]
 keepcache=1

diff --git a/etc-mock/epel-8-x86_64.cfg b/etc-mock/epel-8-x86_64.cfg
@@ -9,6 +9,9 @@ config_opts['package_manager'] = 'dnf'
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['bootstrap_image'] = 'quay.io/centos/centos:8'
 
+config_opts['rpmbuild_networking'] = True
+config_opts['use_host_resolv'] = True
+
 config_opts['dnf.conf'] = """
 [main]
 keepcache=1

diff --git a/etc-mock/epel-9-x86_64.cfg b/etc-mock/epel-9-x86_64.cfg
@@ -8,9 +8,11 @@ config_opts['releasever'] = '9'
 config_opts['package_manager'] = 'dnf'
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['description'] = 'CentOS Stream 9'
-
 config_opts['bootstrap_image'] = 'quay.io/centos/centos:stream9'
 
+config_opts['rpmbuild_networking'] = True
+config_opts['use_host_resolv'] = True
+
 config_opts['dnf.conf'] = """
 [main]
 keepcache=1

diff --git a/etc-mock/rhel-7-x86_64.cfg b/etc-mock/rhel-7-x86_64.cfg
@@ -2,9 +2,11 @@ include('templates/rhel-7.tpl')
 
 config_opts['target_arch'] = 'x86_64'
 config_opts['legal_host_arches'] = ('x86_64',)
-
 config_opts['rhel_product'] = 'server'
 
+config_opts['rpmbuild_networking'] = True
+config_opts['use_host_resolv'] = True
+
 config_opts['yum.conf'] += """
 [adiscon]
 name=adiscon

diff --git a/etc-mock/rhel-8-x86_64.cfg b/etc-mock/rhel-8-x86_64.cfg
@@ -3,6 +3,9 @@ include('templates/rhel-8.tpl')
 config_opts['target_arch'] = 'x86_64'
 config_opts['legal_host_arches'] = ('x86_64',)
 
+config_opts['rpmbuild_networking'] = True
+config_opts['use_host_resolv'] = True
+
 config_opts['dnf.conf'] += """
 [adiscon]
 name=adiscon

diff --git a/etc-mock/rhel-9-x86_64.cfg b/etc-mock/rhel-9-x86_64.cfg
@@ -3,6 +3,9 @@ include('templates/rhel-9.tpl')
 config_opts['target_arch'] = 'x86_64'
 config_opts['legal_host_arches'] = ('x86_64',)
 
+config_opts['rpmbuild_networking'] = True
+config_opts['use_host_resolv'] = True
+
 config_opts['dnf.conf'] += """
 [adiscon]
 name=adiscon

diff --git a/rpmbuild/SOURCES/adisconbuild-librdkafka-1.9.2.tar.gz b/rpmbuild/SOURCES/adisconbuild-librdkafka-1.9.2.tar.gz
diff --git a/rpmbuild/SPECS/librdkafka.spec b/rpmbuild/SPECS/librdkafka.spec
@@ -11,7 +11,7 @@ License: BSD-2-Clause
 URL:     https://github.com/edenhill/librdkafka
 Source:	 adisconbuild-librdkafka-%{version}.tar.gz
 
-BuildRequires: libtool, zlib-devel libstdc++-devel gcc >= 4.1 gcc-c++ lz4-devel
+BuildRequires: wget curl openssl-devel libcurl-devel libtool zlib-devel libstdc++-devel gcc >= 4.1 gcc-c++ cyrus-sasl-devel 
 %if %{?rhel} >= 8
 BuildRequires: python3-devel
 %else
@@ -49,7 +49,7 @@ using librdkafka.
 %prep
 %setup -q
 
-%configure --disable-hdrhistogram
+%configure --enable-static --install-deps --disable-hdrhistogram --disable-lz4-ext
 
 %build
 make