[Orbot patch] Properly skip tests when building libevent
This fixes the remaining $(top_srcdir) errors and properly generates event2/event-config.h Signed-off-by: Daniel Martí <mvdan@mvdan.cc> --- external/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/external/Makefile b/external/Makefile index bce8d83..7a9f637 100644 --- a/external/Makefile +++ b/external/Makefile @@ -116,6 +116,8 @@ openssl-clean: # libevent libevent/Makefile: + sed -i 's@\(SUBDIRS = . include\) sample test@\1@' libevent/Makefile.am + sed -i 's@\(AC_OUTPUT(Makefile include/Makefile\) test/Makefile sample/Makefile)@\1)@' libevent/configure.in cd libevent && ./autogen.sh cp config.sub libevent cp config.guess libevent @@ -126,7 +128,7 @@ libevent/Makefile: --disable-shared libevent-build-stamp: libevent/Makefile - $(MAKE) -C libevent all-am + $(MAKE) -C libevent ./include/event2/event-config.h all-am touch libevent-build-stamp libevent: openssl libevent-build-stamp -- Daniel Martí - mvdan@mvdan.cc - http://mvdan.cc/ PGP: A9DA 13CD F7A1 4ACD D3DE E530 F4CA FFDB 4348 041C
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 03/27/2014 12:30 PM, Daniel Martí wrote:
This fixes the remaining $(top_srcdir) errors and properly generates event2/event-config.h
Thanks. Will review and integrate shortly. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJTNGK/AAoJEKgBGD5ps3qptqUP/3Mug+D5pfEY7Iu9HF7QsSYj VypvUWhpwdN6cAqznG/9XJSfe686OI/lgbF3jItWYAIwseRufiYxkRQvyR5ANBqs 9r04j55rirzZDxMX3sIdYIUx3mnjTR3nM2qMBshheEcJMiA69TCiH/TQx6BZCigR RoMuh05m9zAKJAqWuGeuNAx+9RfF2RzMo0TEcweJmOY5QRu6ARSlBFESRSAtYm3M NAAFgmZbOFFLwPec+2V2dNTOXVHpGj4OR+J67EjS3PUDmej+QBVoHWbGil0/3/Na do4JF1XsOrCju05asHzk96fN2pPiOuCQ00Yx3uEPrXe7T5vyIei0becBo8VLFxBD Ub7bL77gG9cIlIno1O/dc+4fkURBZHhOSz1GhXtv/Ca1v+cHT0ge7IqU+Ap0oh7x nSFfnmlunafMKMUFT9WaLWNmBQ32hamgtBCuFNvA2cLBpWZLZGWRAjWIjosxGpEY MNfxZKRHkjATm5pvPrjgh7zqyVH537+0IYbSU0TwQRaNZAn7o+NvkuNOoimupjVF ud9f8A1QGYyfANQVi1IdOXPDks/t8RaAV4PiXqT8Ei/OCe1s6hBMFY4cSf5iIQDh Ac98A3W8VXl641+cT6VndoJeAwOXcFwJqEPs8NsnpUnUneAf51rQX5dx68xdpHh0 DxH0/mt4HLKu+d0L0u5e =8z1N -----END PGP SIGNATURE-----
On Thu, Mar 27, 2014 at 13:41:21 -0400, Nathan Freitas wrote:
On 03/27/2014 12:30 PM, Daniel Martí wrote:
This fixes the remaining $(top_srcdir) errors and properly generates event2/event-config.h
Thanks. Will review and integrate shortly.
Great, thanks! Make sure to clean and reset the submodules completely, since your chaning of the target 'all' for 'all-am' on libevent should have definitely broken your build. It didn't, so I'm thinking that your external/libevent/include/event2/event-config.h was kept there between test builds. -- Daniel Martí - mvdan@mvdan.cc - http://mvdan.cc/ PGP: A9DA 13CD F7A1 4ACD D3DE E530 F4CA FFDB 4348 041C
participants (2)
-
Daniel Martí -
Nathan Freitas