rpms/zlib
6
0
Fork 0
Code Issues Pull Requests Releases Activity

fix the makefile

Browse Source
This commit is contained in:
Ivana Varekova 2010-03-30 09:08:30 +00:00
parent 44d235dea8
commit 83214f2d01
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zlib-1.2.4-autotools.patch
View File

@ -5,7 +5,7 @@ diff -up zlib-1.2.4/contrib/minizip/configure.ac.atools zlib-1.2.4/contrib/miniz
+# -*- Autoconf -*- +# -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script. +# Process this file with autoconf to produce a configure script.
+ +
+AC_INIT([minizep], [1.2.4], [bugzilla.redhat.com]) +AC_INIT([minizip], [1.2.4], [bugzilla.redhat.com])
+AC_CONFIG_SRCDIR([minigzip.c]) +AC_CONFIG_SRCDIR([minigzip.c])
+AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_MACRO_DIR([m4])
+AM_INIT_AUTOMAKE([foreign]) +AM_INIT_AUTOMAKE([foreign])
@ -18,7 +18,7 @@ diff -up zlib-1.2.4/contrib/minizip/configure.ac.atools zlib-1.2.4/contrib/miniz
diff -up zlib-1.2.4/contrib/minizip/Makefile.am.atools zlib-1.2.4/contrib/minizip/Makefile.am diff -up zlib-1.2.4/contrib/minizip/Makefile.am.atools zlib-1.2.4/contrib/minizip/Makefile.am
--- zlib-1.2.4/contrib/minizip/Makefile.am.atools 2010-03-29 10:28:50.000000000 +0200 --- zlib-1.2.4/contrib/minizip/Makefile.am.atools 2010-03-29 10:28:50.000000000 +0200
+++ zlib-1.2.4/contrib/minizip/Makefile.am 2010-03-29 10:32:11.000000000 +0200 +++ zlib-1.2.4/contrib/minizip/Makefile.am 2010-03-29 10:32:11.000000000 +0200
@@ -0,0 +1,32 @@ @@ -0,0 +1,33 @@
+ACLOCAL_AMFLAGS = -I m4 --install +ACLOCAL_AMFLAGS = -I m4 --install
+ +
+lib_LTLIBRARIES = libminizip.la +lib_LTLIBRARIES = libminizip.la
@ -32,6 +32,7 @@ diff -up zlib-1.2.4/contrib/minizip/Makefile.am.atools zlib-1.2.4/contrib/minizi
+# do not build the static version of libminizip +# do not build the static version of libminizip
+libminizip_la_CFLAGS = -shared +libminizip_la_CFLAGS = -shared
+libminizip_la_LDFLAGS = -version-info 1:0:0 +libminizip_la_LDFLAGS = -version-info 1:0:0
+LDADD=-lz
+ +
+minizip_includedir = $(includedir)/minizip +minizip_includedir = $(includedir)/minizip
+minizip_include_HEADERS = \ +minizip_include_HEADERS = \

7
zlib.spec
View File

@ -65,10 +65,13 @@ mv ChangeLog.tmp ChangeLog
%build %build
./configure --libdir=%{_libdir} --includedir=%{_includedir} --prefix=%{_prefix} ./configure --libdir=%{_libdir} --includedir=%{_includedir} --prefix=%{_prefix}
make %{?_smp_mflags} make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE64_SOURCE=1"
cd contrib/minizip cd contrib/minizip
autoreconf --install autoreconf --install
%configure %configure CPPFLAGS="-I/$RPM_BUILD_DIR/%{name}-%{version}-%{release}"
LDFLAGS="-L/$RPM_BUILD_DIR/%{name}-%{version}-%{release}"
make %{?_smp_mflags} make %{?_smp_mflags}
%check %check