hrev52751 adds 1 changeset to branch 'master'
old head: ddd56c013dc4c4c65e5c8eb4a156d461bf21d7a5
new head: 7c374c6ab43fe2afdd368fc6091b64c00ef93f9b
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=7c374c6ab43f+%5Eddd56c013dc4
----------------------------------------------------------------------------
7c374c6ab43f: test_app_server: Fix linking when --no-undefined is in default
LINKFLAGS.
We now remove it manually for one library to break the dependency loop.
Change-Id: I24061705b4656d444bbe7b4a6af836303f44c020
Reviewed-on: https://review.haiku-os.org/c/873
Reviewed-by: Stephan Aßmus <superstippi@xxxxxx>
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev52751
Commit: 7c374c6ab43fe2afdd368fc6091b64c00ef93f9b
URL: https://git.haiku-os.org/haiku/commit/?id=7c374c6ab43f
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Fri Jan 11 17:57:24 2019 UTC
Committer: Stephan Aßmus <superstippi@xxxxxx>
Commit-Date: Sun Jan 13 09:58:48 2019 UTC
----------------------------------------------------------------------------
1 file changed, 17 insertions(+), 6 deletions(-)
src/tests/servers/app/Jamfile | 23 +++++++++++++++++------
----------------------------------------------------------------------------
diff --git a/src/tests/servers/app/Jamfile b/src/tests/servers/app/Jamfile
index 4b2b678dc7..b31dbbe303 100644
--- a/src/tests/servers/app/Jamfile
+++ b/src/tests/servers/app/Jamfile
@@ -55,13 +55,24 @@ SharedLibrary libhwinterface.so :
RGBColor.cpp
UpdateQueue.cpp
- : libtestappserver.so
+ : # will depend on libtestappserver.so
;
-
-# The reason for this is that libhwinterfaceimpl.so needs to link against
-# libbe *first*, but simply adding it to the library list would add it to
-# LINKLIBS which is always appended after NEEDLIBS in the command line.
+# We include --no-undefined in LINKFLAGS by default, which we can't use here
+# because otherwise we would be trapped in a circular dependency.
+local hwinterfaceLinkFlags ;
+for flag in [ on libhwinterface.so return $(LINKFLAGS) ] {
+ if $(flag) = "--no-undefined" {
+ hwinterfaceLinkFlags += "--allow-shlib-undefined" ;
+ continue ;
+ }
+ hwinterfaceLinkFlags += $(flag) ;
+}
+LINKFLAGS on libhwinterface.so = $(hwinterfaceLinkFlags) ;
+
+# libhwinterfaceimpl.so needs to link against libbe *first*, but simply
+# adding it to the library list would add it to LINKLIBS which is always
+# appended after NEEDLIBS in the command line.
LINKFLAGS on libhwinterfaceimpl.so ?= $(LINKFLAGS) ;
LINKFLAGS on libhwinterfaceimpl.so += -lbe ;
@@ -174,7 +185,7 @@ SharedLibrary libtestappserver.so :
# libraries
: be libpainter.a libagg.a libtextencoding.so shared libstackandtile.a
- liblinprog.a
+ liblinprog.a libhwinterface.so libhwinterfaceimpl.so
[ BuildFeatureAttribute freetype : library ]
;
