Date: Sun, 1 Sep 2013 21:43:43 GMT From: Jan Beich <jbeich@tormail.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/181733: [patch] security/cryptlib: unbreak with bmake Message-ID: <201309012143.r81Lhhne024064@oldred.freebsd.org> Resent-Message-ID: <201309012150.r81Lo0Om035494@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 181733 >Category: ports >Synopsis: [patch] security/cryptlib: unbreak with bmake >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Sep 01 21:50:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Jan Beich >Release: FreeBSD 10.0-CURRENT amd64 >Organization: >Environment: bmake is default make since base@r250699 >Description: http://pb2.nyi.freebsd.org/bulk/nogcc-default/2013-08-30_22h26m46s/logs/errors/cryptlib-3.4.1.log >How-To-Repeat: >Fix: --- make_var.diff begins here --- 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 + } + --- make_var.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309012143.r81Lhhne024064>