Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update libgcrypt-version to 1.11.0 from 1.10.3 #7

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Update libgcrypt-version to 1.11.0 from 1.10.3 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8410db3
Update libgcrypt-version to 1.11.0 from 1.10.3
Jun 19, 2024
d9a8a30
bump version update fix
HarithaIBM Nov 15, 2024
02123b5
fixed patch issue
HarithaIBM Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildenv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# bump: libgcrypt-version /LIBGCRYPT_VERSION="(.*)"/ https://gnupg.org/ftp/gcrypt/libgcrypt/|re:/libgcrypt-([\d.]+).tar.bz2/$1/|semver:*
LIBGCRYPT_VERSION="1.10.3"
LIBGCRYPT_VERSION="1.11.0"

export ZOPEN_STABLE_URL="https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${LIBGCRYPT_VERSION}.tar.bz2"
export ZOPEN_STABLE_DEPS="make bzip2 tar curl perl automake autoconf m4 sed gettext zoslib diffutils libgpgerror"
Expand Down
19 changes: 3 additions & 16 deletions patches/Makefile.in.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,13 @@
diff --git a/cipher/Makefile.in b/cipher/Makefile.in
index 521036a..4d88280 100644
index 22358f4..3d73407 100644
--- a/cipher/Makefile.in
+++ b/cipher/Makefile.in
@@ -1410,7 +1410,7 @@ gost-sb.h: gost-s-box
@@ -1544,7 +1544,7 @@ gost-sb.h: gost-s-box$(EXEEXT_FOR_BUILD)

gost-s-box: gost-s-box.c
gost-s-box$(EXEEXT_FOR_BUILD): gost-s-box.c
$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \
- $(CPPFLAGS_FOR_BUILD) -o $@ $(srcdir)/gost-s-box.c
+ $(CPPFLAGS_FOR_BUILD) -o $@ $(srcdir)/gost-s-box.c $(LIBS)

# We need to lower the optimization for this module.
tiger.o: $(srcdir)/tiger.c Makefile
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 356c380..bb8f3e9 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -916,7 +916,7 @@ uninstall-man: uninstall-man1

yat2m: yat2m.c
$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \
- $(CPPFLAGS_FOR_BUILD) -o $@ $(srcdir)/yat2m.c
+ $(CPPFLAGS_FOR_BUILD) -o $@ $(srcdir)/yat2m.c $(LIBS)

.fig.png:
fig2dev -L png `test -f '$<' || echo '$(srcdir)/'`$< $@
12 changes: 8 additions & 4 deletions patches/g10lib.h.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
diff --git a/src/g10lib.h b/src/g10lib.h
index a7aee80..51a92f2 100644
index adf03e8..e8a3aeb 100644
--- a/src/g10lib.h
+++ b/src/g10lib.h
@@ -44,7 +44,7 @@
@@ -40,11 +40,9 @@
#include "types.h"


-
-
/* Attribute handling macros. */

-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5 )
+#if ((__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5 )) && ! defined (__MVS__))
+#if ((__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5 )) && ! defined (__MVS__))
#define JNLIB_GCC_M_FUNCTION 1
#define JNLIB_GCC_A_NR __attribute__ ((noreturn))
#define JNLIB_GCC_A_NR __attribute__ ((__noreturn__))
#define JNLIB_GCC_A_PRINTF( f, a ) __attribute__ ((format (printf,f,a)))
Loading