libevent: disable sample programs to workaround static linking issue
PATCH 1/2 libevent: disable sample programs to workaround static linking issue
Fixes:
http://autobuild.buildroot.net/results/1e7/1e7027b1b87d88b4517b1b19d3a2ae54c24f2c10/
http://autobuild.buildroot.net/results/ff7/ff7e010b41e7448d15d20396e9e9bd7319dd493b/
http://autobuild.buildroot.net/results/269/269a3a76f61c65423ba703a85e94cc003fb75e4c/
Libevent/libtool gets confused by the library order when statically linking the sample programs and passes -lz before -lcrypto even though libcrypto uses zlib.
/bin/bash ./libtool --tag=CC --mode=link .. -o sample/https-client \ sample/https-client.o sample/hostcheck.o \ sample/openssl_hostname_validation.o libevent.la \ libevent_openssl.la -lssl -lcrypto -lz -lz -lcrypto
libtool: link: .. -o sample/https-client sample/https-client.o \ sample/hostcheck.o sample/openssl_hostname_validation.o \ ./.libs/libevent.a ./.libs/libevent_openssl.a \ -lssl -lz -lcrypto
../libcrypto.a(c_zlib.o): In function `zlib_stateful_expand_block':
c_zlib.c:(.text+0x30): undefined reference to `inflate'
This is most likely fixable, but as the sample programs aren't installed / used, simply skip building them to save time and work around this issue.
--- package/libevent/libevent.mk | 1 + 1 file changed, 1 insertion(+)
package/libevent/libevent.mk +1 -0
@@ -11,6 +11,7 @@ LIBEVENT_LICENSE = BSD-3c, OpenBSD LIBEVENT_LICENSE_FILES = LICENSE # For 0001-Disable-building-test-programs.patch LIBEVENT_AUTORECONF = YES +LIBEVENT_CONF_OPTS = --disable-samples define LIBEVENT_REMOVE_PYSCRIPT rm $(TARGET_DIR)/usr/bin/event_rpcgen.py
Signature · 1 line
2.11.0
PATCH 1/2 libevent: disable sample programs to workaround static linking issue
Quoted 21 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Korsgaard <[email protected]> writes:
Fixes:
http://autobuild.buildroot.net/results/1e7/1e7027b1b87d88b4517b1b19d3a2ae54c24f2c10/
http://autobuild.buildroot.net/results/ff7/ff7e010b41e7448d15d20396e9e9bd7319dd493b/
http://autobuild.buildroot.net/results/269/269a3a76f61c65423ba703a85e94cc003fb75e4c/Libevent/libtool gets confused by the library order when statically linking the sample programs and passes -lz before -lcrypto even though libcrypto uses zlib.
/bin/bash ./libtool --tag=CC --mode=link .. -o sample/https-client \ sample/https-client.o sample/hostcheck.o \ sample/openssl_hostname_validation.o libevent.la \ libevent_openssl.la -lssl -lcrypto -lz -lz -lcryptolibtool: link: .. -o sample/https-client sample/https-client.o \ sample/hostcheck.o sample/openssl_hostname_validation.o \ ./.libs/libevent.a ./.libs/libevent_openssl.a \ -lssl -lz -lcrypto
Quoted 7 lines
../libcrypto.a(c_zlib.o): In function `zlib_stateful_expand_block':
c_zlib.c:(.text+0x30): undefined reference to `inflate'This is most likely fixable, but as the sample programs aren't installed / used, simply skip building them to save time and work around this issue.
Signed-off-by Peter Korsgaard <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 2/2 libevent: drop openssl static linking workaround
In reply to Peter KorsgaardCommit f29bb169cf (libevent: fix openssl detection when statically linking) forced libevent to link against zlib when statically linking against openssl as the configure script failed to do this.
Since then libevent has been bumped, and it now uses pkg-config to figure out how to link with openssl, so ensure pkg-config is available and drop the now-unneeded workaround.
--- package/libevent/libevent.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
package/libevent/libevent.mk +1 -6
@@ -24,13 +24,8 @@ LIBEVENT_POST_INSTALL_TARGET_HOOKS += LIBEVENT_REMOVE_PYSCRIPT endif ifeq ($(BR2_PACKAGE_OPENSSL),y) -LIBEVENT_DEPENDENCIES += openssl +LIBEVENT_DEPENDENCIES += host-pkgconf openssl LIBEVENT_CONF_OPTS += --enable-openssl -# openssl needs zlib but configure forgets to link against it causing -# openssl detection to fail -ifeq ($(BR2_STATIC_LIBS),y) -LIBEVENT_CONF_ENV += OPENSSL_LIBADD='-lz' -endif else LIBEVENT_CONF_OPTS += --disable-openssl endif
Signature · 1 line
2.11.0
PATCH 2/2 libevent: drop openssl static linking workaround
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Korsgaard <[email protected]> writes:
Commit
f29bb169cf(libevent: fix openssl detection when statically linking) forced libevent to link against zlib when statically linking against openssl as the configure script failed to do this.Since then libevent has been bumped, and it now uses pkg-config to figure out how to link with openssl, so ensure pkg-config is available and drop the now-unneeded workaround.
Signed-off-by Peter Korsgaard <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard