i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Attempt to fix test_appserver build again.

Browse Source 
There seem to be a problem with the architecture, when building for an
x86_gcc2 system things are generated in libbe_test/x86, and then fail
with a lot of undefined references. Help welcome.
This commit is contained in:
Adrien Destugues
2014-01-21 17:17:58 +01:00
parent 77bf4d8d51
commit 8e7d9c7245
4 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/input_server/filters/shortcut_catcher/Jamfile
+2
View File
@@ -1,5 +1,7 @@
SubDir HAIKU_TOP src add-ons input_server filters shortcut_catcher ; SubDir HAIKU_TOP src add-ons input_server filters shortcut_catcher ;
AddSubDirSupportedPlatforms libbe_test ;
UsePrivateHeaders storage ; UsePrivateHeaders storage ;
local architectureObject ; local architectureObject ;
src/kits/Jamfile
+5 -5
View File
@@ -57,12 +57,12 @@ SetSupportedPlatformsForTarget libbe_test.so : libbe_test ;
SetVersionScript libbe_test.so : libbe_test_versions ; SetVersionScript libbe_test.so : libbe_test_versions ;
SharedLibrary libbe_test.so : SharedLibrary libbe_test.so :
LocaleBackend.cpp
: :
<libbe>app_kit.o <libbe!$(HAIKU_ARCH)>app_kit.o
<libbe>interface_kit.o <libbe!$(HAIKU_ARCH)>interface_kit.o
<libbe>storage_kit.o <libbe!$(HAIKU_ARCH)>locale_kit.o
<libbe>support_kit.o <libbe!$(HAIKU_ARCH)>storage_kit.o
<libbe!$(HAIKU_ARCH)>support_kit.o
libicon.a libicon.a
libagg.a libagg.a
src/tests/servers/app/Jamfile
+7 -5
View File
@@ -25,6 +25,8 @@ local appServerDir = [ FDirName $(HAIKU_TOP) src servers app ] ;
UseHeaders [ FDirName $(appServerDir) decorator ] ; UseHeaders [ FDirName $(appServerDir) decorator ] ;
UseHeaders [ FDirName $(appServerDir) drawing ] ; UseHeaders [ FDirName $(appServerDir) drawing ] ;
UseHeaders [ FDirName $(appServerDir) drawing interface html5 ] ;
UseHeaders [ FDirName $(appServerDir) drawing interface remote ] ;
UseHeaders [ FDirName $(appServerDir) drawing Painter ] ; UseHeaders [ FDirName $(appServerDir) drawing Painter ] ;
UseHeaders [ FDirName $(appServerDir) drawing Painter drawing_modes ] ; UseHeaders [ FDirName $(appServerDir) drawing Painter drawing_modes ] ;
UseHeaders [ FDirName $(appServerDir) drawing Painter font_support ] ; UseHeaders [ FDirName $(appServerDir) drawing Painter font_support ] ;
@@ -108,7 +110,8 @@ SharedLibrary libtestappserver.so :
# trace.c # trace.c
# libraries # libraries
: be libpainter.a libagg.a libtextencoding.so libfreetype.so libshared.a : be libpainter.a libagg.a libtextencoding.so libshared.a
[ BuildFeatureAttribute freetype : library ]
; ;
AddResources test_app_server : app_server.rdef ; AddResources test_app_server : app_server.rdef ;
@@ -173,16 +176,15 @@ Server test_app_server :
# libraries # libraries
: :
[ BuildFeatureAttribute zlib : library ] libtestappserver.so be [ BuildFeatureAttribute zlib : library ] libtestappserver.so be
libhwinterface.so libhwinterfaceimpl.so liblinprog.a libhwinterface.so libhwinterfaceimpl.so liblinprog.a libtextencoding.so
libfreetype.so libtextencoding.so [ BuildFeatureAttribute freetype : library ]
$(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++) $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++)
; ;
# install in the test dir # install in the test dir
HaikuInstall install-test-apps : $(HAIKU_APP_TEST_LIB_DIR) HaikuInstall install-test-apps : $(HAIKU_APP_TEST_LIB_DIR)
: libtestappserver.so libbe_test.so : libtestappserver.so libbe_test.so
libhwinterface.so libhwinterfaceimpl.so libfreetype.so libhwinterface.so libhwinterfaceimpl.so libtextencoding.so
libtextencoding.so
: tests!apps ; : tests!apps ;
HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : test_app_server HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : test_app_server
src/tests/servers/registrar/Jamfile
+1
View File
@@ -67,6 +67,7 @@ UsePrivateSystemHeaders ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src servers registrar ] ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src servers registrar ] ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src servers registrar mime ] ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src servers registrar mime ] ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits storage mime ] ;
Server test_registrar Server test_registrar
: :