You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
gentoo-overlay/dev-libs/cryptlib/files/cryptlib-3.4.4_beta-build.p...

92 lines
2.9 KiB

From 515d66d1d091b444330b225127b084a9b19fa807 Mon Sep 17 00:00:00 2001
From: Alon Bar-Lev <alon.barlev@gmail.com>
Date: Thu, 31 Aug 2017 22:12:52 +0300
Subject: [PATCH 1/3] build: allow specify additional CFLAGS
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
---
makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/makefile b/makefile
index de5381f..a31bc1d 100644
--- a/makefile
+++ b/makefile
@@ -90,7 +90,7 @@ DYLIBNAME = lib$(PROJ).$(MAJ).$(MIN).dylib
# Further cc flags are gathered dynamically at runtime via the ccopts.sh
# script.
-CFLAGS = -c -D__UNIX__ -DNDEBUG -I.
+CFLAGS = -c -D__UNIX__ -DNDEBUG -I. $(EXTRA_CFLAGS)
CFLAGS_ANALYSE = -c -D__UNIX__ -I.
CFLAGS_COVERAGE = -c -D__UNIX__ -I. -ggdb3 -fno-omit-frame-pointer -O1 --coverage -fprofile-arcs -ftest-coverage
CFLAGS_DEBUG = -c -D__UNIX__ -I. -ggdb3 -fno-omit-frame-pointer -O0
--
2.13.5
From cbec0a8ab9fab9acda239d3f37b7e593ac8e44e9 Mon Sep 17 00:00:00 2001
From: Alon Bar-Lev <alon.barlev@gmail.com>
Date: Thu, 31 Aug 2017 22:14:47 +0300
Subject: [PATCH 2/3] build: install: create correct directories + quote
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
---
makefile | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/makefile b/makefile
index a31bc1d..2a49040 100644
--- a/makefile
+++ b/makefile
@@ -443,13 +443,13 @@ PATH_LIB=$(PREFIX)/lib
PATH_INCLUDE=$(PREFIX)/include
install-dirs:
- @if [ ! -d $(PATH_LIB) ] ; then \
- mkdir $(PATH_LIB) ; \
- chmod 755 $(PATH_LIB) ; \
+ @if [ ! -d "$(DESTDIR)$(PATH_LIB)" ] ; then \
+ mkdir -p "$(DESTDIR)$(PATH_LIB)" ; \
+ chmod 755 "$(DESTDIR)$(PATH_LIB)" ; \
fi
- @if [ ! -d $(PATH_INCLUDE) ] ; then \
- mkdir $(PATH_INCLUDE) ; \
- chmod 755 $(PATH_INCLUDE) ; \
+ @if [ ! -d "$(DESTDIR)$(PATH_INCLUDE)" ] ; then \
+ mkdir -p "$(DESTDIR)$(PATH_INCLUDE)" ; \
+ chmod 755 "$(DESTDIR)$(PATH_INCLUDE)" ; \
fi
install:
--
2.13.5
From 78cd16457a88e0d79a5b61d8dee29b535cd81a28 Mon Sep 17 00:00:00 2001
From: Alon Bar-Lev <alon.barlev@gmail.com>
Date: Thu, 31 Aug 2017 22:30:25 +0300
Subject: [PATCH 3/3] build: install: use relative symlinks
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
---
makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/makefile b/makefile
index 2a49040..5582252 100644
--- a/makefile
+++ b/makefile
@@ -461,8 +461,8 @@ install:
if [ -f "$(SLIBNAME)" ] ; then \
cp "$(SLIBNAME)" "$(DESTDIR)$(PATH_LIB)" ; \
chmod 755 "$(DESTDIR)$(PATH_LIB)/$(SLIBNAME)" ; \
- ln -s "$(DESTDIR)$(PATH_LIB)/$(SLIBNAME)" "$(DESTDIR)$(PATH_LIB)/lib$(PROJ).so.$(MAJ)" ; \
- ln -s "$(DESTDIR)$(PATH_LIB)/$(SLIBNAME)" "$(DESTDIR)$(PATH_LIB)/lib$(PROJ).so" ; \
+ ln -s "$(SLIBNAME)" "$(DESTDIR)$(PATH_LIB)/lib$(PROJ).so.$(MAJ)" ; \
+ ln -s "$(SLIBNAME)" "$(DESTDIR)$(PATH_LIB)/lib$(PROJ).so" ; \
fi
cp cryptlib.h "$(DESTDIR)$(PATH_INCLUDE)"
chmod 644 "$(DESTDIR)$(PATH_INCLUDE)/cryptlib.h"
--
2.13.5