November 2019 - tor-commits - lists.torproject.org

[tor/maint-0.4.2] configure: Remove a check that will always fail
by nickm＠torproject.org 06 Nov '19

06 Nov '19

commit 804d7c9bfc916c430dfd353f742257e4ae7b9c38 Author: teor <teor(a)torproject.org> Date: Tue Nov 5 15:48:01 2019 +1000 configure: Remove a check that will always fail And update the changes file to be more specific. Part of 32191. --- changes/ticket32191 | 4 ++-- configure.ac | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/changes/ticket32191 b/changes/ticket32191 index 65e919fe0..698832811 100644 --- a/changes/ticket32191 +++ b/changes/ticket32191 @@ -1,3 +1,3 @@ o Minor features (build system): - - force pkg-config to only use --prefix when cross-compiling. - Closes ticket 32191. + - Make pkg-config use --prefix when cross-compiling, if PKG_CONFIG_PATH + is not set. Closes ticket 32191. diff --git a/configure.ac b/configure.ac index ece831d5b..caa2d2f7c 100644 --- a/configure.ac +++ b/configure.ac @@ -40,11 +40,6 @@ fi if test "x$PKG_CONFIG_PATH" = "x" && test "x$prefix" != "xNONE" && test "$host" != "$build"; then export PKG_CONFIG_PATH=$prefix/lib/pkgconfig AC_MSG_NOTICE([set PKG_CONFIG_PATH=$PKG_CONFIG_PATH to support cross-compiling]) - if test -f "$PKG_CONFIG_PATH/libevent.pc"; then - echo "checking for $PKG_CONFIG_PATH/libevent.pc... yes" - else - AC_MSG_ERROR([$PKG_CONFIG_PATH/libevent.pc not found!]) - fi fi AC_ARG_ENABLE(openbsd-malloc,

1 0

[tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1495' into maint-0.4.2
by nickm＠torproject.org 06 Nov '19

06 Nov '19

commit 8f6dc54e3c7299a6f224ccb474d3398d42542086 Merge: c3a1e15a5 804d7c9bf Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 6 08:57:14 2019 -0500 Merge remote-tracking branch 'tor-github/pr/1495' into maint-0.4.2 changes/ticket32191 | 3 +++ configure.ac | 5 +++++ 2 files changed, 8 insertions(+)

1 0

[tor/master] force pkg-config to only use --prefix when cross-compiling
by nickm＠torproject.org 06 Nov '19

06 Nov '19

commit 2a349006b9c1feba0a29ede4838cf8f5fdc0b2e5 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Tue Oct 29 21:13:56 2019 +0100 force pkg-config to only use --prefix when cross-compiling The current pkg-config setup has no sense of whether it is cross-compiling, so it will detect things on the build system that are not present or are wrong for the host system. This forces the cross-compiling build to only look for pkg-config .pc files in --prefix. A version of this has been the setup for many years with the Android builds. Fixes #32191 Signed-off-by: Hans-Christoph Steiner <hans(a)eds.org> --- changes/ticket32191 | 3 +++ configure.ac | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/changes/ticket32191 b/changes/ticket32191 new file mode 100644 index 000000000..65e919fe0 --- /dev/null +++ b/changes/ticket32191 @@ -0,0 +1,3 @@ + o Minor features (build system): + - force pkg-config to only use --prefix when cross-compiling. + Closes ticket 32191. diff --git a/configure.ac b/configure.ac index 0e9bfe1f6..ece831d5b 100644 --- a/configure.ac +++ b/configure.ac @@ -37,6 +37,16 @@ else pkg_config_user_action="check the PKG_CONFIG_PATH environment variable" fi +if test "x$PKG_CONFIG_PATH" = "x" && test "x$prefix" != "xNONE" && test "$host" != "$build"; then + export PKG_CONFIG_PATH=$prefix/lib/pkgconfig + AC_MSG_NOTICE([set PKG_CONFIG_PATH=$PKG_CONFIG_PATH to support cross-compiling]) + if test -f "$PKG_CONFIG_PATH/libevent.pc"; then + echo "checking for $PKG_CONFIG_PATH/libevent.pc... yes" + else + AC_MSG_ERROR([$PKG_CONFIG_PATH/libevent.pc not found!]) + fi +fi + AC_ARG_ENABLE(openbsd-malloc, AS_HELP_STRING(--enable-openbsd-malloc, [use malloc code from OpenBSD. Linux only. Deprecated: see --with-malloc])) AC_ARG_ENABLE(static-openssl,

1 0

[tor/master] configure: Remove a check that will always fail
by nickm＠torproject.org 06 Nov '19

06 Nov '19

commit 804d7c9bfc916c430dfd353f742257e4ae7b9c38 Author: teor <teor(a)torproject.org> Date: Tue Nov 5 15:48:01 2019 +1000 configure: Remove a check that will always fail And update the changes file to be more specific. Part of 32191. --- changes/ticket32191 | 4 ++-- configure.ac | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/changes/ticket32191 b/changes/ticket32191 index 65e919fe0..698832811 100644 --- a/changes/ticket32191 +++ b/changes/ticket32191 @@ -1,3 +1,3 @@ o Minor features (build system): - - force pkg-config to only use --prefix when cross-compiling. - Closes ticket 32191. + - Make pkg-config use --prefix when cross-compiling, if PKG_CONFIG_PATH + is not set. Closes ticket 32191. diff --git a/configure.ac b/configure.ac index ece831d5b..caa2d2f7c 100644 --- a/configure.ac +++ b/configure.ac @@ -40,11 +40,6 @@ fi if test "x$PKG_CONFIG_PATH" = "x" && test "x$prefix" != "xNONE" && test "$host" != "$build"; then export PKG_CONFIG_PATH=$prefix/lib/pkgconfig AC_MSG_NOTICE([set PKG_CONFIG_PATH=$PKG_CONFIG_PATH to support cross-compiling]) - if test -f "$PKG_CONFIG_PATH/libevent.pc"; then - echo "checking for $PKG_CONFIG_PATH/libevent.pc... yes" - else - AC_MSG_ERROR([$PKG_CONFIG_PATH/libevent.pc not found!]) - fi fi AC_ARG_ENABLE(openbsd-malloc,

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1495' into maint-0.4.2
by nickm＠torproject.org 06 Nov '19

06 Nov '19

commit 8f6dc54e3c7299a6f224ccb474d3398d42542086 Merge: c3a1e15a5 804d7c9bf Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 6 08:57:14 2019 -0500 Merge remote-tracking branch 'tor-github/pr/1495' into maint-0.4.2 changes/ticket32191 | 3 +++ configure.ac | 5 +++++ 2 files changed, 8 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.4.2'
by nickm＠torproject.org 06 Nov '19

06 Nov '19

commit 059a5795d32cae9f5801cdc980a7abbd22996ba3 Merge: 22482fd45 8f6dc54e3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 6 08:57:21 2019 -0500 Merge branch 'maint-0.4.2' changes/ticket32191 | 3 +++ configure.ac | 5 +++++ 2 files changed, 8 insertions(+)

1 0

[tor/release-0.4.2] force pkg-config to only use --prefix when cross-compiling
by nickm＠torproject.org 06 Nov '19

06 Nov '19

commit 2a349006b9c1feba0a29ede4838cf8f5fdc0b2e5 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Tue Oct 29 21:13:56 2019 +0100 force pkg-config to only use --prefix when cross-compiling The current pkg-config setup has no sense of whether it is cross-compiling, so it will detect things on the build system that are not present or are wrong for the host system. This forces the cross-compiling build to only look for pkg-config .pc files in --prefix. A version of this has been the setup for many years with the Android builds. Fixes #32191 Signed-off-by: Hans-Christoph Steiner <hans(a)eds.org> --- changes/ticket32191 | 3 +++ configure.ac | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/changes/ticket32191 b/changes/ticket32191 new file mode 100644 index 000000000..65e919fe0 --- /dev/null +++ b/changes/ticket32191 @@ -0,0 +1,3 @@ + o Minor features (build system): + - force pkg-config to only use --prefix when cross-compiling. + Closes ticket 32191. diff --git a/configure.ac b/configure.ac index 0e9bfe1f6..ece831d5b 100644 --- a/configure.ac +++ b/configure.ac @@ -37,6 +37,16 @@ else pkg_config_user_action="check the PKG_CONFIG_PATH environment variable" fi +if test "x$PKG_CONFIG_PATH" = "x" && test "x$prefix" != "xNONE" && test "$host" != "$build"; then + export PKG_CONFIG_PATH=$prefix/lib/pkgconfig + AC_MSG_NOTICE([set PKG_CONFIG_PATH=$PKG_CONFIG_PATH to support cross-compiling]) + if test -f "$PKG_CONFIG_PATH/libevent.pc"; then + echo "checking for $PKG_CONFIG_PATH/libevent.pc... yes" + else + AC_MSG_ERROR([$PKG_CONFIG_PATH/libevent.pc not found!]) + fi +fi + AC_ARG_ENABLE(openbsd-malloc, AS_HELP_STRING(--enable-openbsd-malloc, [use malloc code from OpenBSD. Linux only. Deprecated: see --with-malloc])) AC_ARG_ENABLE(static-openssl,

1 0

[tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
by nickm＠torproject.org 06 Nov '19

06 Nov '19

commit 634fdf86ffe32a83b3a509e47ccc3d4f83085285 Merge: 3d7433cd9 8f6dc54e3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 6 08:57:21 2019 -0500 Merge branch 'maint-0.4.2' into release-0.4.2 changes/ticket32191 | 3 +++ configure.ac | 5 +++++ 2 files changed, 8 insertions(+)

1 0

[tor/release-0.4.2] configure: Remove a check that will always fail
by nickm＠torproject.org 06 Nov '19

06 Nov '19

commit 804d7c9bfc916c430dfd353f742257e4ae7b9c38 Author: teor <teor(a)torproject.org> Date: Tue Nov 5 15:48:01 2019 +1000 configure: Remove a check that will always fail And update the changes file to be more specific. Part of 32191. --- changes/ticket32191 | 4 ++-- configure.ac | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/changes/ticket32191 b/changes/ticket32191 index 65e919fe0..698832811 100644 --- a/changes/ticket32191 +++ b/changes/ticket32191 @@ -1,3 +1,3 @@ o Minor features (build system): - - force pkg-config to only use --prefix when cross-compiling. - Closes ticket 32191. + - Make pkg-config use --prefix when cross-compiling, if PKG_CONFIG_PATH + is not set. Closes ticket 32191. diff --git a/configure.ac b/configure.ac index ece831d5b..caa2d2f7c 100644 --- a/configure.ac +++ b/configure.ac @@ -40,11 +40,6 @@ fi if test "x$PKG_CONFIG_PATH" = "x" && test "x$prefix" != "xNONE" && test "$host" != "$build"; then export PKG_CONFIG_PATH=$prefix/lib/pkgconfig AC_MSG_NOTICE([set PKG_CONFIG_PATH=$PKG_CONFIG_PATH to support cross-compiling]) - if test -f "$PKG_CONFIG_PATH/libevent.pc"; then - echo "checking for $PKG_CONFIG_PATH/libevent.pc... yes" - else - AC_MSG_ERROR([$PKG_CONFIG_PATH/libevent.pc not found!]) - fi fi AC_ARG_ENABLE(openbsd-malloc,

1 0

[tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1495' into maint-0.4.2
by nickm＠torproject.org 06 Nov '19

06 Nov '19

commit 8f6dc54e3c7299a6f224ccb474d3398d42542086 Merge: c3a1e15a5 804d7c9bf Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 6 08:57:14 2019 -0500 Merge remote-tracking branch 'tor-github/pr/1495' into maint-0.4.2 changes/ticket32191 | 3 +++ configure.ac | 5 +++++ 2 files changed, 8 insertions(+)

1 0