From 414e27ebe976c73681c5d0bff75fe1de44588a068cb28b3d65a799869c1e428f Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 21 Jul 2016 09:48:01 +0000 Subject: [PATCH] Accepting request 412520 from home:michal-m:branches:Base:System - Do link zlib and xz, as we are not building compressed modules. - Do link zlib and xz, as we are not building compressed modules. OBS-URL: https://build.opensuse.org/request/show/412520 OBS-URL: https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=109 --- kmod-testsuite.changes | 5 +++++ kmod-testsuite.spec | 15 ++------------- kmod.changes | 5 +++++ kmod.spec | 15 ++------------- 4 files changed, 14 insertions(+), 26 deletions(-) diff --git a/kmod-testsuite.changes b/kmod-testsuite.changes index 6729a2a..49d092d 100644 --- a/kmod-testsuite.changes +++ b/kmod-testsuite.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 21 09:11:25 UTC 2016 - mmarek@suse.com + +- Do link zlib and xz, as we are not building compressed modules. + ------------------------------------------------------------------- Thu Mar 31 16:53:28 UTC 2016 - normand@linux.vnet.ibm.com diff --git a/kmod-testsuite.spec b/kmod-testsuite.spec index 912988d..6f3c90e 100644 --- a/kmod-testsuite.spec +++ b/kmod-testsuite.spec @@ -46,13 +46,6 @@ BuildRequires: kernel-default-devel BuildRequires: libtool BuildRequires: pkgconfig >= 0.21 BuildRequires: xz -%if 0%{?sles_version} == 11 -BuildRequires: xz-devel >= 4.99 -BuildRequires: zlib-devel -%else -BuildRequires: pkgconfig(liblzma) >= 4.99 -BuildRequires: pkgconfig(zlib) -%endif Requires: suse-module-tools %define kdir /usr/src/linux-obj/%_target_cpu/default @@ -67,15 +60,11 @@ buildloop with the kernel. %build autoreconf -fi -export LDFLAGS="-Wl,-z,relro,-z,now" # The extra --includedir gives us the possibility to detect dependent # packages which fail to properly use pkgconfig. %configure \ -%if 0%{?sles_version} == 11 - zlib_CFLAGS=" " zlib_LIBS="-lz" \ -%endif - --with-xz \ - --with-zlib \ + --without-xz \ + --without-zlib \ --includedir="%_includedir/kmod" \ --with-rootlibdir="%_libdir" \ --bindir="%_bindir" diff --git a/kmod.changes b/kmod.changes index 317ba36..3bf99a5 100644 --- a/kmod.changes +++ b/kmod.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 21 09:11:25 UTC 2016 - mmarek@suse.com + +- Do link zlib and xz, as we are not building compressed modules. + ------------------------------------------------------------------- Fri Jun 17 15:18:29 UTC 2016 - mmarek@suse.cz diff --git a/kmod.spec b/kmod.spec index 9ca5cc2..2f9c8c5 100644 --- a/kmod.spec +++ b/kmod.spec @@ -45,13 +45,6 @@ BuildRequires: libtool BuildRequires: pkgconfig >= 0.21 BuildRequires: suse-module-tools BuildRequires: xz -%if 0%{?sles_version} == 11 -BuildRequires: xz-devel >= 4.99 -BuildRequires: zlib-devel -%else -BuildRequires: pkgconfig(liblzma) >= 4.99 -BuildRequires: pkgconfig(zlib) -%endif Requires: suse-module-tools %description @@ -107,15 +100,11 @@ in %lname. %build autoreconf -fi -export LDFLAGS="-Wl,-z,relro,-z,now" # The extra --includedir gives us the possibility to detect dependent # packages which fail to properly use pkgconfig. %configure \ -%if 0%{?sles_version} == 11 - zlib_CFLAGS=" " zlib_LIBS="-lz" \ -%endif - --with-xz \ - --with-zlib \ + --without-xz \ + --without-zlib \ --includedir="%_includedir/kmod" \ --with-rootlibdir="%_libdir" \ --bindir="%_bindir"