gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-24 06:48:18 -07:00
Code Issues Projects Releases Wiki Activity

dev-libs/cryptlib: version bump

Browse Source 
Package-Manager: portage-2.3.3
This commit is contained in:
Alon Bar-Lev
2017-02-03 22:12:44 +02:00
parent 565606e9e2
commit db2b900503
4 changed files with 219 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
dev-libs/cryptlib/files/cryptlib-3.4.3.1-build.patch Normal file
View File

@@ -0,0 +1,26 @@
From a65e87b8dbc48411b7fcade37612cf6e35be9865 Mon Sep 17 00:00:00 2001
From: Alon Bar-Lev <alon.barlev@gmail.com>
Date: Fri, 3 Feb 2017 21:54:54 +0200
Subject: [PATCH] build: use ldflags
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
---
tools/buildsharedlib.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/buildsharedlib.sh b/tools/buildsharedlib.sh
index 9a23592..c90dbc1 100644
--- a/tools/buildsharedlib.sh
+++ b/tools/buildsharedlib.sh
@@ -86,7 +86,7 @@ shift
if [ "$($LD -v 2>&1 | grep -c gcc)" -gt 0 ] ; then
LD_IS_GCC=1 ;
- LDFLAGS="-shared -Wl,-soname,libcl.so.$VERS" ;
+ LDFLAGS="-shared -Wl,-soname,libcl.so.$VERS $LDFLAGS" ;
fi
# Create the response file to hold the link command
--
2.10.2

55
dev-libs/cryptlib/files/cryptlib-3.4.3.1-zlib.patch Normal file
View File

@@ -0,0 +1,55 @@
From 3a3a469d226b6da69b583516b982135af4bb2718 Mon Sep 17 00:00:00 2001
From: Alon Bar-Lev <alon.barlev@gmail.com>
Date: Fri, 3 Feb 2017 21:41:40 +0200
Subject: [PATCH] build: use system zlib
this should be a toggle of build system not hard coded.
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
---
envelope/envelope.h | 6 +-----
makefile | 4 ++--
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/envelope/envelope.h b/envelope/envelope.h
index e0e0c3e..90a8267 100644
--- a/envelope/envelope.h
+++ b/envelope/envelope.h
@@ -17,11 +17,7 @@
#endif /* Compiler-specific includes */
#endif /* _STREAM_DEFINED */
#ifdef USE_COMPRESSION
- #if defined( INC_ALL )
- #include "zlib.h"
- #else
- #include "zlib/zlib.h"
- #endif /* Compiler-specific includes */
+ #include <zlib.h>
#endif /* USE_COMPRESSION */
/****************************************************************************
diff --git a/makefile b/makefile
index 14c0b8f..cb9884c 100644
--- a/makefile
+++ b/makefile
@@ -283,7 +283,7 @@ ZLIBOBJS = $(OBJPATH)adler32.o $(OBJPATH)deflate.o $(OBJPATH)inffast.o \
OBJS = $(BNOBJS) $(CERTOBJS) $(CRYPTOBJS) $(CTXOBJS) $(DEVOBJS) \
$(ENCDECOBJS) $(ENVOBJS) $(HASHOBJS) $(IOOBJS) $(KEYSETOBJS) \
$(KRNLOBJS) $(LIBOBJS) $(MECHOBJS) $(MISCOBJS) $(SESSOBJS) \
- $(ZLIBOBJS) $(OSOBJS)
+ $(OSOBJS)
# Object files for the self-test code
@@ -1486,7 +1486,7 @@ $(LIBNAME): $(OBJS) $(EXTRAOBJS) $(TESTOBJS)
$(SLIBNAME): $(OBJS) $(EXTRAOBJS) $(TESTOBJS)
@./tools/buildsharedlib.sh $(OSNAME) $(SLIBNAME) $(LD) \
- $(STRIP) $(MAJ).$(MIN) $(OBJS) $(EXTRAOBJS)
+ $(STRIP) $(MAJ).$(MIN) $(OBJS) $(EXTRAOBJS) -lz
$(DYLIBNAME): $(OBJS) $(EXTRAOBJS) $(TESTOBJS)
@$(LD) -dynamiclib -compatibility_version $(MAJ).$(MIN) \
--
2.10.2