NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
cd56896b45
kumquat-buildroot/package/libwebsock/0002-fix-ssl.patch

22 lines
779 B
Diff
Raw Normal View History

package/libwebsock: allow building without SSL libwebsock can optionally use SL, and defaults to using it without checking for its presence first. Just disable SSL support if openssl is not enabled, and ensure it is built before libwebsock if it is enabled. Add a patch to fix SSL conditional build. Fixes: http://autobuild.buildroot.org/results/2c4/2c49e45667aaf2f2a59ace94885b9d4ed98038d7/ http://autobuild.buildroot.org/results/517/517bc814732f86dc6dd1a5c91148ce52ec9803f7/ http://autobuild.buildroot.org/results/951/95109c7e37aa21228bc71c69e9c66a6821f3174a/ ... Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Gregory Dymarek <gregd72002@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-01-04 12:07:42 +01:00
config: fix SSL detection
libwebsock: Fix openssl reporting in header The websock_config.h file currently ends up being installed into the sysroot with a #include "config.h" line but the config.h file does not get copied into the sysroot. Refactoring the original patch to have the configure script properly report whether or not SSL support is enabled without using the config.h file. Patch has been submitted upstream but may never be merged since upstream appears to be dead. https://github.com/payden/libwebsock/pull/38 Signed-off-by: Clayton Shotwell <clayton.shotwell@rockwellcollins.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2019-01-25 21:35:04 +01:00
The @WEBSOCK_HAVE_SSL@ is replaced at configure time with either a 1 or 0.
The rest of the code is simply checking to see if WEBSOCK_HAVE_SSL is
defined at all. Using a #undef WEBSOCK_HAVE_SSL will cause configure
to either comment it out or change the line to
"#define WEBSOCK_HAVE_SSL 1".
package/libwebsock: allow building without SSL libwebsock can optionally use SL, and defaults to using it without checking for its presence first. Just disable SSL support if openssl is not enabled, and ensure it is built before libwebsock if it is enabled. Add a patch to fix SSL conditional build. Fixes: http://autobuild.buildroot.org/results/2c4/2c49e45667aaf2f2a59ace94885b9d4ed98038d7/ http://autobuild.buildroot.org/results/517/517bc814732f86dc6dd1a5c91148ce52ec9803f7/ http://autobuild.buildroot.org/results/951/95109c7e37aa21228bc71c69e9c66a6821f3174a/ ... Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Gregory Dymarek <gregd72002@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-01-04 12:07:42 +01:00
libwebsock: Fix openssl reporting in header The websock_config.h file currently ends up being installed into the sysroot with a #include "config.h" line but the config.h file does not get copied into the sysroot. Refactoring the original patch to have the configure script properly report whether or not SSL support is enabled without using the config.h file. Patch has been submitted upstream but may never be merged since upstream appears to be dead. https://github.com/payden/libwebsock/pull/38 Signed-off-by: Clayton Shotwell <clayton.shotwell@rockwellcollins.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2019-01-25 21:35:04 +01:00
Signed-off-by: Clayton Shotwell <clayton.shotwell@rockwellcollins.com>
package/libwebsock: allow building without SSL libwebsock can optionally use SL, and defaults to using it without checking for its presence first. Just disable SSL support if openssl is not enabled, and ensure it is built before libwebsock if it is enabled. Add a patch to fix SSL conditional build. Fixes: http://autobuild.buildroot.org/results/2c4/2c49e45667aaf2f2a59ace94885b9d4ed98038d7/ http://autobuild.buildroot.org/results/517/517bc814732f86dc6dd1a5c91148ce52ec9803f7/ http://autobuild.buildroot.org/results/951/95109c7e37aa21228bc71c69e9c66a6821f3174a/ ... Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Gregory Dymarek <gregd72002@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-01-04 12:07:42 +01:00
diff -durN a/src/websock_config.h.in b/src/websock_config.h.in
--- a/src/websock_config.h.in
+++ b/src/websock_config.h.in
libwebsock: Fix openssl reporting in header The websock_config.h file currently ends up being installed into the sysroot with a #include "config.h" line but the config.h file does not get copied into the sysroot. Refactoring the original patch to have the configure script properly report whether or not SSL support is enabled without using the config.h file. Patch has been submitted upstream but may never be merged since upstream appears to be dead. https://github.com/payden/libwebsock/pull/38 Signed-off-by: Clayton Shotwell <clayton.shotwell@rockwellcollins.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2019-01-25 21:35:04 +01:00
@@ -4,6 +4,6 @@
package/libwebsock: allow building without SSL libwebsock can optionally use SL, and defaults to using it without checking for its presence first. Just disable SSL support if openssl is not enabled, and ensure it is built before libwebsock if it is enabled. Add a patch to fix SSL conditional build. Fixes: http://autobuild.buildroot.org/results/2c4/2c49e45667aaf2f2a59ace94885b9d4ed98038d7/ http://autobuild.buildroot.org/results/517/517bc814732f86dc6dd1a5c91148ce52ec9803f7/ http://autobuild.buildroot.org/results/951/95109c7e37aa21228bc71c69e9c66a6821f3174a/ ... Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Gregory Dymarek <gregd72002@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-01-04 12:07:42 +01:00
#define WEBSOCK_PACKAGE_STRING @WEBSOCK_PACKAGE_STRING@
#define WEBSOCK_PACKAGE_VERSION @WEBSOCK_PACKAGE_VERSION@
#define WEBSOCK_PACKAGE_NAME @WEBSOCK_PACKAGE_NAME@
-#define WEBSOCK_HAVE_SSL @WEBSOCK_HAVE_SSL@
libwebsock: Fix openssl reporting in header The websock_config.h file currently ends up being installed into the sysroot with a #include "config.h" line but the config.h file does not get copied into the sysroot. Refactoring the original patch to have the configure script properly report whether or not SSL support is enabled without using the config.h file. Patch has been submitted upstream but may never be merged since upstream appears to be dead. https://github.com/payden/libwebsock/pull/38 Signed-off-by: Clayton Shotwell <clayton.shotwell@rockwellcollins.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2019-01-25 21:35:04 +01:00
+#undef WEBSOCK_HAVE_SSL
package/libwebsock: allow building without SSL libwebsock can optionally use SL, and defaults to using it without checking for its presence first. Just disable SSL support if openssl is not enabled, and ensure it is built before libwebsock if it is enabled. Add a patch to fix SSL conditional build. Fixes: http://autobuild.buildroot.org/results/2c4/2c49e45667aaf2f2a59ace94885b9d4ed98038d7/ http://autobuild.buildroot.org/results/517/517bc814732f86dc6dd1a5c91148ce52ec9803f7/ http://autobuild.buildroot.org/results/951/95109c7e37aa21228bc71c69e9c66a6821f3174a/ ... Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Gregory Dymarek <gregd72002@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-01-04 12:07:42 +01:00
#endif
Reference in New Issue Copy Permalink