diff options
| author | John Marino <marino@FreeBSD.org> | 2015-03-24 17:09:58 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2015-03-24 17:09:58 +0000 |
| commit | 28ca5b96a23102bc508dd441fedf3cdf3eef313f (patch) | |
| tree | 8bff0e951ded629b0a9a867dfad08db840b0458a /benchmarks/libmicro | |
| parent | c0b425947d651ac5423ebe86942c88c6a64dc35a (diff) | |
| download | ports-28ca5b96a23102bc508dd441fedf3cdf3eef313f.tar.gz ports-28ca5b96a23102bc508dd441fedf3cdf3eef313f.zip | |
5 ports categories: Remove $PTHREAD_LIBS
Categories: irc, x11-clocks, benchmarks, misc, textproc
approved by: PTHREAD blanket
Notes
Notes:
svn path=/head/; revision=382126
Diffstat (limited to 'benchmarks/libmicro')
| -rw-r--r-- | benchmarks/libmicro/Makefile | 14 | ||||
| -rw-r--r-- | benchmarks/libmicro/files/patch-Makefile.com | 23 |
2 files changed, 12 insertions, 25 deletions
diff --git a/benchmarks/libmicro/Makefile b/benchmarks/libmicro/Makefile index a5fa7100a3e1..ba9c649f7636 100644 --- a/benchmarks/libmicro/Makefile +++ b/benchmarks/libmicro/Makefile @@ -12,22 +12,16 @@ COMMENT= Set of utilities to benchmark productivity of system calls LICENSE= CDDL -WRKSRC= ${WRKDIR}/libMicro-${PORTVERSION} - USES= gmake -MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" - -CFLAGS+= ${PTHREAD_CFLAGS} - +WRKSRC= ${WRKDIR}/libMicro-${PORTVERSION} STRIP= # Do not strip binaries - PLIST_SUB= ARCH="${ARCH}" - PKGLIBDIR= ${PREFIX}/lib/${PORTNAME} post-build: - @${ECHO_CMD} '#!/bin/sh' > ${WRKDIR}/libmicro-bench - @${ECHO_CMD} '(cd ${PKGLIBDIR} && ./bench $$1)' >> ${WRKDIR}/libmicro-bench.sh + ${ECHO_CMD} '#!/bin/sh' > ${WRKDIR}/libmicro-bench + ${ECHO_CMD} '(cd ${PKGLIBDIR} && ./bench $$1)' \ + >> ${WRKDIR}/libmicro-bench.sh do-install: (cd ${WRKDIR} && ${INSTALL_SCRIPT} libmicro-bench.sh \ diff --git a/benchmarks/libmicro/files/patch-Makefile.com b/benchmarks/libmicro/files/patch-Makefile.com index 7ba3944755e7..759b1be09499 100644 --- a/benchmarks/libmicro/files/patch-Makefile.com +++ b/benchmarks/libmicro/files/patch-Makefile.com @@ -1,6 +1,6 @@ ---- Makefile.com.orig Sat Aug 6 14:02:15 2005 -+++ Makefile.com Sat Aug 6 14:05:15 2005 -@@ -44,7 +44,7 @@ +--- Makefile.com.orig 2011-05-11 00:58:23 UTC ++++ Makefile.com +@@ -42,7 +42,7 @@ COMPILER_VERSION_CMD_cc=cc -V 2>&1 | egr COMPILER_VERSION_CMD_gcc=gcc -dumpversion COMPILER_VERSION_CMD=$(COMPILER_VERSION_CMD_$(CC)) @@ -9,32 +9,25 @@ cstyle: for file in $(ALL:%=../%.c) $(EXTRA_CFILES:%=../%) ; \ -@@ -56,10 +56,10 @@ +@@ -54,10 +54,10 @@ lint: libmicro.ln $(ALL:%=%.lint) $(EXTR $(EXTRA_CFILES:%.c=%.lint): - $(LINT) ../$(@:%.lint=%.c) -I. -mu -lc libmicro.ln -lm -+ $(LINT) ../$(@:%.lint=%.c) -I. -mu -lc libmicro.ln -lm $(PTHREAD_LIBS) ++ $(LINT) ../$(@:%.lint=%.c) -I. -mu -lc libmicro.ln -lm -lpthread %.lint: ../%.c libmicro.ln - $(LINT) -mu $(CPPFLAGS) $< libmicro.ln -lpthread -lsocket -lnsl -lm -+ $(LINT) -mu $(CPPFLAGS) $< libmicro.ln -lm $(PTHREAD_LIBS) ++ $(LINT) -mu $(CPPFLAGS) $< libmicro.ln -lpthread -lm %.o: ../%.c $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ -@@ -109,13 +109,13 @@ +@@ -107,7 +107,7 @@ tattle: ../tattle.c libmicro.a echo "char * compiler_version = \""`$(COMPILER_VERSION_CMD)`"\";" > tattle.h echo "char * CC = \""$(CC)"\";" >> tattle.h echo "char * extra_compiler_flags = \""$(extra_CFLAGS)"\";" >> tattle.h - $(CC) -o tattle $(CFLAGS) -I. ../tattle.c libmicro.a -lrt -lm -+ $(CC) -o tattle $(CFLAGS) -I. ../tattle.c libmicro.a -lm $(PTHREAD_LIBS) ++ $(CC) -o tattle $(CFLAGS) -I. ../tattle.c libmicro.a -lpthread -lm $(ELIDED_BENCHMARKS): ../elided.c $(CC) -o $(@) ../elided.c - - %: libmicro.a %.o -- $(CC) -o $(@) $(@).o $($(@)_EXTRA_DEPS) $(CFLAGS) libmicro.a $($(@)_EXTRA_LIBS) $(EXTRA_LIBS) -lpthread -lm -+ $(CC) -o $(@) $(@).o $($(@)_EXTRA_DEPS) $(CFLAGS) libmicro.a $($(@)_EXTRA_LIBS) $(EXTRA_LIBS) -lm $(PTHREAD_LIBS) - - exec: exec_bin - |