Skip to content

Commit befae9b

Browse files
committed
Modified to be more close to ICC repo
Signed-off-by: Robin Dubey <[email protected]>
1 parent f4b4f16 commit befae9b

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

icc/zlib.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,9 @@ zutil$(OBJSUFX): $(ZLIB_DIR)/zutil.c $(ZLIB_DIR)/zlib.h
7676
#-
7777

7878
create_zlib: $(ZLIB_TAR)
79-
if [ -e $(ZLIB_DIR) ] ; then rm -r $(ZLIB_DIR) ; fi
8079
[ -n "$(EX_SUFFIX)" ] || \
8180
( cd $(ICC_ROOT) ; \
8281
tar xzf openssl_source/$(ZLIB_NAME).tar.gz ; \
83-
mkdir -p openssl_source/zlib/$(ZLIB_VER) ; \
84-
cp openssl_source/*.patch openssl_source/zlib/$(ZLIB_VER)/ 2>/dev/null || true ; \
8582
)
8683
[ -n "$(EX_SUFFIX)" ] || \
8784
( cd $(ICC_ROOT)/$(ZLIB_NAME) ; \

openssl_source/zlib/1.3.1/000_zutil.patch renamed to openssl_source/zlib/1.3.1/000_HPUX32.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff -urN zlib-1.3.1.orig/zutil.h zlib-1.3.1/zutil.h
2-
--- zlib-1.3.1.orig/zutil.h 2024-01-22 09:39:42.000000000 +1000
3-
+++ zlib-1.3.1/zutil.h 2024-01-22 12:51:00.908632154 +1000
4-
@@ -42,6 +42,11 @@ typedef unsigned short ush;
1+
diff -urN zlib-1.2.12.orig/zutil.h zlib-1.2.12/zutil.h
2+
--- zlib-1.2.12.orig/zutil.h 2022-03-28 09:39:42.000000000 +1000
3+
+++ zlib-1.2.12/zutil.h 2022-04-27 12:51:00.908632154 +1000
4+
@@ -42,6 +42,11 @@
55
typedef ush FAR ushf;
66
typedef unsigned long ulg;
77

0 commit comments

Comments
 (0)