From 5c3a55dea7828393fe084b86a09ae393f0e40cb3 Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Thu, 26 Feb 2004 07:44:37 +0000 Subject: [PATCH] Backed out rev.1.6 and subsequent copying of it (bogus addition of -static to CFLAGS). It just turned rev.1.5 into an obfuscated no-op. As explained in the log for rev.1.5, testing should be done in the host environment but there is a problem in cross-compilation environments. As not explained in the log for rev.1.6, there was apparently a practical problem with cross-compiling (makeworld should have set -static in LDFLAGS but apparently didn't). Cross-compilation was especially complicated because the relevant programs are test programs that were run at beforeinstall time -- dynamic libraries might or might not exist depending on the build options. The complications became moot in rev.1.8 when beforeinstall was renamed "test". --- lib/libmd/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile index e1566fc84ee8..f3759eb031b2 100644 --- a/lib/libmd/Makefile +++ b/lib/libmd/Makefile @@ -148,24 +148,24 @@ rmd160.ref: test: md2.ref md4.ref md5.ref sha0.ref rmd160.ref sha1.ref @${ECHO} if any of these test fail, the code produces wrong results @${ECHO} and should NOT be used. - ${CC} -static ${CFLAGS} ${LDFLAGS} -DMD=2 -o mddriver ${.CURDIR}/mddriver.c -L. -lmd + ${CC} ${CFLAGS} ${LDFLAGS} -DMD=2 -o mddriver ${.CURDIR}/mddriver.c -L. -lmd ./mddriver | cmp md2.ref - @${ECHO} MD2 passed test - ${CC} -static ${CFLAGS} ${LDFLAGS} -DMD=4 -o mddriver ${.CURDIR}/mddriver.c -L. -lmd + ${CC} ${CFLAGS} ${LDFLAGS} -DMD=4 -o mddriver ${.CURDIR}/mddriver.c -L. -lmd ./mddriver | cmp md4.ref - @${ECHO} MD4 passed test - ${CC} -static ${CFLAGS} ${LDFLAGS} -DMD=5 -o mddriver ${.CURDIR}/mddriver.c -L. -lmd + ${CC} ${CFLAGS} ${LDFLAGS} -DMD=5 -o mddriver ${.CURDIR}/mddriver.c -L. -lmd ./mddriver | cmp md5.ref - @${ECHO} MD5 passed test -rm -f mddriver - ${CC} -static ${CFLAGS} ${LDFLAGS} -o rmddriver ${.CURDIR}/rmddriver.c -L. -lmd + ${CC} ${CFLAGS} ${LDFLAGS} -o rmddriver ${.CURDIR}/rmddriver.c -L. -lmd ./rmddriver | cmp rmd160.ref - @${ECHO} RIPEMD160 passed test -rm -f rmddriver - ${CC} -static ${CFLAGS} ${LDFLAGS} -DSHA=0 -o shadriver ${.CURDIR}/shadriver.c -L. -lmd + ${CC} ${CFLAGS} ${LDFLAGS} -DSHA=0 -o shadriver ${.CURDIR}/shadriver.c -L. -lmd ./shadriver | cmp sha0.ref - @${ECHO} SHA-0 passed test - ${CC} -static ${CFLAGS} ${LDFLAGS} -DSHA=1 -o shadriver ${.CURDIR}/shadriver.c -L. -lmd + ${CC} ${CFLAGS} ${LDFLAGS} -DSHA=1 -o shadriver ${.CURDIR}/shadriver.c -L. -lmd ./shadriver | cmp sha1.ref - @${ECHO} SHA-1 passed test -rm -f shadriver