August 2018 - tor-commits - lists.torproject.org

[tor/maint-0.3.4] Don't search for -lpthread on Windows
by nickm＠torproject.org 15 Aug '18

15 Aug '18

commit 7a570b818246ca8c8efe4b7de116804f6ebddd91 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 8 09:56:51 2018 -0400 Don't search for -lpthread on Windows If we're building for Windows, we want to use windows threads no matter what, and we don't want to link a pthread library even if it is present. Fixes bug 27081; bugfix on 1790dc67607799a in 0.1.0.1-rc. --- changes/bug27081 | 4 ++++ configure.ac | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug27081 b/changes/bug27081 new file mode 100644 index 000000000..74e0efbd2 --- /dev/null +++ b/changes/bug27081 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation, windows): + - Don't link or search for pthreads when building for Windows, even if we + are using build environment (like mingw) that provides a pthreads + library. Fixes bug 27081; bugfix on 0.1.0.1-rc. diff --git a/configure.ac b/configure.ac index d70032992..76b3f423a 100644 --- a/configure.ac +++ b/configure.ac @@ -370,8 +370,10 @@ if test "$LIBS" != "$saved_LIBS"; then have_rt=yes fi -AC_SEARCH_LIBS(pthread_create, [pthread]) -AC_SEARCH_LIBS(pthread_detach, [pthread]) +if test "$bwin32" = "false"; then + AC_SEARCH_LIBS(pthread_create, [pthread]) + AC_SEARCH_LIBS(pthread_detach, [pthread]) +fi AM_CONDITIONAL(THREADS_WIN32, test "$bwin32" = "true") AM_CONDITIONAL(THREADS_PTHREADS, test "$bwin32" = "false")

1 0

[tor/master] Don't search for -lpthread on Windows
by nickm＠torproject.org 15 Aug '18

15 Aug '18

commit 7a570b818246ca8c8efe4b7de116804f6ebddd91 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 8 09:56:51 2018 -0400 Don't search for -lpthread on Windows If we're building for Windows, we want to use windows threads no matter what, and we don't want to link a pthread library even if it is present. Fixes bug 27081; bugfix on 1790dc67607799a in 0.1.0.1-rc. --- changes/bug27081 | 4 ++++ configure.ac | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug27081 b/changes/bug27081 new file mode 100644 index 000000000..74e0efbd2 --- /dev/null +++ b/changes/bug27081 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation, windows): + - Don't link or search for pthreads when building for Windows, even if we + are using build environment (like mingw) that provides a pthreads + library. Fixes bug 27081; bugfix on 0.1.0.1-rc. diff --git a/configure.ac b/configure.ac index d70032992..76b3f423a 100644 --- a/configure.ac +++ b/configure.ac @@ -370,8 +370,10 @@ if test "$LIBS" != "$saved_LIBS"; then have_rt=yes fi -AC_SEARCH_LIBS(pthread_create, [pthread]) -AC_SEARCH_LIBS(pthread_detach, [pthread]) +if test "$bwin32" = "false"; then + AC_SEARCH_LIBS(pthread_create, [pthread]) + AC_SEARCH_LIBS(pthread_detach, [pthread]) +fi AM_CONDITIONAL(THREADS_WIN32, test "$bwin32" = "true") AM_CONDITIONAL(THREADS_PTHREADS, test "$bwin32" = "false")

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 15 Aug '18

15 Aug '18

commit 571cb2f662f1c39eb1069c12164a3dc202afb362 Merge: 6c1d2549d 0fc171a47 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 15 12:20:57 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27081 | 4 ++++ configure.ac | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 15 Aug '18

15 Aug '18

commit a26a2735b9cf9c6940d784f755f983088c333833 Merge: 8982719f6 4c355ff18 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 15 12:20:57 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27081 | 4 ++++ configure.ac | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 15 Aug '18

15 Aug '18

commit 0fc171a47be0cb3b1021816ab80ef823063ce2d1 Merge: 1868982de a26a2735b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 15 12:20:57 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27081 | 4 ++++ configure.ac | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9
by nickm＠torproject.org 15 Aug '18

15 Aug '18

commit 4c355ff18544783a5a283f7660bcdca6cf93062b Merge: fe19b40fe 7a570b818 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 15 12:20:53 2018 -0400 Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9 changes/bug27081 | 4 ++++ configure.ac | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 15 Aug '18

15 Aug '18

commit a26a2735b9cf9c6940d784f755f983088c333833 Merge: 8982719f6 4c355ff18 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 15 12:20:57 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27081 | 4 ++++ configure.ac | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 15 Aug '18

15 Aug '18

commit 571cb2f662f1c39eb1069c12164a3dc202afb362 Merge: 6c1d2549d 0fc171a47 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 15 12:20:57 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27081 | 4 ++++ configure.ac | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 15 Aug '18

15 Aug '18

commit 0fc171a47be0cb3b1021816ab80ef823063ce2d1 Merge: 1868982de a26a2735b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 15 12:20:57 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27081 | 4 ++++ configure.ac | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.3] Don't search for -lpthread on Windows
by nickm＠torproject.org 15 Aug '18

15 Aug '18

commit 7a570b818246ca8c8efe4b7de116804f6ebddd91 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 8 09:56:51 2018 -0400 Don't search for -lpthread on Windows If we're building for Windows, we want to use windows threads no matter what, and we don't want to link a pthread library even if it is present. Fixes bug 27081; bugfix on 1790dc67607799a in 0.1.0.1-rc. --- changes/bug27081 | 4 ++++ configure.ac | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug27081 b/changes/bug27081 new file mode 100644 index 000000000..74e0efbd2 --- /dev/null +++ b/changes/bug27081 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation, windows): + - Don't link or search for pthreads when building for Windows, even if we + are using build environment (like mingw) that provides a pthreads + library. Fixes bug 27081; bugfix on 0.1.0.1-rc. diff --git a/configure.ac b/configure.ac index d70032992..76b3f423a 100644 --- a/configure.ac +++ b/configure.ac @@ -370,8 +370,10 @@ if test "$LIBS" != "$saved_LIBS"; then have_rt=yes fi -AC_SEARCH_LIBS(pthread_create, [pthread]) -AC_SEARCH_LIBS(pthread_detach, [pthread]) +if test "$bwin32" = "false"; then + AC_SEARCH_LIBS(pthread_create, [pthread]) + AC_SEARCH_LIBS(pthread_detach, [pthread]) +fi AM_CONDITIONAL(THREADS_WIN32, test "$bwin32" = "true") AM_CONDITIONAL(THREADS_PTHREADS, test "$bwin32" = "false")

1 0