diff options
| author | martymac <martymac@FreeBSD.org> | 2012-11-29 17:22:55 +0800 |
|---|---|---|
| committer | martymac <martymac@FreeBSD.org> | 2012-11-29 17:22:55 +0800 |
| commit | c1bdd2fa9ce5c7f9e2f2ddc40ed8b806dcea9571 (patch) | |
| tree | b311c7dcd87e09d29bc51bfbebd928a9cc0b1079 /benchmarks | |
| parent | ecf9fa79e4c9fa96271dbddc8a7a2b191ba257fa (diff) | |
| download | freebsd-ports-gnome-c1bdd2fa9ce5c7f9e2f2ddc40ed8b806dcea9571.tar.gz freebsd-ports-gnome-c1bdd2fa9ce5c7f9e2f2ddc40ed8b806dcea9571.tar.zst freebsd-ports-gnome-c1bdd2fa9ce5c7f9e2f2ddc40ed8b806dcea9571.zip | |
Simplify PTHREAD_LIBS fix by removing useless patch
Suggested by: danfe
Feature safe: yes
Diffstat (limited to 'benchmarks')
| -rw-r--r-- | benchmarks/bonnie++/Makefile | 2 | ||||
| -rw-r--r-- | benchmarks/bonnie++/files/patch-configure | 23 |
2 files changed, 1 insertions, 24 deletions
diff --git a/benchmarks/bonnie++/Makefile b/benchmarks/bonnie++/Makefile index e73ba3af23ce..af61d8d1ef57 100644 --- a/benchmarks/bonnie++/Makefile +++ b/benchmarks/bonnie++/Makefile @@ -32,7 +32,7 @@ post-patch: @${REINPLACE_CMD} \ 's|/usr/share/|${PREFIX}/share/|g' ${WRKSRC}/bonnie++.8 @${REINPLACE_CMD} \ - 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' ${WRKSRC}/configure + 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure post-install: .if ${PORT_OPTIONS:MDOCS} diff --git a/benchmarks/bonnie++/files/patch-configure b/benchmarks/bonnie++/files/patch-configure deleted file mode 100644 index 8e104760e358..000000000000 --- a/benchmarks/bonnie++/files/patch-configure +++ /dev/null @@ -1,23 +0,0 @@ ---- configure.orig 2011-01-18 22:36:19.000000000 +0100 -+++ configure 2012-11-27 17:10:24.000000000 +0100 -@@ -3925,7 +3925,7 @@ - linux_pthread="#define LINUX_PTHREAD" - fi - --LDFLAGS=-lpthread -+LDFLAGS=%%PTHREAD_LIBS%% - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -@@ -3944,10 +3944,7 @@ - } - _ACEOF - if ac_fn_cxx_try_link "$LINENO"; then : -- thread_ldflags="-lpthread" -- --else -- thread_ldflags="-pthread" -+ thread_ldflags="%%PTHREAD_LIBS%%" - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext |