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

fix autotools patch and make command

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

5
zlib-1.2.4-autotools.patch
View File

@ -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,33 @@ @@ -0,0 +1,32 @@
+ACLOCAL_AMFLAGS = -I m4 --install +ACLOCAL_AMFLAGS = -I m4 --install
+ +
+lib_LTLIBRARIES = libminizip.la +lib_LTLIBRARIES = libminizip.la
@ -31,8 +31,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 -lz
+LDADD=-lz
+ +
+minizip_includedir = $(includedir)/minizip +minizip_includedir = $(includedir)/minizip
+minizip_include_HEADERS = \ +minizip_include_HEADERS = \

4
zlib.spec
View File

@ -64,8 +64,8 @@ iconv -f windows-1252 -t utf-8 <ChangeLog >ChangeLog.tmp
mv ChangeLog.tmp ChangeLog mv ChangeLog.tmp ChangeLog
%build %build
./configure --libdir=%{_libdir} --includedir=%{_includedir} --prefix=%{_prefix} CFLAGS=$RPM_OPT_FLAGS ./configure --libdir=%{_libdir} --includedir=%{_includedir} --prefix=%{_prefix}
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE64_SOURCE=1" make %{?_smp_mflags}
cd contrib/minizip cd contrib/minizip
autoreconf --install autoreconf --install