[debian-edu-commits] debian-edu/ 01/01: Fix LDFLAGS vs. LDADD in build system.
Dominik George
natureshadow-guest at moszumanska.debian.org
Fri Oct 7 22:45:57 UTC 2016
This is an automated email from the git hooks/post-receive script.
natureshadow-guest pushed a commit to branch master
in repository guacamole-server.
commit 8c13e6cb1f5886febf97bc1743e3509c660fa6c3
Author: Dominik George <nik at naturalnet.de>
Date: Sat Oct 8 00:29:32 2016 +0200
Fix LDFLAGS vs. LDADD in build system.
---
debian/patches/fix-buildsystem.patch | 213 +++++++++++++++++++++++++++++++----
1 file changed, 194 insertions(+), 19 deletions(-)
diff --git a/debian/patches/fix-buildsystem.patch b/debian/patches/fix-buildsystem.patch
index 3627b31..e3bb1aa 100644
--- a/debian/patches/fix-buildsystem.patch
+++ b/debian/patches/fix-buildsystem.patch
@@ -3,6 +3,7 @@ Description: Build system fixes
2. Fix gcrypt discovery
3. Explicitly discover dl
4. Explicitly add some more libraries
+ 5. Fix LDFLAGS vs. LDADD to allo -Wl,--as-needed
Author: Dominik George <nik at naturalnet.de>
--- a/configure.ac
+++ b/configure.ac
@@ -55,15 +56,26 @@ Author: Dominik George <nik at naturalnet.de>
--- a/src/common-ssh/Makefile.am
+++ b/src/common-ssh/Makefile.am
-@@ -40,7 +40,7 @@ noinst_HEADERS = \
+@@ -40,15 +40,13 @@ noinst_HEADERS = \
guac_ssh_user.h
libguac_common_ssh_la_CFLAGS = \
- -Werror -Wall -pedantic \
-+ -Wall \
++ -Wall \
@COMMON_INCLUDE@ \
@LIBGUAC_INCLUDE@
+ libguac_common_ssh_la_LIBADD = \
+- @LIBGUAC_LTLIB@
+-
+-libguac_common_ssh_la_LDFLAGS = \
+- @PTHREAD_LIBS@ \
+- @SSH_LIBS@ \
++ @LIBGUAC_LTLIB@ \
++ @PTHREAD_LIBS@ \
++ @SSH_LIBS@ \
+ @SSL_LIBS@
+
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -50,7 +50,7 @@ libguac_common_la_SOURCES = \
@@ -71,13 +83,13 @@ Author: Dominik George <nik at naturalnet.de>
libguac_common_la_CFLAGS = \
- -Werror -Wall -pedantic \
-+ -Wall \
++ -Wall \
@LIBGUAC_INCLUDE@
libguac_common_la_LIBADD = \
--- a/src/guacd/Makefile.am
+++ b/src/guacd/Makefile.am
-@@ -46,7 +46,7 @@ guacd_SOURCES = \
+@@ -46,16 +46,14 @@ guacd_SOURCES = \
log.c
guacd_CFLAGS = \
@@ -86,55 +98,152 @@ Author: Dominik George <nik at naturalnet.de>
@COMMON_INCLUDE@ \
@LIBGUAC_INCLUDE@
+-guacd_LDADD = \
++guacd_LDADD = \
+ @COMMON_LTLIB@ \
+- @LIBGUAC_LTLIB@
+-
+-guacd_LDFLAGS = \
+- @PTHREAD_LIBS@ \
++ @LIBGUAC_LTLIB@ \
++ @PTHREAD_LIBS@ \
+ @SSL_LIBS@
+
+ EXTRA_DIST = \
--- a/src/libguac/Makefile.am
+++ b/src/libguac/Makefile.am
-@@ -97,7 +97,7 @@ endif
+@@ -97,17 +97,17 @@ endif
libguac_la_CFLAGS = \
- -Werror -Wall -pedantic -Iguacamole
+ -Wall -Iguacamole
- libguac_la_LDFLAGS = \
- -version-info 11:0:0 \
+-libguac_la_LDFLAGS = \
+- -version-info 11:0:0 \
+- @CAIRO_LIBS@ \
+- @JPEG_LIBS@ \
+- @PNG_LIBS@ \
+- @PTHREAD_LIBS@ \
+- @UUID_LIBS@ \
+- @VORBIS_LIBS@ \
+- @WEBP_LIBS@
++libguac_la_LDFLAGS = \
++ -version-info 11:0:0
+
+ libguac_la_LIBADD = \
+- @LIBADD_DLOPEN@
++ @LIBADD_DLOPEN@ \
++ @CAIRO_LIBS@ \
++ @JPEG_LIBS@ \
++ @PNG_LIBS@ \
++ @PTHREAD_LIBS@ \
++ @UUID_LIBS@ \
++ @VORBIS_LIBS@ \
++ @WEBP_LIBS@
--- a/src/protocols/rdp/Makefile.am
+++ b/src/protocols/rdp/Makefile.am
-@@ -117,7 +117,7 @@ endif
+@@ -117,77 +117,77 @@ endif
#
libguac_client_rdp_la_CFLAGS = \
- -Werror -Wall -Iinclude \
-+ -Wall -Iinclude \
++ -Wall -Iinclude \
@COMMON_INCLUDE@ \
@COMMON_SSH_INCLUDE@ \
@LIBGUAC_INCLUDE@
-@@ -137,7 +137,7 @@ libguac_client_rdp_la_LIBADD = \
+
+ libguac_client_rdp_la_LDFLAGS = \
+- -version-info 0:0:0 \
+- @CAIRO_LIBS@ \
+- @PTHREAD_LIBS@ \
+- @RDP_LIBS@
++ -version-info 0:0:0
+
+-libguac_client_rdp_la_LIBADD = \
+- @COMMON_LTLIB@ \
+- @LIBGUAC_LTLIB@
++libguac_client_rdp_la_LIBADD = \
++ @COMMON_LTLIB@ \
++ @LIBGUAC_LTLIB@ \
++ @CAIRO_LIBS@ \
++ @PTHREAD_LIBS@ \
++ @RDP_LIBS@
+
+ #
+ # RDPDR
#
guacdr_cflags = \
- -Werror -Wall -Iinclude \
-+ -Wall -Iinclude \
++ -Wall -Iinclude \
@COMMON_INCLUDE@ \
@COMMON_SSH_INCLUDE@ \
@LIBGUAC_INCLUDE@
-@@ -156,7 +156,7 @@ guacdr_libadd = \
+
+ guacdr_ldflags = \
+- -module -avoid-version -shared \
+- @PTHREAD_LIBS@ \
+- @RDP_LIBS@
++ -module -avoid-version -shared
+
+ guacdr_libadd = \
+ @COMMON_LTLIB@ \
+- @LIBGUAC_LTLIB@
++ @LIBGUAC_LTLIB@ \
++ @PTHREAD_LIBS@ \
++ @RDP_LIBS@
+
+ #
+ # RDPSND
#
guacsnd_cflags = \
- -Werror -Wall -Iinclude \
-+ -Wall -Iinclude \
++ -Wall -Iinclude \
@COMMON_INCLUDE@ \
@COMMON_SSH_INCLUDE@ \
@LIBGUAC_INCLUDE@
-@@ -175,7 +175,7 @@ guacsnd_libadd = \
+
+ guacsnd_ldflags = \
+- -module -avoid-version -shared \
+- @PTHREAD_LIBS@ \
+- @RDP_LIBS@
++ -module -avoid-version -shared
+
+ guacsnd_libadd = \
+ @COMMON_LTLIB@ \
+- @LIBGUAC_LTLIB@
++ @LIBGUAC_LTLIB@ \
++ @PTHREAD_LIBS@ \
++ @RDP_LIBS@
+
+ #
+ # Static Virtual Channels
#
guacsvc_cflags = \
- -Werror -Wall -Iinclude \
-+ -Wall -Iinclude \
++ -Wall -Iinclude \
@COMMON_INCLUDE@ \
@COMMON_SSH_INCLUDE@ \
@LIBGUAC_INCLUDE@
+
+ guacsvc_ldflags = \
+- -module -avoid-version -shared \
+- @PTHREAD_LIBS@ \
+- @RDP_LIBS@
++ -module -avoid-version -shared
+
+ guacsvc_libadd = \
+ @COMMON_LTLIB@ \
+- @LIBGUAC_LTLIB@
++ @LIBGUAC_LTLIB@ \
++ @PTHREAD_LIBS@ \
++ @RDP_LIBS@
+
+ #
+ # Optional SFTP support
--- a/src/protocols/ssh/Makefile.am
+++ b/src/protocols/ssh/Makefile.am
@@ -46,7 +46,7 @@ noinst_HEADERS += ssh_agent.h
@@ -146,9 +255,26 @@ Author: Dominik George <nik at naturalnet.de>
@COMMON_SSH_INCLUDE@ \
@LIBGUAC_INCLUDE@ \
@TERMINAL_INCLUDE@
+@@ -55,11 +55,11 @@ libguac_client_ssh_la_LIBADD = \
+ @COMMON_LTLIB@ \
+ @COMMON_SSH_LTLIB@ \
+ @LIBGUAC_LTLIB@ \
+- @TERMINAL_LTLIB@
++ @TERMINAL_LTLIB@ \
++ @PTHREAD_LIBS@ \
++ @SSH_LIBS@ \
++ @SSL_LIBS@
+
+ libguac_client_ssh_la_LDFLAGS = \
+- -version-info 0:0:0 \
+- @PTHREAD_LIBS@ \
+- @SSH_LIBS@ \
+- @SSL_LIBS@
++ -version-info 0:0:0
+
--- a/src/protocols/telnet/Makefile.am
+++ b/src/protocols/telnet/Makefile.am
-@@ -38,7 +38,7 @@ noinst_HEADERS = \
+@@ -38,17 +38,17 @@ noinst_HEADERS = \
telnet_client.h
libguac_client_telnet_la_CFLAGS = \
@@ -157,20 +283,52 @@ Author: Dominik George <nik at naturalnet.de>
@LIBGUAC_INCLUDE@ \
@TERMINAL_INCLUDE@
+ libguac_client_telnet_la_LIBADD = \
+ @COMMON_LTLIB@ \
+ @LIBGUAC_LTLIB@ \
+- @TERMINAL_LTLIB@
++ @TERMINAL_LTLIB@ \
++ @PTHREAD_LIBS@ \
++ @TELNET_LIBS@
+
+ libguac_client_telnet_la_LDFLAGS = \
+- -version-info 0:0:0 \
+- @PTHREAD_LIBS@ \
+- @TELNET_LIBS@
++ -version-info 0:0:0
+
--- a/src/protocols/vnc/Makefile.am
+++ b/src/protocols/vnc/Makefile.am
-@@ -44,7 +44,7 @@ noinst_HEADERS += pulse.h
+@@ -44,20 +44,20 @@ noinst_HEADERS += pulse.h
endif
libguac_client_vnc_la_CFLAGS = \
- -Werror -Wall -pedantic -Iinclude \
-+ -Wall -Iinclude \
++ -Wall -Iinclude \
@COMMON_INCLUDE@ \
@COMMON_SSH_INCLUDE@ \
@LIBGUAC_INCLUDE@
+
+ libguac_client_vnc_la_LDFLAGS = \
+- -version-info 0:0:0 \
+- @CAIRO_LIBS@ \
+- @PULSE_LIBS@ \
+- @VNC_LIBS@
++ -version-info 0:0:0
+
+ libguac_client_vnc_la_LIBADD = \
+ @COMMON_LTLIB@ \
+- @LIBGUAC_LTLIB@
++ @LIBGUAC_LTLIB@ \
++ @CAIRO_LIBS@ \
++ @PULSE_LIBS@ \
++ @VNC_LIBS@
+
+ # Optional SFTP support
+ if ENABLE_COMMON_SSH
--- a/src/terminal/Makefile.am
+++ b/src/terminal/Makefile.am
-@@ -55,7 +55,7 @@ libguac_terminal_la_SOURCES = \
+@@ -55,19 +55,17 @@ libguac_terminal_la_SOURCES = \
terminal_handlers.c
libguac_terminal_la_CFLAGS = \
@@ -179,6 +337,23 @@ Author: Dominik George <nik at naturalnet.de>
@COMMON_INCLUDE@ \
@LIBGUAC_INCLUDE@ \
@PANGO_CFLAGS@ \
+ @PANGOCAIRO_CFLAGS@
+
+ libguac_terminal_la_LIBADD = \
+- @LIBGUAC_LTLIB@
+-
+-libguac_terminal_la_LDFLAGS = \
+- @CAIRO_LIBS@ \
+- @MATH_LIBS@ \
+- @PANGO_LIBS@ \
+- @PANGOCAIRO_LIBS@ \
++ @LIBGUAC_LTLIB@ \
++ @CAIRO_LIBS@ \
++ @MATH_LIBS@ \
++ @PANGO_LIBS@ \
++ @PANGOCAIRO_LIBS@ \
+ @PTHREAD_LIBS@
+
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -52,7 +52,7 @@ test_libguac_SOURCES = \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/guacamole-server.git
More information about the debian-edu-commits
mailing list