Module Name:    src
Committed By:   mrg
Date:           Mon Jun  8 15:39:44 UTC 2009

Added Files:
        src/compat/crypto/external/bsd/netpgp/lib: Makefile
        src/compat/crypto/external/lib: Makefile

Log Message:
fix PR/41557: fix src/compat build for 64 bit platforms by building
the 32 bit netpgp lib.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/compat/crypto/external/bsd/netpgp/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/compat/crypto/external/lib/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/compat/crypto/external/bsd/netpgp/lib/Makefile
diff -u /dev/null src/compat/crypto/external/bsd/netpgp/lib/Makefile:1.1
--- /dev/null	Mon Jun  8 15:39:44 2009
+++ src/compat/crypto/external/bsd/netpgp/lib/Makefile	Mon Jun  8 15:39:43 2009
@@ -0,0 +1,37 @@
+#	$NetBSD: Makefile,v 1.1 2009/06/08 15:39:43 mrg Exp $
+
+NOLINT= # defined
+NOMAN=	# defined
+NONLS=	# defined
+NOINFO=	# defined
+NOSHARE=	# defined
+LIBDPLIBS=	bz2	${.CURDIR}/../../../../../../lib/libbz2 \
+		crypt	${.CURDIR}/../../../../../../lib/libcrypt \
+		z	${.CURDIR}/../../../../../../lib/libz
+
+NOCHECKVER=	# defined
+
+.include <bsd.obj.mk>
+
+# Resolve pathnames in variables.
+_RESOLVE_VARS=  CFLAGS CPPFLAGS DPADD LDADD LIBDPLIBS LIB_ROOT_DIR
+.for var in ${_RESOLVE_VARS}
+${var}:=        ${${var}}
+.endfor
+
+_CURDIR:= ${.CURDIR}
+
+.PATH: ${NETBSDSRCDIR}/crypto/external/bsd/netpgp/lib
+.CURDIR:= ${NETBSDSRCDIR}/crypto/external/bsd/netpgp/lib
+
+.include "${NETBSDSRCDIR}/compat/Makefile.compat"
+.include "${.CURDIR}/Makefile"
+
+# Resolve pathnames from "real" Makefile, and switch .CURDIR back.
+_RESOLVE_VARS=  CFLAGS CPPFLAGS DPADD LDADD ARCHDIR COMPATDIR COMPATARCHDIR LIBCDIR RPC_INCS RPC_XDIR LIBEDITDIR MODOBJDIR RUMPTOP
+.for var in ${_RESOLVE_VARS}
+${var}:=        ${${var}}
+.endfor
+
+.CURDIR:=       ${_CURDIR}
+.undef          _CURDIR

Index: src/compat/crypto/external/lib/Makefile
diff -u /dev/null src/compat/crypto/external/lib/Makefile:1.1
--- /dev/null	Mon Jun  8 15:39:44 2009
+++ src/compat/crypto/external/lib/Makefile	Mon Jun  8 15:39:44 2009
@@ -0,0 +1,12 @@
+#	$NetBSD: Makefile,v 1.1 2009/06/08 15:39:44 mrg Exp $
+
+.include <bsd.own.mk>
+
+_CURDIR:= ${.CURDIR}
+
+.include <bsd.own.mk>
+.CURDIR:=${NETBSDSRCDIR}/crypto/external/lib
+
+.include "${.CURDIR}/Makefile"
+
+.CURDIR:= ${_CURDIR}

Reply via email to