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
This commit is contained in:
parent
1b55364c8c
commit
414e27ebe9
@ -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
|
||||
|
||||
|
@ -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"
|
||||
|
@ -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
|
||||
|
||||
|
15
kmod.spec
15
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"
|
||||
|
Loading…
Reference in New Issue
Block a user