Attachment 136499 Details for Bug 181733 – make_var.diff

[patch] make_var.diff

make_var.diff (text/plain), 2.88 KB, created by Jan Beich on 2013-09-01 22:50:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2013-09-01 22:50:00 UTC

Size: 2.88 KB

patch

obsolete

>Index: security/cryptlib/files/patch-makefile
>===================================================================
>--- security/cryptlib/files/patch-makefile	(revision 325711)
>+++ security/cryptlib/files/patch-makefile	(working copy)
>@@ -1,11 +1,45 @@
> --- makefile.orig	2010-11-19 04:08:54.000000000 +0100
> +++ makefile	2011-03-04 15:30:09.000000000 +0100
>-@@ -1651,7 +1651,7 @@ FreeBSD:
>+@@ -324,22 +324,22 @@ ZLIB_DEP = zlib/zconf.h zlib/zlib.h zlib
>+ # an extra character to the comparison string to avoid syntax errors.
>+ 
>+ default:
>+-	@make directories
>+-	@make toolscripts
>++	@$(MAKE) directories
>++	@$(MAKE) toolscripts
>+ 	@- if [ $(OSNAME) = 'OS/390' -a "$(_C89_CCMODE)" != "1" ] ; then \
>+ 		echo "The c89 environment variable _C89_CCMODE must be set to 1." >&2 ; \
>+ 		exit 1 ; \
>+ 	fi
>+-	@./tools/buildall.sh $(OSNAME) $(CC) $(CFLAGS)
>++	@./tools/buildall.sh $(OSNAME) $(CC) $(MAKE) $(CFLAGS)
>+ 
>+ shared:
>+-	@make directories
>+-	@make toolscripts
>++	@$(MAKE) directories
>++	@$(MAKE) toolscripts
>+ 	@- if [ $(OSNAME) = 'OS/390' -a "$(_C89_CCMODE)" != "1" ] ; then \
>+ 		echo "The c89 environment variable _C89_CCMODE must be set to 1." >&2 ; \
>+ 		exit 1; \
>+ 	fi
>+-	@./tools/buildall.sh shared $(OSNAME) $(CC) $(CFLAGS)
>++	@./tools/buildall.sh shared $(OSNAME) $(CC) $(MAKE) $(CFLAGS)
>+ 
>+ debug:
>+ 	@make directories
>+@@ -1623,10 +1623,10 @@ BSD/OS:
>+ FreeBSD:
>  	@if uname -m | grep "i[3,4,5,6]86" > /dev/null; then \
>  		./tools/buildasm.sh $(AS) $(OBJPATH) ; \
>- 		make $(DEFINES) EXTRAOBJS="$(ASMOBJS)" CFLAGS="$(CFLAGS) -DUSE_ASM \
>+-		make $(DEFINES) EXTRAOBJS="$(ASMOBJS)" CFLAGS="$(CFLAGS) -DUSE_ASM \
> -			-fomit-frame-pointer -pthread" ; \
>-+			%%CFLAGS%% %%PTHREAD_CFLAGS%%" ; \
>++		$(MAKE) $(DEFINES) EXTRAOBJS="$(ASMOBJS)" CFLAGS='$(CFLAGS) -DUSE_ASM \
>++			%%CFLAGS%% %%PTHREAD_CFLAGS%%' ; \
>  	else \
>- 		make $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer -pthread" ; \
>+-		make $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer -pthread" ; \
>++		$(MAKE) $(DEFINES) CFLAGS='$(CFLAGS) %%CFLAGS%% %%PTHREAD_CFLAGS%%' ; \
>  	fi
>+ 
>+ NetBSD:
>Index: security/cryptlib/files/patch-tools_buildall.sh
>===================================================================
>--- security/cryptlib/files/patch-tools_buildall.sh	(revision 0)
>+++ security/cryptlib/files/patch-tools_buildall.sh	(working copy)
>@@ -0,0 +1,29 @@
>+--- tools/buildall.sh~
>++++ tools/buildall.sh
>+@@ -24,6 +24,8 @@ fi
>+ 
>+ OSNAME=$1
>+ CC=$2
>++MAKE=$3
>++shift
>+ shift
>+ shift
>+ 
>+@@ -165,7 +167,7 @@ buildWithNativeTools()
>+ 	shift
>+ 	shift
>+ 
>+-	make CC=$CC CFLAGS="$* $CFLAGS -DOSVERSION=$OSVERSION" $OSNAME
>++	$MAKE CC=$CC CFLAGS="$* $CFLAGS -DOSVERSION=$OSVERSION" $OSNAME
>+ 	}
>+ 
>+ buildWithGccShared()
>+@@ -188,7 +190,7 @@ buildWithNativeToolsShared()
>+ 	shift
>+ 	shift
>+ 
>+-	make TARGET=$SLIBNAME OBJPATH=$SHARED_OBJ_PATH \
>++	$MAKE TARGET=$SLIBNAME OBJPATH=$SHARED_OBJ_PATH \
>+ 		 CC=$CC CFLAGS="$* $CFLAGS -DOSVERSION=$OSVERSION" $OSNAME
>+ 	}
>+

Actions: View | Diff

Attachments on bug 181733: 136499