equal
deleted
inserted
replaced
66 ifeq ($(PLATFORM), solaris) |
66 ifeq ($(PLATFORM), solaris) |
67 ifneq ($(ARCH), amd64) |
67 ifneq ($(ARCH), amd64) |
68 FILES_reorder += reorder-$(ARCH) |
68 FILES_reorder += reorder-$(ARCH) |
69 endif |
69 endif |
70 endif |
70 endif |
|
71 |
|
72 # |
|
73 # Use mapfile unconditionally (even with fastdebug). |
|
74 # JDK's internal zlib is incompatible with stock zlib, because the |
|
75 # size of struct z_stream has been changed, so internal zlib |
|
76 # implementation must not be allowed to leak outside of libzip.so, |
|
77 # else you get hard to debug failures with fastdebug jdk when user |
|
78 # native code includes stock zlib. |
|
79 # |
|
80 FILES_m = mapfile-vers |
71 include $(BUILDDIR)/common/Mapfile-vers.gmk |
81 include $(BUILDDIR)/common/Mapfile-vers.gmk |
72 include $(BUILDDIR)/common/Library.gmk |
82 include $(BUILDDIR)/common/Library.gmk |
73 |
83 |
74 ifeq ($(PLATFORM), windows) |
84 ifeq ($(PLATFORM), windows) |
75 OTHER_LCF = -export:ZIP_Open -export:ZIP_Close -export:ZIP_FindEntry \ |
85 OTHER_LCF = -export:ZIP_Open -export:ZIP_Close -export:ZIP_FindEntry \ |