Date: Tue, 19 Jun 2012 16:47:14 +0000 From: vchan@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r237954 - soc2012/vchan/gtcp/bwalex-tc-play Message-ID: <20120619164714.CED28106566C@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vchan Date: Tue Jun 19 16:47:13 2012 New Revision: 237954 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237954 Log: Saving recent changes Modified: soc2012/vchan/gtcp/bwalex-tc-play/Makefile soc2012/vchan/gtcp/bwalex-tc-play/hdr.c soc2012/vchan/gtcp/bwalex-tc-play/io.c soc2012/vchan/gtcp/bwalex-tc-play/tcplay.c soc2012/vchan/gtcp/bwalex-tc-play/tcplay.h Modified: soc2012/vchan/gtcp/bwalex-tc-play/Makefile ============================================================================== --- soc2012/vchan/gtcp/bwalex-tc-play/Makefile Tue Jun 19 15:15:35 2012 (r237953) +++ soc2012/vchan/gtcp/bwalex-tc-play/Makefile Tue Jun 19 16:47:13 2012 (r237954) @@ -1,5 +1,5 @@ -# either linux or dragonfly -SYSTEM?=linux +# either linux, dragonfly, or freebsd +SYSTEM?=freebsd # either openssl or gcrypt PBKDF_BACKEND?=openssl @@ -29,29 +29,13 @@ CFLAGS+= -O3 endif -ifeq (${SYSTEM}, linux) - CFLAGS+= -D_GNU_SOURCE - LIBS+= -lgcrypt -ldevmapper -luuid - SRCS+= crypto-gcrypt.c - OBJS+= crypto-gcrypt.o - ifeq (${PBKDF_BACKEND}, gcrypt) - SRCS+= pbkdf2-gcrypt.c - OBJS+= pbkdf2-gcrypt.o - endif - ifeq (${PBKDF_BACKEND}, openssl) - SRCS+= pbkdf2-openssl.c - OBJS+= pbkdf2-openssl.o - LIBS+= -lcrypto - endif -endif -ifeq (${SYSTEM}, dragonfly) LIBS+= -lcrypto -ldm -lprop SRCS+= crypto-dev.c OBJS+= crypto-dev.o SRCS+= pbkdf2-openssl.c OBJS+= pbkdf2-openssl.o -endif + program: $(CC) $(CFLAGS) -o tcplay main.c $(SRCS) $(LIBS) @@ -60,7 +44,8 @@ $(CC) -shared -Wl,-version-script=tcplay.map -o libtcplay.so tcplay_api.o $(OBJS) test: - gcc -O0 -g -L. -I. tcplay_api_test.c -ltcplay -lcrypto -ldm -lprop + echo $(SYSTEM) + gcc -O0 -g -L./usr/home/monty/vchan/gtcp/bwal-tc-play/ -I. tcplay_api_test.c -ltcplay -lcrypto -ldm -lprop clean: rm -f tcplay libtcplay.so tcplay.core *.o ktrace.out Modified: soc2012/vchan/gtcp/bwalex-tc-play/hdr.c ============================================================================== --- soc2012/vchan/gtcp/bwalex-tc-play/hdr.c Tue Jun 19 15:15:35 2012 (r237953) +++ soc2012/vchan/gtcp/bwalex-tc-play/hdr.c Tue Jun 19 16:47:13 2012 (r237954) @@ -28,12 +28,7 @@ */ #include <sys/types.h> - -#if defined(__DragonFly__) #include <sys/endian.h> -#elif defined(__linux__) -#include <endian.h> -#endif #include <errno.h> #include <stdio.h> #include <stdlib.h> Modified: soc2012/vchan/gtcp/bwalex-tc-play/io.c ============================================================================== --- soc2012/vchan/gtcp/bwalex-tc-play/io.c Tue Jun 19 15:15:35 2012 (r237953) +++ soc2012/vchan/gtcp/bwalex-tc-play/io.c Tue Jun 19 16:47:13 2012 (r237954) @@ -28,12 +28,7 @@ */ #include <sys/types.h> -#if defined(__DragonFly__) #include <sys/diskslice.h> -#elif defined(__linux__) -#include <linux/fs.h> -#include <sys/ioctl.h> -#endif #include <sys/uio.h> #include <sys/select.h> #include <errno.h> Modified: soc2012/vchan/gtcp/bwalex-tc-play/tcplay.c ============================================================================== --- soc2012/vchan/gtcp/bwalex-tc-play/tcplay.c Tue Jun 19 15:15:35 2012 (r237953) +++ soc2012/vchan/gtcp/bwalex-tc-play/tcplay.c Tue Jun 19 16:47:13 2012 (r237954) @@ -28,11 +28,7 @@ */ #include <sys/types.h> - -#if defined(__DragonFly__) #include <sys/param.h> -#endif - #include <stdio.h> #include <stdlib.h> #include <stdarg.h> @@ -42,13 +38,8 @@ #include <string.h> #include <err.h> #include <time.h> -#if defined(__linux__) -#include <libdevmapper.h> -#include <uuid/uuid.h> -#elif defined(__DragonFly__) #include <libdm.h> #include <uuid.h> -#endif #include "crc32.h" #include "tcplay.h" Modified: soc2012/vchan/gtcp/bwalex-tc-play/tcplay.h ============================================================================== --- soc2012/vchan/gtcp/bwalex-tc-play/tcplay.h Tue Jun 19 15:15:35 2012 (r237953) +++ soc2012/vchan/gtcp/bwalex-tc-play/tcplay.h Tue Jun 19 16:47:13 2012 (r237954) @@ -63,12 +63,7 @@ #endif #include <inttypes.h> - -#if defined(__DragonFly__) #include <uuid.h> -#elif defined(__linux__) -#include <uuid/uuid.h> -#endif struct pbkdf_prf_algo { const char *name;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120619164714.CED28106566C>