* Peter Spiess-Knafl <[email protected]>, 2015-05-26, 10:35:
Could you test this on some porterboxes of different archs, before I do another upload? MIPS would be specifically interesting, because it uses different endian.

[1]:
http://anonscm.debian.org/cgit/collab-maint/libvncserver.git/commit/?id=23cefba041e6a469fb7f03a632d76bcba33abb9e

With this patch, I got identical header files on amd64 and mips.

However, I noticed that contents rfbconfig.h has changed on amd64 (see the attached diff), which doesn't look intentional.

I'm a bit worried that now WORDS_BIGENDIAN is not defined even on big-endian machines. Hopefully it doesn't matter in practice...

Also, I have general doubts whether this is the correct approach. Wouldn't it be maintenance nightmare to keep debian/rfbconfig.h up-to-date? It would have to be updated on every new upstream release.

--
Jakub Wilk
diff -urN a/libvncserver-dev_0.9.10+dfsg-2_amd64/usr/include/rfb/rfbconfig.h b/libvncserver-dev_0.9.10+dfsg-3_amd64/usr/include/rfb/rfbconfig.h
--- a/libvncserver-dev_0.9.10+dfsg-2_amd64/usr/include/rfb/rfbconfig.h	2015-05-25 10:03:25.000000000 +0200
+++ b/libvncserver-dev_0.9.10+dfsg-3_amd64/usr/include/rfb/rfbconfig.h	2015-05-26 13:49:08.000000000 +0200
@@ -97,7 +97,9 @@
 #endif
 
 /* openssl libcrypto library present */
-/* #undef HAVE_LIBCRYPTO */
+#ifndef LIBVNCSERVER_HAVE_LIBCRYPTO
+#define LIBVNCSERVER_HAVE_LIBCRYPTO 1
+#endif
 
 /* Define to 1 if you have the `cygipc' library (-lcygipc). */
 /* #undef HAVE_LIBCYGIPC */
@@ -113,7 +115,7 @@
 #endif
 
 /* Define to 1 if you have the `png' library (-lpng). */
-/* #undef HAVE_LIBPNG */
+/* #undef LIBVNCSERVER_HAVE_LIBPNG */
 
 /* Define to 1 if you have the `pthread' library (-lpthread). */
 #ifndef LIBVNCSERVER_HAVE_LIBPTHREAD
@@ -124,7 +126,9 @@
 /* #undef HAVE_LIBSOCKET */
 
 /* openssl libssl library present */
-/* #undef HAVE_LIBSSL */
+#ifndef LIBVNCSERVER_HAVE_LIBSSL
+#define LIBVNCSERVER_HAVE_LIBSSL 1
+#endif
 
 /* Define to 1 if you have the `z' library (-lz). */
 #ifndef LIBVNCSERVER_HAVE_LIBZ

Reply via email to