Accepting request 56541 from Base:System
Accepted submit request 56541 from user msmeissn OBS-URL: https://build.opensuse.org/request/show/56541 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zlib?expand=0&rev=22
This commit is contained in:
committed by
Git OBS Bridge
parent
d4feed683b
commit
42ec7548e8
@@ -1,7 +1,6 @@
|
||||
diff -up zlib-1.2.5/zlib.h.pom zlib-1.2.5/zlib.h
|
||||
--- zlib-1.2.5/zlib.h.pom 2010-04-20 06:12:48.000000000 +0200
|
||||
+++ zlib-1.2.5/zlib.h 2010-06-16 13:08:59.000000000 +0200
|
||||
@@ -1578,7 +1578,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF(
|
||||
--- zlib.h.orig
|
||||
+++ zlib.h
|
||||
@@ -1582,7 +1582,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF(
|
||||
# define gzoffset gzoffset64
|
||||
# define adler32_combine adler32_combine64
|
||||
# define crc32_combine crc32_combine64
|
||||
@@ -10,4 +9,19 @@ diff -up zlib-1.2.5/zlib.h.pom zlib-1.2.5/zlib.h
|
||||
ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
|
||||
ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
|
||||
ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
|
||||
|
||||
--- Makefile.in.orig
|
||||
+++ Makefile.in
|
||||
@@ -133,11 +133,11 @@ minigzip64.o: minigzip.c zlib.h zconf.h
|
||||
|
||||
.c.lo:
|
||||
-@mkdir objs 2>/dev/null || test -d objs
|
||||
- $(CC) $(SFLAGS) -DPIC -c -o objs/$*.o $<
|
||||
+ $(CC) $(SFLAGS) $(CFLAGS) -DPIC -c -o objs/$*.o $<
|
||||
-@mv objs/$*.o $@
|
||||
|
||||
$(SHAREDLIBV): $(PIC_OBJS)
|
||||
- $(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
|
||||
+ $(LDSHARED) $(SFLAGS) $(CFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
|
||||
rm -f $(SHAREDLIB) $(SHAREDLIBM)
|
||||
ln -s $@ $(SHAREDLIB)
|
||||
ln -s $@ $(SHAREDLIBM)
|
||||
|
||||
Reference in New Issue
Block a user