View | Details | Raw Unified | Return to bug 181733
Collapse All | Expand All

(-)security/cryptlib/files/patch-makefile (-4 / +38 lines)
Lines 1-11 Link Here
1 
--- makefile.orig	2010-11-19 04:08:54.000000000 +0100
 1 
--- makefile.orig	2010-11-19 04:08:54.000000000 +0100
2 
+++ makefile	2011-03-04 15:30:09.000000000 +0100
 2 
+++ makefile	2011-03-04 15:30:09.000000000 +0100
3 
@@ -1651,7 +1651,7 @@ FreeBSD:
 3 
@@ -324,22 +324,22 @@ ZLIB_DEP = zlib/zconf.h zlib/zlib.h zlib
4 
 # an extra character to the comparison string to avoid syntax errors.
5
6 
 default:
7 
-	@make directories
8 
-	@make toolscripts
9 
+	@$(MAKE) directories
10 
+	@$(MAKE) toolscripts
11 
 	@- if [ $(OSNAME) = 'OS/390' -a "$(_C89_CCMODE)" != "1" ] ; then \
12 
 		echo "The c89 environment variable _C89_CCMODE must be set to 1." >&2 ; \
13 
 		exit 1 ; \
14 
 	fi
15 
-	@./tools/buildall.sh $(OSNAME) $(CC) $(CFLAGS)
16 
+	@./tools/buildall.sh $(OSNAME) $(CC) $(MAKE) $(CFLAGS)
17
18 
 shared:
19 
-	@make directories
20 
-	@make toolscripts
21 
+	@$(MAKE) directories
22 
+	@$(MAKE) toolscripts
23 
 	@- if [ $(OSNAME) = 'OS/390' -a "$(_C89_CCMODE)" != "1" ] ; then \
24 
 		echo "The c89 environment variable _C89_CCMODE must be set to 1." >&2 ; \
25 
 		exit 1; \
26 
 	fi
27 
-	@./tools/buildall.sh shared $(OSNAME) $(CC) $(CFLAGS)
28 
+	@./tools/buildall.sh shared $(OSNAME) $(CC) $(MAKE) $(CFLAGS)
29
30 
 debug:
31 
 	@make directories
32 
@@ -1623,10 +1623,10 @@ BSD/OS:
33 
 FreeBSD:
4 
 	@if uname -m | grep "i[3,4,5,6]86" > /dev/null; then \
 34 
 	@if uname -m | grep "i[3,4,5,6]86" > /dev/null; then \
5 
 		./tools/buildasm.sh $(AS) $(OBJPATH) ; \
 35 
 		./tools/buildasm.sh $(AS) $(OBJPATH) ; \
6 
 		make $(DEFINES) EXTRAOBJS="$(ASMOBJS)" CFLAGS="$(CFLAGS) -DUSE_ASM \
 36 
-		make $(DEFINES) EXTRAOBJS="$(ASMOBJS)" CFLAGS="$(CFLAGS) -DUSE_ASM \
7 
-			-fomit-frame-pointer -pthread" ; \
 37 
-			-fomit-frame-pointer -pthread" ; \
8 
+			%%CFLAGS%% %%PTHREAD_CFLAGS%%" ; \
 38 
+		$(MAKE) $(DEFINES) EXTRAOBJS="$(ASMOBJS)" CFLAGS='$(CFLAGS) -DUSE_ASM \
39 
+			%%CFLAGS%% %%PTHREAD_CFLAGS%%' ; \
9 
 	else \
 40 
 	else \
10 
 		make $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer -pthread" ; \
 41 
-		make $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer -pthread" ; \
42 
+		$(MAKE) $(DEFINES) CFLAGS='$(CFLAGS) %%CFLAGS%% %%PTHREAD_CFLAGS%%' ; \
11 
 	fi
 43 
 	fi
44
45 
 NetBSD:
(-)security/cryptlib/files/patch-tools_buildall.sh (+29 lines)
Line 0 Link Here
1 
--- tools/buildall.sh~
2 
+++ tools/buildall.sh
3 
@@ -24,6 +24,8 @@ fi
4
5 
 OSNAME=$1
6 
 CC=$2
7 
+MAKE=$3
8 
+shift
9 
 shift
10 
 shift
11
12 
@@ -165,7 +167,7 @@ buildWithNativeTools()
13 
 	shift
14 
 	shift
15
16 
-	make CC=$CC CFLAGS="$* $CFLAGS -DOSVERSION=$OSVERSION" $OSNAME
17 
+	$MAKE CC=$CC CFLAGS="$* $CFLAGS -DOSVERSION=$OSVERSION" $OSNAME
18 
 	}
19
20 
 buildWithGccShared()
21 
@@ -188,7 +190,7 @@ buildWithNativeToolsShared()
22 
 	shift
23 
 	shift
24
25 
-	make TARGET=$SLIBNAME OBJPATH=$SHARED_OBJ_PATH \
26 
+	$MAKE TARGET=$SLIBNAME OBJPATH=$SHARED_OBJ_PATH \
27 
 		 CC=$CC CFLAGS="$* $CFLAGS -DOSVERSION=$OSVERSION" $OSNAME
28 
 	}
29

Return to bug 181733