From 16d5c24e533eb14b7b8a99ee9f3ec9ba66335b1e Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Tue, 7 Jul 2009 10:30:09 +0000 Subject: [PATCH] * merged 32bit-wchar_t branches of buildtools and haiku back into the respective trunk git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31443 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/BuildSetup | 3 +- build/jam/HaikuImage | 2 +- build/jam/OptionalPackages | 214 +++++++----------- build/scripts/build_cross_tools | 2 +- configure | 16 +- data/system/boot/SetupEnvironment | 2 +- headers/glibc/printf.h | 145 ++++++++++++ src/add-ons/disk_systems/bfs/Jamfile | 2 +- src/add-ons/disk_systems/intel/Jamfile | 2 +- .../input_server/devices/keyboard/Jamfile | 2 +- .../input_server/devices/mouse/Jamfile | 2 +- .../input_server/devices/wacom/Jamfile | 2 +- .../input_server/filters/screen_saver/Jamfile | 2 +- .../input_server/methods/canna/Jamfile | 2 +- .../file_systems/userlandfs/server/Jamfile | 1 + .../userlandfs/server/beos/Jamfile | 1 + .../userlandfs/server/fuse/Jamfile | 2 +- .../userlandfs/server/haiku/Jamfile | 1 + src/add-ons/locale/catalogs/zeta/Jamfile | 2 +- src/add-ons/locale/collators/Jamfile | 4 +- .../inbound_filters/match_header/Jamfile | 2 +- .../inbound_filters/r5_filter/Jamfile | 2 +- .../inbound_filters/spam_filter/Jamfile | 2 +- .../inbound_protocols/imap/Jamfile | 3 +- .../inbound_protocols/pop3/Jamfile | 1 + .../outbound_filters/fortune/Jamfile | 2 +- .../mail_daemon/system_filters/inbox/Jamfile | 2 +- .../system_filters/notifier/Jamfile | 2 +- .../mail_daemon/system_filters/outbox/Jamfile | 2 +- .../mail_daemon/system_filters/parser/Jamfile | 2 +- src/add-ons/media/media-add-ons/dvb/Jamfile | 2 +- .../media/media-add-ons/esound_sink/Jamfile | 2 +- .../media/media-add-ons/firewire_dv/Jamfile | 2 +- .../media/media-add-ons/legacy/Jamfile | 2 +- src/add-ons/media/media-add-ons/mixer/Jamfile | 2 +- .../media/media-add-ons/multi_audio/Jamfile | 2 +- .../media/media-add-ons/opensound/Jamfile | 2 +- .../media/media-add-ons/reader/Jamfile | 2 +- .../media-add-ons/tone_producer_demo/Jamfile | 2 +- .../media/media-add-ons/usb_webcam/Jamfile | 2 +- .../media-add-ons/video_producer_demo/Jamfile | 2 +- .../media/media-add-ons/videowindow/Jamfile | 2 +- src/add-ons/media/plugins/ac3_decoder/Jamfile | 2 +- src/add-ons/media/plugins/aiff_reader/Jamfile | 2 +- src/add-ons/media/plugins/ape_reader/Jamfile | 2 +- src/add-ons/media/plugins/au_reader/Jamfile | 2 +- src/add-ons/media/plugins/ffmpeg/Jamfile | 1 + src/add-ons/media/plugins/mp3_decoder/Jamfile | 1 + src/add-ons/media/plugins/mp3_reader/Jamfile | 2 +- src/add-ons/media/plugins/musepack/Jamfile | 2 +- src/add-ons/media/plugins/raw_decoder/Jamfile | 2 +- src/add-ons/media/plugins/speex/Jamfile | 2 +- src/add-ons/media/plugins/vorbis/Jamfile | 2 +- src/add-ons/media/plugins/wav_reader/Jamfile | 2 +- .../opengl/mesa_software_renderer/Jamfile | 2 +- src/add-ons/print/drivers/pdf/source/Jamfile | 1 + .../print/transports/hp_jetdirect/Jamfile | 2 +- .../print/transports/parallel_port/Jamfile | 2 +- .../print/transports/print_to_file/Jamfile | 2 +- .../print/transports/serial_port/Jamfile | 2 +- src/add-ons/print/transports/usb_port/Jamfile | 2 +- src/add-ons/screen_savers/debugnow/Jamfile | 2 +- src/add-ons/screen_savers/flurry/Jamfile | 2 +- src/add-ons/screen_savers/haiku/Jamfile | 2 +- src/add-ons/screen_savers/ifs/Jamfile | 2 +- src/add-ons/screen_savers/message/Jamfile | 2 +- src/add-ons/screen_savers/simpleclock/Jamfile | 2 +- src/add-ons/screen_savers/spider/Jamfile | 2 +- src/add-ons/tracker/opentargetfolder/Jamfile | 2 +- src/add-ons/tracker/zipomatic/Jamfile | 2 +- src/add-ons/translators/bmp/Jamfile | 2 +- src/add-ons/translators/gif/Jamfile | 2 +- src/add-ons/translators/hpgs/Jamfile | 1 + src/add-ons/translators/hvif/Jamfile | 2 +- src/add-ons/translators/ico/Jamfile | 2 +- src/add-ons/translators/jpeg2000/Jamfile | 2 +- src/add-ons/translators/pcx/Jamfile | 2 +- src/add-ons/translators/png/Jamfile | 2 +- src/add-ons/translators/ppm/Jamfile | 2 +- src/add-ons/translators/raw/Jamfile | 2 +- src/add-ons/translators/rtf/Jamfile | 2 +- src/add-ons/translators/sgi/Jamfile | 2 +- src/add-ons/translators/stxt/Jamfile | 3 +- src/add-ons/translators/tga/Jamfile | 2 +- src/add-ons/translators/tiff/Jamfile | 2 +- src/add-ons/translators/wonderbrush/Jamfile | 2 +- src/apps/3dmov/Jamfile | 2 +- src/apps/bootman/Jamfile | 2 +- src/apps/bsnow/Jamfile | 2 +- src/apps/charactermap/Jamfile | 2 +- src/apps/clock/Jamfile | 2 +- src/apps/cortex/addons/AudioAdapter/Jamfile | 2 +- src/apps/cortex/addons/Flanger/Jamfile | 2 +- .../debugger/gui/running_teams_window/Jamfile | 2 +- src/apps/deskbar/Jamfile | 2 +- src/apps/diskprobe/Jamfile | 3 +- src/apps/drivesetup/Jamfile | 2 +- src/apps/expander/Jamfile | 2 +- src/apps/fontdemo/Jamfile | 2 +- src/apps/glteapot/Jamfile | 2 +- src/apps/gradients/Jamfile | 2 +- src/apps/installedpackages/Jamfile | 2 +- src/apps/launchbox/Jamfile | 2 +- src/apps/magnify/Jamfile | 2 +- src/apps/mandelbrot/Jamfile | 2 +- src/apps/midiplayer/Jamfile | 2 +- src/apps/networkstatus/Jamfile | 2 +- src/apps/packageinstaller/Jamfile | 2 +- src/apps/people/Jamfile | 2 +- src/apps/powerstatus/Jamfile | 2 +- src/apps/processcontroller/Jamfile | 2 +- src/apps/pulse/Jamfile | 2 +- src/apps/resedit/Jamfile | 2 +- src/apps/screenshot/Jamfile | 2 +- src/apps/showimage/Jamfile | 2 +- src/apps/stylededit/Jamfile | 2 +- src/apps/terminal/Jamfile | 2 +- src/apps/text_search/Jamfile | 2 +- src/apps/tv/Jamfile | 2 +- src/apps/webwatch/Jamfile | 2 +- src/apps/workspaces/Jamfile | 2 +- src/bin/Jamfile | 32 ++- src/bin/desklink/Jamfile | 2 +- src/bin/keymap/Jamfile | 2 +- src/bin/locale/Jamfile | 5 +- .../makebootable/platform/bios_ia32/Jamfile | 2 +- .../makebootable/platform/pxe_ia32/Jamfile | 2 +- src/bin/network/mount_nfs/Jamfile | 2 +- src/bin/playsound/Jamfile | 4 +- src/bin/screen_blanker/Jamfile | 2 +- src/bin/screenmode/Jamfile | 2 +- src/bin/unrar/Jamfile | 2 +- src/bin/vim/src/Jamfile | 2 +- src/kits/debug/Jamfile | 2 +- src/kits/device/Jamfile | 2 +- src/kits/game/Jamfile | 2 +- src/kits/media/Jamfile | 2 +- src/kits/midi/Jamfile | 1 + src/kits/midi2/Jamfile | 2 +- src/kits/network/Jamfile | 1 + src/kits/network/libnetapi/Jamfile | 4 +- src/kits/screensaver/Jamfile | 2 +- src/kits/textencoding/Jamfile | 2 +- src/libs/alm/Jamfile | 2 +- src/libs/linprog/Jamfile | 2 +- src/libs/stdc++/Jamfile | 177 +-------------- src/libs/stdc++/current/Jamfile | 49 ++++ src/libs/stdc++/legacy/Jamfile | 176 ++++++++++++++ src/libs/stdc++/{ => legacy}/PlotFile.cc | 0 src/libs/stdc++/{ => legacy}/SFile.cc | 0 src/libs/stdc++/{ => legacy}/ansidecl.h | 0 src/libs/stdc++/{ => legacy}/basename.c | 0 src/libs/stdc++/{ => legacy}/builtinbuf.cc | 0 src/libs/stdc++/{ => legacy}/cinst.cc | 0 src/libs/stdc++/{ => legacy}/cmathi.cc | 0 src/libs/stdc++/{ => legacy}/config.h | 0 src/libs/stdc++/{ => legacy}/cstdlibi.cc | 0 src/libs/stdc++/{ => legacy}/cstringi.cc | 0 src/libs/stdc++/{ => legacy}/editbuf.cc | 0 src/libs/stdc++/{ => legacy}/filebuf.cc | 0 src/libs/stdc++/{ => legacy}/fstream.cc | 0 src/libs/stdc++/{ => legacy}/getpagesize.c | 0 src/libs/stdc++/{ => legacy}/indstream.cc | 0 src/libs/stdc++/{ => legacy}/insque.c | 0 src/libs/stdc++/{ => legacy}/ioassign.cc | 0 src/libs/stdc++/{ => legacy}/ioextend.cc | 0 src/libs/stdc++/{ => legacy}/iomanip.cc | 0 src/libs/stdc++/{ => legacy}/iostream.cc | 0 src/libs/stdc++/{ => legacy}/iostreamP.h | 0 src/libs/stdc++/{ => legacy}/isgetline.cc | 0 src/libs/stdc++/{ => legacy}/isgetsb.cc | 0 src/libs/stdc++/{ => legacy}/isscan.cc | 0 src/libs/stdc++/{ => legacy}/libiberty.h | 0 src/libs/stdc++/{ => legacy}/osform.cc | 0 src/libs/stdc++/{ => legacy}/parsestream.cc | 0 src/libs/stdc++/{ => legacy}/pfstream.cc | 0 src/libs/stdc++/{ => legacy}/procbuf.cc | 0 src/libs/stdc++/{ => legacy}/sbform.cc | 0 src/libs/stdc++/{ => legacy}/sbgetline.cc | 0 src/libs/stdc++/{ => legacy}/sbscan.cc | 0 src/libs/stdc++/{ => legacy}/sigsetmask.c | 0 src/libs/stdc++/{ => legacy}/sinst.cc | 0 src/libs/stdc++/{ => legacy}/stdexcepti.cc | 0 src/libs/stdc++/{ => legacy}/stdiostream.cc | 0 src/libs/stdc++/{ => legacy}/stdstrbufs.cc | 0 src/libs/stdc++/{ => legacy}/stdstreams.cc | 0 src/libs/stdc++/{ => legacy}/stlinst.cc | 0 src/libs/stdc++/{ => legacy}/stream.cc | 0 src/libs/stdc++/{ => legacy}/streambuf.cc | 0 src/libs/stdc++/{ => legacy}/strerror.c | 0 src/libs/stdc++/{ => legacy}/strstream.cc | 0 src/libs/stdc++/{ => legacy}/valarray.cc | 0 src/libs/stdc++/{ => legacy}/vfork.c | 0 src/preferences/backgrounds/Jamfile | 2 +- src/preferences/bluetooth/Jamfile | 2 +- src/preferences/cpufrequency/Jamfile | 2 +- src/preferences/datatranslations/Jamfile | 2 +- src/preferences/devices/Jamfile | 2 +- src/preferences/filetypes/Jamfile | 2 +- src/preferences/fonts/Jamfile | 2 +- src/preferences/keyboard/Jamfile | 2 +- src/preferences/locale/Jamfile | 2 +- src/preferences/mail/Jamfile | 2 +- src/preferences/media/Jamfile | 2 +- src/preferences/mouse/Jamfile | 2 +- src/preferences/network/Jamfile | 2 +- src/preferences/print/Jamfile | 1 + src/preferences/screen/Jamfile | 2 +- src/preferences/sounds/Jamfile | 2 +- src/preferences/time/Jamfile | 2 +- src/preferences/touchpad/Jamfile | 2 +- src/servers/cddb_daemon/Jamfile | 2 +- src/servers/media_addon/Jamfile | 2 +- src/servers/midi/Jamfile | 2 +- src/servers/power/Jamfile | 2 +- src/servers/print/Jamfile | 1 + src/servers/services_daemon/Jamfile | 2 +- src/servers/syslog_daemon/Jamfile | 2 +- src/system/libroot/Jamfile | 2 +- src/system/libroot/posix/glibc/ctype/Jamfile | 1 + src/system/libroot/posix/glibc/ctype/ctype.h | 2 +- .../libroot/posix/glibc/ctype/ctype_l.c | 11 + .../libroot/posix/glibc/extensions/obstack.c | 12 +- src/system/libroot/posix/glibc/libio/Jamfile | 10 +- .../libroot/posix/glibc/libio/fileops.c | 2 - src/system/libroot/posix/glibc/libio/genops.c | 6 +- .../libroot/posix/glibc/libio/iofwide.c | 13 +- .../libroot/posix/glibc/libio/ioseekoff.c | 6 - .../libroot/posix/glibc/libio/ioseekpos.c | 2 - src/system/libroot/posix/glibc/libio/libioP.h | 6 +- .../libroot/posix/glibc/libio/stdfiles.c | 9 +- .../libroot/posix/glibc/stdio-common/Jamfile | 4 +- .../posix/glibc/stdio-common/vfscanf.c | 12 +- .../kernel/file_systems/bfs/queries/Jamfile | 2 +- .../file_systems/userlandfs/bfs/Jamfile | 2 +- .../userlandfs/ramfs/beos_interface/Jamfile | 1 + .../file_systems/userlandfs/reiserfs/Jamfile | 1 + .../reiserfs/beos_interface/Jamfile | 2 +- .../add-ons/media/plugins/musepack/Jamfile | 2 +- .../add-ons/print/pdf/bezierbounds/Jamfile | 2 +- .../add-ons/print/pdf/linepathbuilder/Jamfile | 2 +- src/tests/add-ons/print/ppd/test/Jamfile | 4 +- src/tests/add-ons/print/transports/Jamfile | 2 +- src/tests/add-ons/translators/exif/Jamfile | 2 +- src/tests/apps/fake_app_server/Jamfile | 2 +- src/tests/apps/miniterminal/Jamfile | 2 +- src/tests/apps/partitioner/Jamfile | 2 +- src/tests/apps/terminal_replicant/Jamfile | 2 +- src/tests/kits/game/chart/Jamfile | 2 +- .../kits/game/direct_window_info_test/Jamfile | 2 +- .../kits/game/direct_window_test/Jamfile | 2 +- src/tests/kits/game/page_flipper/Jamfile | 2 +- .../kits/game/simple_game_sound_test/Jamfile | 2 +- src/tests/kits/interface/Jamfile | 30 +-- src/tests/kits/interface/bshelf/Jamfile | 2 +- .../kits/interface/flatten_picture/Jamfile | 1 + src/tests/kits/interface/layout/Jamfile | 2 +- src/tests/kits/interface/look/Jamfile | 2 +- src/tests/kits/interface/picture/Jamfile | 2 +- src/tests/kits/interface/pictureprint/Jamfile | 1 + src/tests/kits/locale/Jamfile | 4 +- src/tests/kits/media/Jamfile | 4 +- src/tests/kits/media/media_decoder/Jamfile | 2 +- src/tests/kits/media/mp3_reader_test/Jamfile | 2 +- src/tests/kits/media/notificationtest/Jamfile | 2 +- src/tests/kits/media/playwav/Jamfile | 2 +- src/tests/kits/media/wav_reader_test/Jamfile | 2 +- src/tests/kits/net/Jamfile | 2 +- src/tests/kits/net/preflet/Jamfile | 2 +- src/tests/kits/net/tcptester/Jamfile | 2 +- src/tests/kits/opengl/direct_mode/Jamfile | 2 +- src/tests/kits/opengl/glinfo/Jamfile | 2 +- src/tests/kits/storage/testapps/Jamfile | 2 +- .../barchivable/remoteobjectdef/Jamfile | 2 +- src/tests/libs/alm/Jamfile | 8 +- src/tests/libs/linprog/Jamfile | 2 +- src/tests/misc/Jamfile | 2 +- src/tests/misc/exception-test/Jamfile | 1 + src/tests/servers/app/async_drawing/Jamfile | 2 +- src/tests/servers/app/avoid_focus/Jamfile | 2 +- src/tests/servers/app/benchmark/Jamfile | 2 +- src/tests/servers/app/bitmap_bounds/Jamfile | 2 +- src/tests/servers/app/bitmap_drawing/Jamfile | 2 +- .../app/constrain_clipping_region/Jamfile | 2 +- src/tests/servers/app/copy_bits/Jamfile | 2 +- src/tests/servers/app/cursor_test/Jamfile | 2 +- src/tests/servers/app/desktop_window/Jamfile | 2 +- .../servers/app/drawing_debugger/Jamfile | 2 +- src/tests/servers/app/event_mask/Jamfile | 2 +- src/tests/servers/app/find_view/Jamfile | 2 +- src/tests/servers/app/following/Jamfile | 2 +- src/tests/servers/app/hide_and_show/Jamfile | 2 +- .../servers/app/lagging_get_mouse/Jamfile | 4 +- src/tests/servers/app/lock_focus/Jamfile | 2 +- src/tests/servers/app/look_and_feel/Jamfile | 2 +- src/tests/servers/app/menu_crash/Jamfile | 2 +- src/tests/servers/app/playground/Jamfile | 2 +- src/tests/servers/app/resize_limits/Jamfile | 2 +- src/tests/servers/app/scrollbar/Jamfile | 2 +- src/tests/servers/app/scrolling/Jamfile | 2 +- src/tests/servers/app/statusbar/Jamfile | 2 +- src/tests/servers/app/textview/Jamfile | 2 +- src/tests/servers/app/view_state/Jamfile | 2 +- src/tests/servers/app/view_transit/Jamfile | 2 +- .../servers/app/workspace_activated/Jamfile | 2 +- src/tests/servers/input/replicant/Jamfile | 2 +- src/tests/servers/registrar/Jamfile | 2 +- src/tests/system/consoled/Jamfile | 2 +- src/tests/system/kernel/Jamfile | 3 +- src/tests/system/libroot/posix/Jamfile | 18 +- .../libroot/posix/bonnie++-1.03d/Jamfile | 4 + src/tools/translation/bitsinfo/Jamfile | 2 +- src/tools/translation/inspector/Jamfile | 2 +- src/tools/translation/pnginfo/Jamfile | 2 +- src/tools/translation/stxtinfo/Jamfile | 2 +- 315 files changed, 819 insertions(+), 641 deletions(-) create mode 100644 headers/glibc/printf.h create mode 100644 src/libs/stdc++/current/Jamfile create mode 100644 src/libs/stdc++/legacy/Jamfile rename src/libs/stdc++/{ => legacy}/PlotFile.cc (100%) rename src/libs/stdc++/{ => legacy}/SFile.cc (100%) rename src/libs/stdc++/{ => legacy}/ansidecl.h (100%) rename src/libs/stdc++/{ => legacy}/basename.c (100%) rename src/libs/stdc++/{ => legacy}/builtinbuf.cc (100%) rename src/libs/stdc++/{ => legacy}/cinst.cc (100%) rename src/libs/stdc++/{ => legacy}/cmathi.cc (100%) rename src/libs/stdc++/{ => legacy}/config.h (100%) rename src/libs/stdc++/{ => legacy}/cstdlibi.cc (100%) rename src/libs/stdc++/{ => legacy}/cstringi.cc (100%) rename src/libs/stdc++/{ => legacy}/editbuf.cc (100%) rename src/libs/stdc++/{ => legacy}/filebuf.cc (100%) rename src/libs/stdc++/{ => legacy}/fstream.cc (100%) rename src/libs/stdc++/{ => legacy}/getpagesize.c (100%) rename src/libs/stdc++/{ => legacy}/indstream.cc (100%) rename src/libs/stdc++/{ => legacy}/insque.c (100%) rename src/libs/stdc++/{ => legacy}/ioassign.cc (100%) rename src/libs/stdc++/{ => legacy}/ioextend.cc (100%) rename src/libs/stdc++/{ => legacy}/iomanip.cc (100%) rename src/libs/stdc++/{ => legacy}/iostream.cc (100%) rename src/libs/stdc++/{ => legacy}/iostreamP.h (100%) rename src/libs/stdc++/{ => legacy}/isgetline.cc (100%) rename src/libs/stdc++/{ => legacy}/isgetsb.cc (100%) rename src/libs/stdc++/{ => legacy}/isscan.cc (100%) rename src/libs/stdc++/{ => legacy}/libiberty.h (100%) rename src/libs/stdc++/{ => legacy}/osform.cc (100%) rename src/libs/stdc++/{ => legacy}/parsestream.cc (100%) rename src/libs/stdc++/{ => legacy}/pfstream.cc (100%) rename src/libs/stdc++/{ => legacy}/procbuf.cc (100%) rename src/libs/stdc++/{ => legacy}/sbform.cc (100%) rename src/libs/stdc++/{ => legacy}/sbgetline.cc (100%) rename src/libs/stdc++/{ => legacy}/sbscan.cc (100%) rename src/libs/stdc++/{ => legacy}/sigsetmask.c (100%) rename src/libs/stdc++/{ => legacy}/sinst.cc (100%) rename src/libs/stdc++/{ => legacy}/stdexcepti.cc (100%) rename src/libs/stdc++/{ => legacy}/stdiostream.cc (100%) rename src/libs/stdc++/{ => legacy}/stdstrbufs.cc (100%) rename src/libs/stdc++/{ => legacy}/stdstreams.cc (100%) rename src/libs/stdc++/{ => legacy}/stlinst.cc (100%) rename src/libs/stdc++/{ => legacy}/stream.cc (100%) rename src/libs/stdc++/{ => legacy}/streambuf.cc (100%) rename src/libs/stdc++/{ => legacy}/strerror.c (100%) rename src/libs/stdc++/{ => legacy}/strstream.cc (100%) rename src/libs/stdc++/{ => legacy}/valarray.cc (100%) rename src/libs/stdc++/{ => legacy}/vfork.c (100%) diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup index 92537c4a2b..7c47b89022 100644 --- a/build/jam/BuildSetup +++ b/build/jam/BuildSetup @@ -394,8 +394,6 @@ HAIKU_LIBRARY_BEGIN_GLUE_CODE = init_term_dyn.o ; HAIKU_LIBRARY_END_GLUE_CODE = - # TODO: For the time being always link against libsupc++.a. - $(HAIKU_STATIC_LIBSUPC++) crtend.o crtn.o ; @@ -434,6 +432,7 @@ HAIKU_BUILD_DESCRIPTION ?= "Unknown Build" ; HAIKU_LIBRARY_NAME_MAP_$(i) = lib$(i).so ; } HAIKU_LIBRARY_NAME_MAP_libstdc++ = $(HAIKU_LIBSTDC++) ; + HAIKU_LIBRARY_NAME_MAP_libsupc++ = $(HAIKU_LIBSUPC++) ; HAIKU_LIBRARY_NAME_MAP_input_server = input_server ; } diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 6dda34cb01..1daff24ab3 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -83,7 +83,7 @@ SYSTEM_LIBS = libbe.so $(HAIKU_SHARED_LIBSTDC++) libmedia.so libtracker.so libmail.so libtextencoding.so libz.so libfreetype.so libpng.so libmidi.so libmidi2.so libdevice.so libgame.so libscreensaver.so libroot.so libGL.so libfluidsynth.so liblpsolve55.so liblinprog.so libalm.so - libilmimf.so libiconv.so liblocale.so + libilmimf.so libiconv.so liblocale.so $(HAIKU_SHARED_LIBSUPC++) ; SYSTEM_SERVERS = registrar debug_server syslog_daemon media_server net_server media_addon_server input_server app_server fake_app_server diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 9083f428ce..6fdc656402 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -54,15 +54,15 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) { # WonderBrush # Yasm +local baseURL = http://haiku-files.org/files/optional-packages ; # APR if [ IsOptionalHaikuImagePackageAdded APR ] { if $(TARGET_ARCH) != x86 { Echo "No optional package APR available for $(TARGET_ARCH)" ; } else { - local baseURL = http://www.haiku-ports.de/packages/dev-libs/apr ; - InstallOptionalHaikuImagePackage apr-1.3.3-gcc2-haiku-2009-05-27 - : $(baseURL)/apr-1.3.3-gcc2-haiku-2009-05-27.zip + InstallOptionalHaikuImagePackage apr-1.3.5-x86-gcc2-2009-07-05 + : $(baseURL)/apr-1.3.5-x86-gcc2-2009-07-05.zip : ; } @@ -74,9 +74,8 @@ if [ IsOptionalHaikuImagePackageAdded APR-util ] { if $(TARGET_ARCH) != x86 { Echo "No optional package APR-util available for $(TARGET_ARCH)" ; } else { - local baseURL = http://www.haiku-ports.de/packages/dev-libs/apr-util ; - InstallOptionalHaikuImagePackage apr-util-1.3.4-gcc2-haiku-2009-05-27 - : $(baseURL)/apr-util-1.3.4-gcc2-haiku-2009-05-27.zip + InstallOptionalHaikuImagePackage apr-util-1.3.7-x86-gcc2-2009-07-05 + : $(baseURL)/apr-util-1.3.7-x86-gcc2-2009-07-05.zip : ; } @@ -90,13 +89,11 @@ if [ IsOptionalHaikuImagePackageAdded Beam ] { } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) { Echo "No optional package Beam available for gcc4" ; } else { - InstallOptionalHaikuImagePackage Beam -# : http://dl.hirschkaefer.de/beam/beam-1-1-2-bone-with-libs.zip - : http://dl.hirschkaefer.de/beam/beam-1-1-2-r5-with-libs.zip + InstallOptionalHaikuImagePackage Beam-1.1.2 + : $(baseURL)/Beam-1.1.2-x86-gcc2-2008-03-27.zip : apps ; AddSymlinkToHaikuImage home config be Applications -# : /boot/apps/beam-1-1-2-bone-with-libs/Beam ; : /boot/apps/beam-1-1-2-r5-with-libs/Beam ; } } @@ -105,7 +102,7 @@ if [ IsOptionalHaikuImagePackageAdded Beam ] { # BeBook if [ IsOptionalHaikuImagePackageAdded BeBook ] { InstallOptionalHaikuImagePackage bebook_20081026 - : http://haiku-files.org/files/optional-packages/bebook_20081026.zip + : $(baseURL)/bebook_20081026.zip : system documentation ; AddSymlinkToHaikuImage home Desktop @@ -120,8 +117,8 @@ if [ IsOptionalHaikuImagePackageAdded BeHappy ] { } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) { Echo "No optional package BeHappy available for gcc4" ; } else { - InstallOptionalHaikuImagePackage BeHappy - : http://revolf.free.fr/beos/behappy-bone.zip + InstallOptionalHaikuImagePackage BeHappy-1.0.6-x86-gcc2-2008-10-16 + : $(baseURL)/BeHappy-1.0.6-x86-gcc2-2008-10-16.zip : ; AddSymlinkToHaikuImage home config be Applications @@ -156,7 +153,7 @@ if [ IsOptionalHaikuImagePackageAdded BePDF ] { Echo "No optional package BePDF available for gcc4" ; } else { InstallOptionalHaikuImagePackage BePDF-1.1.1b1.x86 - : http://haiku-files.org/files/optional-packages/BePDF-1.1.1b1.x86.zip + : $(baseURL)/BePDF-1.1.1b1.x86.zip : apps ; AddSymlinkToHaikuImage home config be Applications @@ -193,9 +190,8 @@ if [ IsOptionalHaikuImagePackageAdded CDRecord ] { if $(TARGET_ARCH) != x86 { Echo "No optional package CDRecord available for $(TARGET_ARCH)" ; } else { - local baseURL = http://www.haiku-ports.de/packages ; - InstallOptionalHaikuImagePackage cdrecord-2.01.01a59-gcc2-haiku-2009-05-26 - : $(baseURL)/app-cdr/cdrtools/cdrecord-2.01.01a59-gcc2-haiku-2009-05-26.zip + InstallOptionalHaikuImagePackage cdrecord-2.01.01a59-x86-gcc2-2009-05-26 + : $(baseURL)/cdrecord-2.01.01a59-x86-gcc2-2009-05-26.zip : ; } @@ -209,8 +205,8 @@ if [ IsOptionalHaikuImagePackageAdded CLucene ] { } else if $(HAIKU_GCC_VERSION[1]) < 4 && ! $(isHybridBuild) { Echo "No optional package CLucene available for GCC2" ; } else { - local baseURL = http://haiku-files.org/files/optional-packages ; - InstallOptionalHaikuImagePackage clucene-0.9.21svn-x86-gcc4-haiku-2009-06-11 + InstallOptionalHaikuImagePackage + clucene-0.9.21svn-x86-gcc4-haiku-2009-06-11 : $(baseURL)/clucene-0.9.21svn-x86-gcc4-haiku-2009-06-11.zip : ; @@ -223,9 +219,8 @@ if [ IsOptionalHaikuImagePackageAdded CVS ] { if $(TARGET_ARCH) != x86 { Echo "No optional package CVS available for $(TARGET_ARCH)" ; } else { - local baseURL = http://haiku-files.org/files/optional-packages ; - InstallOptionalHaikuImagePackage cvs-1.12.13-gcc2-2008-12-04 - : $(baseURL)/cvs-1.12.13-gcc2-2008-12-04.zip + InstallOptionalHaikuImagePackage cvs-1.12.13-x86-gcc2-2009-07-06 + : $(baseURL)/cvs-1.12.13-x86-gcc2-2009-07-06.zip : ; } @@ -235,13 +230,12 @@ if [ IsOptionalHaikuImagePackageAdded CVS ] { # Development if [ IsOptionalHaikuImagePackageAdded Development ] && $(TARGET_ARCH) = x86 { # autotools - local baseURL = http://haiku-files.org/files/optional-packages ; InstallOptionalHaikuImagePackage autoconf-2.63-gcc2-2008-11-05 : $(baseURL)/autoconf-2.63-gcc2-2008-11-05.zip ; InstallOptionalHaikuImagePackage automake-1.10.1-gcc2-2008-11-06 : $(baseURL)/automake-1.10.1-gcc2-2008-11-06.zip ; - InstallOptionalHaikuImagePackage libtool-2.2.6a-gcc2-2008-11-09 - : $(baseURL)/libtool-2.2.6a-gcc2-2008-11-09.zip ; + InstallOptionalHaikuImagePackage libtool-2.2.6a-x86-gcc2-2009-07-05 + : $(baseURL)/libtool-2.2.6a-x86-gcc2-2009-07-05.zip ; InstallOptionalHaikuImagePackage texinfo-4.13a-gcc2-2008-11-09 : $(baseURL)/texinfo-4.13a-gcc2-2008-11-09.zip ; } @@ -252,42 +246,28 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ] && $(TARGET_ARCH) = x86 { # gcc and binutils if $(HAIKU_GCC_VERSION[1]) = 2 || $(isHybridBuild) { - local baseURL = http://haiku-files.org/files/optional-packages ; - InstallOptionalHaikuImagePackage gcc-2.95.3-haiku-081024-1 - : $(baseURL)/gcc-2.95.3-haiku-081024-1.zip ; + InstallOptionalHaikuImagePackage gcc-2.95.3-x86-gcc2-2009-06-29 + : $(baseURL)/gcc-2.95.3-x86-gcc2-2009-06-29.zip ; } if $(HAIKU_GCC_VERSION[1]) = 4 || $(isHybridBuild) { - local baseURL = http://haiku-files.org/files/optional-packages ; - InstallOptionalHaikuImagePackage gcc-4.3.3-haiku-090313-1 - : $(baseURL)/gcc-4.3.3-haiku-090313-1.zip ; + InstallOptionalHaikuImagePackage gcc-4.3.3-x86-gcc4-2009-06-29 + : $(baseURL)/gcc-4.3.3-x86-gcc4-2009-06-29.zip ; # symlink cpp to g++'s headers AddSymlinkToHaikuImage develop abi x86 gcc4 headers : ../tools/current/include/g++ : cpp ; } - if $(HAIKU_GCC_VERSION[1]) = 4 { - # symlink to libstdc++.so - # TODO: This needs to be solved differently! I.e. the build system - # (configure) should already produce libstdc++.so. - AddSymlinkToHaikuImage system lib - : /boot/develop/abi/x86/gcc4/tools/current/lib/libstdc++.so ; - AddSymlinkToAlternativeGCCArchive system lib gcc4 - : /boot/develop/abi/x86/gcc4/tools/current/lib/libstdc++.so ; - } - # other commonly used tools - local baseURL = http://haiku-files.org/files/optional-packages ; - InstallOptionalHaikuImagePackage bison-2.4-gcc2-2008-11-09 - : $(baseURL)/bison-2.4-gcc2-2008-11-09.zip ; + InstallOptionalHaikuImagePackage bison-2.4.1-x86-gcc2-2009-07-05 + : $(baseURL)/bison-2.4.1-x86-gcc2-2009-07-05.zip ; InstallOptionalHaikuImagePackage m4-1.4.12-gcc2-2008-11-04 : $(baseURL)/m4-1.4.12-gcc2-2008-11-04.zip ; - local baseURL = http://www.haiku-ports.de/packages ; - InstallOptionalHaikuImagePackage flex-2.5.35-gcc2-haiku-2009-05-26 - : $(baseURL)/sys-devel/flex/flex-2.5.35-gcc2-haiku-2009-05-26.zip ; - InstallOptionalHaikuImagePackage jam-gcc2-haiku-2009-05-26 - : $(baseURL)/dev-util/jam/jam-gcc2-haiku-2009-05-26.zip ; + InstallOptionalHaikuImagePackage flex-2.5.35-x86-gcc2-2009-07-05 + : $(baseURL)/flex-2.5.35-x86-gcc2-2009-07-05.zip ; + InstallOptionalHaikuImagePackage jam-2.5-x86-gcc2-2009-05-26 + : $(baseURL)/jam-2.5-x86-gcc2-2009-05-26.zip ; } @@ -364,13 +344,10 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 { # headers AddHeaderDirectoryToHaikuImage gnu : 3rdparty ; + AddHeaderDirectoryToHaikuImage glibc ; AddHeaderDirectoryToHaikuImage os ; AddHeaderDirectoryToHaikuImage posix ; - # add _G_config.h to posix/ - SEARCH on
_G_config.h = [ FDirName $(HAIKU_TOP) headers glibc ] ; - AddFilesToHaikuImage develop headers posix :
_G_config.h ; - # create be -> os symlink for now AddSymlinkToHaikuImage develop headers : os : be ; @@ -400,8 +377,8 @@ if [ IsOptionalHaikuImagePackageAdded Firefox ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Firefox available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) { - local baseURL = http://haiku-files.org/files/optional-packages ; - InstallOptionalHaikuImagePackage BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01 + InstallOptionalHaikuImagePackage + BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01 : $(baseURL)/BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01.zip : apps ; @@ -425,17 +402,17 @@ if [ IsOptionalHaikuImagePackageAdded KeymapSwitcher ] { if $(TARGET_ARCH) != x86 { Echo "No optional package KeymapSwitcher available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) { - local baseURL = http://downloads.sourceforge.net/dotmatrix4beos ; - InstallOptionalHaikuImagePackage KeymapSwitcher-gcc4-20090531 - : $(baseURL)/KeymapSwitcher-1.2.3-gcc4-2009-05-31.zip + InstallOptionalHaikuImagePackage + KeymapSwitcher-1.2.3-x86-gcc4-2009-05-31 + : $(baseURL)/KeymapSwitcher-1.2.3-x86-gcc4-2009-05-31.zip : ; AddSymlinkToHaikuImage home config be Desktop\ Applets : /boot/common/bin/KeymapSwitcher ; } else { - local baseURL = http://downloads.sourceforge.net/dotmatrix4beos ; - InstallOptionalHaikuImagePackage KeymapSwitcher-gcc2-20090531 - : $(baseURL)/KeymapSwitcher-1.2.3-gcc2-2009-05-31.zip + InstallOptionalHaikuImagePackage + KeymapSwitcher-1.2.3-x86-gcc2-2009-05-31 + : $(baseURL)/KeymapSwitcher-1.2.3-x86-gcc2-2009-05-31.zip : ; AddSymlinkToHaikuImage home config be Desktop\ Applets @@ -449,9 +426,8 @@ if [ IsOptionalHaikuImagePackageAdded LibIconv ] { if $(TARGET_ARCH) != x86 { Echo "No optional package LibIconv available for $(TARGET_ARCH)" ; } else { - local baseURL = http://www.haiku-ports.de/packages/dev-libs/libiconv ; - InstallOptionalHaikuImagePackage libiconv-1.13-gcc2-haiku-2009-05-27 - : $(baseURL)/libiconv-1.13-gcc2-haiku-2009-05-27.zip + InstallOptionalHaikuImagePackage libiconv-1.13-x86-gcc2-2009-07-05 + : $(baseURL)/libiconv-1.13-x86-gcc2-2009-07-05.zip : ; } @@ -465,7 +441,6 @@ if [ IsOptionalHaikuImagePackageAdded LibLayout ] { } else if $(HAIKU_GCC_VERSION[1]) >= 4 { Echo "No optional package LibLayout available for gcc4" ; } else { - local baseURL = http://haiku-files.org/files/optional-packages ; InstallOptionalHaikuImagePackage liblayout-1.4.0-gcc2-2009-03-08 : $(baseURL)/liblayout-1.4.0-gcc2-2009-03-08.zip : @@ -479,9 +454,8 @@ if [ IsOptionalHaikuImagePackageAdded LibXML2 ] { if $(TARGET_ARCH) != x86 { Echo "No optional package LibXML2 available for $(TARGET_ARCH)" ; } else { - local baseURL = http://www.haiku-ports.de/packages/dev-libs/libxml2 ; - InstallOptionalHaikuImagePackage libxml2-2.7.3-gcc2-haiku-2009-05-27 - : $(baseURL)/libxml2-2.7.3-gcc2-haiku-2009-05-27.zip + InstallOptionalHaikuImagePackage libxml2-2.7.3-x86-gcc2-2009-07-06 + : $(baseURL)/libxml2-2.7.3-x86-gcc2-2009-07-06.zip : ; } @@ -496,7 +470,7 @@ if [ IsOptionalHaikuImagePackageAdded Links ] { Echo "No optional package Links available for gcc4" ; } else { InstallOptionalHaikuImagePackage Links - : http://revolf.free.fr/beos/links-beos-bin.zip + : $(baseURL)/links-x86-gcc2-2008-05-03.zip : ; AddSymlinkToHaikuImage home config be Applications @@ -510,9 +484,8 @@ if [ IsOptionalHaikuImagePackageAdded Nano ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Nano available for $(TARGET_ARCH)" ; } else { - local baseURL = http://www.haiku-ports.de/packages ; - InstallOptionalHaikuImagePackage nano-2.0.9-gcc2-haiku-2009-05-27 - : $(baseURL)/app-editors/nano/nano-2.0.9-gcc2-haiku-2009-05-27.zip + InstallOptionalHaikuImagePackage nano-2.0.9-x86-gcc2-2009-07-06 + : $(baseURL)/nano-2.0.9-x86-gcc2-2009-07-06.zip : ; } @@ -524,9 +497,8 @@ if [ IsOptionalHaikuImagePackageAdded Neon ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Neon available for $(TARGET_ARCH)" ; } else { - local baseURL = http://www.haiku-ports.de/packages/net-misc/neon ; - InstallOptionalHaikuImagePackage neon-0.28.4-gcc2-haiku-2009-05-23 - : $(baseURL)/neon-0.28.4-gcc2-haiku-2009-05-23.zip + InstallOptionalHaikuImagePackage neon-0.28.5-x86-gcc2-2009-07-06 + : $(baseURL)/neon-0.28.5-x86-gcc2-2009-07-06.zip : ; } @@ -540,8 +512,8 @@ if [ IsOptionalHaikuImagePackageAdded NetSurf ] { } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) { Echo "No optional package NetSurf available for gcc4" ; } else { - InstallOptionalHaikuImagePackage NetSurf - : http://haiku-files.org/files/optional-packages/NetSurf-r7117-x86-gcc2-2009-04-17.zip + InstallOptionalHaikuImagePackage NetSurf-r7117 + : $(baseURL)/NetSurf-r7117-x86-gcc2-2009-04-17.zip : ; AddSymlinkToHaikuImage home config be Applications @@ -556,7 +528,7 @@ if [ IsOptionalHaikuImagePackageAdded OpenSound ] { Echo "No optional package OpenSound available for $(TARGET_ARCH)" ; } else { InstallOptionalHaikuImagePackage OpenSound - : http://www.yellowbites.com/downloads/OpenSound_Haiku20080621.zip + : $(baseURL)/OpenSound-x86-gcc2-2008-06-21.zip : ; } @@ -574,9 +546,8 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSH ] { "variable to be set!" ; } - local baseURL = http://www.haiku-ports.de/packages/net-misc/openssh ; - InstallOptionalHaikuImagePackage openssh-5.2p1-gcc2-haiku-2009-05-27 - : $(baseURL)/openssh-5.2p1-gcc2-haiku-2009-05-27.zip + InstallOptionalHaikuImagePackage openssh-5.2p1-x86-gcc2-2009-05-27 + : $(baseURL)/openssh-5.2p1-x86-gcc2-2009-05-27.zip : ; @@ -606,9 +577,8 @@ if [ IsOptionalHaikuImagePackageAdded P7zip ] { } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) { Echo "No optional package P7zip available for gcc4" ; } else { - local baseURL = http://www.haiku-ports.de/packages/app-arch/p7zip ; - InstallOptionalHaikuImagePackage p7zip-4.65-gcc2-haiku-2009-05-24 - : $(baseURL)/p7zip-4.65-gcc2-haiku-2009-05-24.zip + InstallOptionalHaikuImagePackage p7zip-4.65-x86-gcc2-2009-05-24 + : $(baseURL)/p7zip-4.65-x86-gcc2-2009-05-24.zip : ; @@ -630,16 +600,13 @@ if [ IsOptionalHaikuImagePackageAdded Pe ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Pe available for $(TARGET_ARCH)" ; } else { - local baseURL = http://haiku-files.org/files/optional-packages ; if $(HAIKU_GCC_VERSION[1]) >= 4 { - InstallOptionalHaikuImagePackage pe-2.4.1-x86-rc3-gcc4-2009-03-27 - : $(baseURL)/pe-2.4.1-x86-rc3-gcc4-2009-03-27.zip - : apps + InstallOptionalHaikuImagePackage Pe-2.4.2-x86-gcc4-2009-07-05 + : $(baseURL)/Pe-2.4.2-x86-gcc4-2009-07-05.zip ; } else { - InstallOptionalHaikuImagePackage pe-2.4.2-x86-gcc2-2009-04-14 - : $(baseURL)/pe-2.4.2-x86-gcc2-2009-04-14.zip - : apps + InstallOptionalHaikuImagePackage Pe-2.4.2-x86-gcc2-2009-07-05 + : $(baseURL)/Pe-2.4.2-x86-gcc2-2009-07-05.zip ; } @@ -656,7 +623,6 @@ if [ IsOptionalHaikuImagePackageAdded Perl ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Perl available for $(TARGET_ARCH)" ; } else { - local baseURL = http://haiku-files.org/files/optional-packages ; InstallOptionalHaikuImagePackage perl-5.10.0-gcc2-2008-10-29 : $(baseURL)/perl-5.10.0-gcc2-2008-10-29.zip : @@ -670,9 +636,8 @@ if [ IsOptionalHaikuImagePackageAdded Python ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Python available for $(TARGET_ARCH)" ; } else { - local baseURL = http://www.haiku-ports.de/packages/dev-lang/python ; - InstallOptionalHaikuImagePackage python-2.6.2-gcc2-haiku-2009-05-27 - : $(baseURL)/python-2.6.2-gcc2-haiku-2009-05-27.zip + InstallOptionalHaikuImagePackage python-2.6.2-x86-gcc2-2009-05-27 + : $(baseURL)/python-2.6.2-x86-gcc2-2009-05-27.zip : ; } @@ -684,9 +649,8 @@ if [ IsOptionalHaikuImagePackageAdded SQLite ] { if $(TARGET_ARCH) != x86 { Echo "No optional package SQLite available for $(TARGET_ARCH)" ; } else { - local baseURL = http://www.haiku-ports.de/packages/dev-db/sqlite ; - InstallOptionalHaikuImagePackage sqlite-3.6.14-gcc2-haiku-2009-05-10 - : $(baseURL)/sqlite-3.6.14-gcc2-haiku-2009-05-10.zip + InstallOptionalHaikuImagePackage sqlite-3.6.16-x86-gcc2-2009-07-06 + : $(baseURL)/sqlite-3.6.16-x86-gcc2-2009-07-06.zip : ; } @@ -698,9 +662,8 @@ if [ IsOptionalHaikuImagePackageAdded Rsync ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Rsync available for $(TARGET_ARCH)" ; } else { - local baseURL = http://dl.hirschkaefer.de/haiku ; - InstallOptionalHaikuImagePackage rsync-3.0.6-gcc2-haiku-2009-05-26 - : $(baseURL)/rsync-3.0.6-gcc2-haiku-2009-05-26.zip + InstallOptionalHaikuImagePackage rsync-3.0.6-x86-gcc2-2009-05-26 + : $(baseURL)/rsync-3.0.6-x86-gcc2-2009-05-26.zip : ; } @@ -712,9 +675,8 @@ if [ IsOptionalHaikuImagePackageAdded Subversion ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Subversion available for $(TARGET_ARCH)" ; } else { - local baseURL = http://www.haiku-ports.de/packages/dev-util/subversion ; - InstallOptionalHaikuImagePackage subversion-1.6.2-gcc2-haiku-2009-05-20 - : $(baseURL)/subversion-1.6.2-gcc2-haiku-2009-05-20.zip + InstallOptionalHaikuImagePackage subversion-1.6.2-x86-gcc2-2009-05-20 + : $(baseURL)/subversion-1.6.2-x86-gcc2-2009-05-20.zip : ; } @@ -723,15 +685,14 @@ if [ IsOptionalHaikuImagePackageAdded Subversion ] { # Tar if [ IsOptionalHaikuImagePackageAdded Tar ] { - if $(TARGET_ARCH) != x86 { - Echo "No optional package Tar available for $(TARGET_ARCH)" ; - } else { - local baseURL = http://haiku-files.org/files/optional-packages ; - InstallOptionalHaikuImagePackage tar-1.21-gcc2-2009-02-08 - : $(baseURL)/tar-1.21-gcc2-2009-02-08.zip - : - ; - } + if $(TARGET_ARCH) != x86 { + Echo "No optional package Tar available for $(TARGET_ARCH)" ; + } else { + InstallOptionalHaikuImagePackage tar-1.21-gcc2-2009-02-08 + : $(baseURL)/tar-1.21-gcc2-2009-02-08.zip + : + ; + } } @@ -793,17 +754,15 @@ if [ IsOptionalHaikuImagePackageAdded Vim ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Vim available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) { - local baseURL = http://haiku-ports.de/packages/app-editors/vim ; - InstallOptionalHaikuImagePackage vim-7.2-gcc4-20090531 - : $(baseURL)/vim-7.2-gcc4-haiku-2009-05-31.zip + InstallOptionalHaikuImagePackage vim-7.2-x86-gcc4-2009-05-31 + : $(baseURL)/vim-7.2-x86-gcc4-2009-05-31.zip : ; AddSymlinkToHaikuImage home config be Applications : /boot/common/bin/gvim ; } else { - local baseURL = http://haiku-ports.de/packages/app-editors/vim ; - InstallOptionalHaikuImagePackage vim-7.2-gcc2-20090531 - : $(baseURL)/vim-7.2-gcc2-haiku-2009-05-31.zip + InstallOptionalHaikuImagePackage vim-7.2-x86-gcc2-2009-05-31 + : $(baseURL)/vim-7.2-x86-gcc2-2009-05-31.zip : ; AddSymlinkToHaikuImage home config be Applications @@ -817,15 +776,15 @@ if [ IsOptionalHaikuImagePackageAdded Vision ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Vision available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { - InstallOptionalHaikuImagePackage Vision-0.9.7-H-090423-gcc4 - : http://vision.sf.net/Vision-0.9.7-H-090423-gcc4.zip + InstallOptionalHaikuImagePackage Vision-0.9.7-H-090423 + : $(baseURL)/Vision-0.9.7-H-x86-gcc4-2009-04-23.zip : apps ; AddSymlinkToHaikuImage home config be Applications : /boot/apps/Vision-0.9.7-H-090423/Vision ; } else { InstallOptionalHaikuImagePackage Vision-0.9.7-H-090423 - : http://vision.sf.net/Vision-0.9.7-H-090423.zip + : $(baseURL)/Vision-0.9.7-H-x86-gcc2-2009-04-23.zip : apps ; AddSymlinkToHaikuImage home config be Applications @@ -841,7 +800,6 @@ if [ IsOptionalHaikuImagePackageAdded VLC ] { } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) { Echo "No optional package VLC available for gcc4" ; } else { - local baseURL = http://haiku-files.org/files/optional-packages ; InstallOptionalHaikuImagePackage VLC-0.8.6d : $(baseURL)/vlc-0.8.6d-gcc2-2009-04-18.zip : apps @@ -877,9 +835,8 @@ if [ IsOptionalHaikuImagePackageAdded WonderBrush ] { } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) { Echo "No optional package WonderBrush available for gcc4" ; } else { - local baseURL = http://www.yellowbites.com/downloads ; - InstallOptionalHaikuImagePackage WonderBrush-2.1.2-Haiku - : $(baseURL)/WonderBrush-2.1.2-gcc2-x86-Haiku.zip + InstallOptionalHaikuImagePackage WonderBrush-2.1.2 + : $(baseURL)/WonderBrush-2.1.2-x86-gcc2-2008-11-08.zip : apps ; AddSymlinkToHaikuImage home config be Applications @@ -893,9 +850,8 @@ if [ IsOptionalHaikuImagePackageAdded Yasm ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Yasm available for $(TARGET_ARCH)" ; } else { - local baseURL = http://haiku-files.org/files/optional-packages ; - InstallOptionalHaikuImagePackage yasm-0.8.0-gcc2-2009-04-19 - : $(baseURL)/yasm-0.8.0-gcc2-haiku-2009-04-19.zip + InstallOptionalHaikuImagePackage yasm-0.8.0-x86-gcc2-2009-07-06 + : $(baseURL)/yasm-0.8.0-x86-gcc2-2009-07-06.zip : ; } diff --git a/build/scripts/build_cross_tools b/build/scripts/build_cross_tools index 9aa19e9f29..7233047377 100755 --- a/build/scripts/build_cross_tools +++ b/build/scripts/build_cross_tools @@ -90,7 +90,7 @@ copy_headers() done } -copy_headers $haikuSourceDir/headers/os $tmpIncludeDir/be +copy_headers $haikuSourceDir/headers/os $tmpIncludeDir/os copy_headers $haikuSourceDir/headers/posix $tmpIncludeDir/posix # configure gcc diff --git a/configure b/configure index d607b64d47..50413b1da1 100755 --- a/configure +++ b/configure @@ -180,15 +180,17 @@ standard_gcc_settings() if [ $haikuStaticLibStdCxx = libstdc++.a ]; then haikuStaticLibStdCxx= fi - if [ $haikuSharedLibStdCxx = libstdc++.so ]; then - haikuSharedLibStdCxx= - fi + # we build libstdc++.so ourselves, so we can leave it as is + # if [ $haikuSharedLibStdCxx = libstdc++.so ]; then + # haikuSharedLibStdCxx= + # fi if [ $haikuStaticLibSupCxx = libsupc++.a ]; then haikuStaticLibSupCxx= fi - if [ $haikuSharedLibSupCxx = libsupc++.so ]; then - haikuSharedLibSupCxx= - fi + # we build libsupc++.so ourselves, so we can leave it as is + # if [ $haikuSharedLibSupCxx = libsupc++.so ]; then + # haikuSharedLibSupCxx= + # fi ;; 2.9*) # check for correct (most up-to-date) legacy compiler and complain @@ -272,7 +274,7 @@ buildCrossToolsMachine= alternativeGCCOutputDir= addAlternativeGCCLibs= -haikuRequiredLegacyGCCVersion="2.95.3-haiku-081024" +haikuRequiredLegacyGCCVersion="2.95.3-haiku-090629" export haikuRequiredLegacyGCCVersion # version of legacy gcc required to build haiku diff --git a/data/system/boot/SetupEnvironment b/data/system/boot/SetupEnvironment index 1255f88aaa..e4393ae42d 100644 --- a/data/system/boot/SetupEnvironment +++ b/data/system/boot/SetupEnvironment @@ -24,7 +24,7 @@ esac BELIBRARIES="$BUILDHOME/abi/current/library-paths/common:$BUILDHOME/lib/$BE_HOST_CPU" BH=$BUILDHOME/headers -BEINCLUDES="$BH;$BH/be;$BH/be/precompiled;$BH/be/bone;$BH/posix;$BH/cpp;$BH/be/app;$BH/be/device;$BH/be/interface;$BH/be/media;$BH/be/midi;$BH/be/midi2;$BH/be/net;$BH/be/kernel;$BH/be/storage;$BH/be/support;$BH/be/game;$BH/be/opengl;$BH/be/drivers;$BH/gnu;$BH/be/mail;$BH/be/translation;$BH/be/devel;$BH/be/add-ons/graphics;$BH/be/be_apps/Deskbar;$BH/be/be_apps/NetPositive;$BH/be/be_apps/Tracker" +BEINCLUDES="$BH;$BH/be;$BH/posix;$BH/glibc;$BH/cpp;$BH/be/app;$BH/be/device;$BH/be/interface;$BH/be/media;$BH/be/midi;$BH/be/midi2;$BH/be/net;$BH/be/kernel;$BH/be/storage;$BH/be/support;$BH/be/game;$BH/be/opengl;$BH/be/drivers;$BH/gnu;$BH/be/mail;$BH/be/translation;$BH/be/devel;$BH/be/add-ons/graphics;$BH/be/be_apps/Deskbar;$BH/be/be_apps/NetPositive;$BH/be/be_apps/Tracker" export BUILDHOME export BETOOLS diff --git a/headers/glibc/printf.h b/headers/glibc/printf.h new file mode 100644 index 0000000000..c16569b59b --- /dev/null +++ b/headers/glibc/printf.h @@ -0,0 +1,145 @@ +/* Copyright (C) 1991-1993,1995-1999,2000,2001 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#ifndef _PRINTF_H + +#define _PRINTF_H 1 +#include + +__BEGIN_DECLS + +#define __need_FILE +#include +#define __need_size_t +#define __need_wchar_t +#include + + +struct printf_info +{ + int prec; /* Precision. */ + int width; /* Width. */ + wchar_t spec; /* Format letter. */ + unsigned int is_long_double:1;/* L flag. */ + unsigned int is_short:1; /* h flag. */ + unsigned int is_long:1; /* l flag. */ + unsigned int alt:1; /* # flag. */ + unsigned int space:1; /* Space flag. */ + unsigned int left:1; /* - flag. */ + unsigned int showsign:1; /* + flag. */ + unsigned int group:1; /* ' flag. */ + unsigned int extra:1; /* For special use. */ + unsigned int is_char:1; /* hh flag. */ + unsigned int wide:1; /* Nonzero for wide character streams. */ + unsigned int i18n:1; /* I flag. */ + wchar_t pad; /* Padding character. */ +}; + + +/* Type of a printf specifier-handler function. + STREAM is the FILE on which to write output. + INFO gives information about the format specification. + ARGS is a vector of pointers to the argument data; + the number of pointers will be the number returned + by the associated arginfo function for the same INFO. + + The function should return the number of characters written, + or -1 for errors. */ + +typedef int printf_function (FILE *__stream, + __const struct printf_info *__info, + __const void *__const *__args); + +/* Type of a printf specifier-arginfo function. + INFO gives information about the format specification. + N, ARGTYPES, and return value are as for parse_printf_format. */ + +typedef int printf_arginfo_function (__const struct printf_info *__info, + size_t __n, int *__argtypes); + + +/* Register FUNC to be called to format SPEC specifiers; ARGINFO must be + specified to determine how many arguments a SPEC conversion requires and + what their types are. */ + +extern int register_printf_function (int __spec, printf_function __func, + printf_arginfo_function __arginfo); + + +/* Parse FMT, and fill in N elements of ARGTYPES with the + types needed for the conversions FMT specifies. Returns + the number of arguments required by FMT. + + The ARGINFO function registered with a user-defined format is passed a + `struct printf_info' describing the format spec being parsed. A width + or precision of INT_MIN means a `*' was used to indicate that the + width/precision will come from an arg. The function should fill in the + array it is passed with the types of the arguments it wants, and return + the number of arguments it wants. */ + +extern size_t parse_printf_format (__const char *__restrict __fmt, size_t __n, + int *__restrict __argtypes) __THROW; + + +/* Codes returned by `parse_printf_format' for basic types. + + These values cover all the standard format specifications. + Users can add new values after PA_LAST for their own types. */ + +enum +{ /* C type: */ + PA_INT, /* int */ + PA_CHAR, /* int, cast to char */ + PA_WCHAR, /* wide char */ + PA_STRING, /* const char *, a '\0'-terminated string */ + PA_WSTRING, /* const wchar_t *, wide character string */ + PA_POINTER, /* void * */ + PA_FLOAT, /* float */ + PA_DOUBLE, /* double */ + PA_LAST +}; + +/* Flag bits that can be set in a type returned by `parse_printf_format'. */ +#define PA_FLAG_MASK 0xff00 +#define PA_FLAG_LONG_LONG (1 << 8) +#define PA_FLAG_LONG_DOUBLE PA_FLAG_LONG_LONG +#define PA_FLAG_LONG (1 << 9) +#define PA_FLAG_SHORT (1 << 10) +#define PA_FLAG_PTR (1 << 11) + + + +/* Function which can be registered as `printf'-handlers. */ + +/* Print floating point value using using abbreviations for the orders + of magnitude used for numbers ('k' for kilo, 'm' for mega etc). If + the format specifier is a uppercase character powers of 1000 are + used. Otherwise powers of 1024. */ +extern int printf_size (FILE *__restrict __fp, + __const struct printf_info *__info, + __const void *__const *__restrict __args) __THROW; + +/* This is the appropriate argument information function for `printf_size'. */ +extern int printf_size_info (__const struct printf_info *__restrict + __info, size_t __n, int *__restrict __argtypes) + __THROW; + + +__END_DECLS + +#endif /* printf.h */ diff --git a/src/add-ons/disk_systems/bfs/Jamfile b/src/add-ons/disk_systems/bfs/Jamfile index 1850fe136b..77ecc3cb6b 100644 --- a/src/add-ons/disk_systems/bfs/Jamfile +++ b/src/add-ons/disk_systems/bfs/Jamfile @@ -10,5 +10,5 @@ Addon bfs : bfs_disk_system.cpp - : be + : be $(TARGET_LIBSUPC++) ; diff --git a/src/add-ons/disk_systems/intel/Jamfile b/src/add-ons/disk_systems/intel/Jamfile index ee934e7d35..bf1639409c 100644 --- a/src/add-ons/disk_systems/intel/Jamfile +++ b/src/add-ons/disk_systems/intel/Jamfile @@ -20,5 +20,5 @@ Addon intel : # kernel sources PartitionMap.cpp - : be + : be $(TARGET_LIBSUPC++) ; diff --git a/src/add-ons/input_server/devices/keyboard/Jamfile b/src/add-ons/input_server/devices/keyboard/Jamfile index 2aee21b75a..9281a1ac04 100644 --- a/src/add-ons/input_server/devices/keyboard/Jamfile +++ b/src/add-ons/input_server/devices/keyboard/Jamfile @@ -12,7 +12,7 @@ Addon keyboard : TeamMonitorWindow.cpp TeamListItem.cpp - : input_server be ; + : input_server be $(TARGET_LIBSUPC++) ; Package haiku-inputkit-cvs : keyboard : diff --git a/src/add-ons/input_server/devices/mouse/Jamfile b/src/add-ons/input_server/devices/mouse/Jamfile index 26a44521af..55bbfbb4d4 100644 --- a/src/add-ons/input_server/devices/mouse/Jamfile +++ b/src/add-ons/input_server/devices/mouse/Jamfile @@ -6,7 +6,7 @@ UsePrivateHeaders input shared ; Addon mouse : MouseInputDevice.cpp - : be input_server ; + : be input_server $(TARGET_LIBSUPC++) ; Package haiku-inputkit-cvs : mouse : diff --git a/src/add-ons/input_server/devices/wacom/Jamfile b/src/add-ons/input_server/devices/wacom/Jamfile index e704b4aa20..cebcbe67eb 100644 --- a/src/add-ons/input_server/devices/wacom/Jamfile +++ b/src/add-ons/input_server/devices/wacom/Jamfile @@ -10,7 +10,7 @@ Addon wacom : PointingDevice.cpp PointingDeviceFactory.cpp TabletDevice.cpp - : be input_server ; + : be input_server $(TARGET_LIBSUPC++) ; Package haiku-inputkit-cvs : tablet : diff --git a/src/add-ons/input_server/filters/screen_saver/Jamfile b/src/add-ons/input_server/filters/screen_saver/Jamfile index fedfe33195..3525d42242 100644 --- a/src/add-ons/input_server/filters/screen_saver/Jamfile +++ b/src/add-ons/input_server/filters/screen_saver/Jamfile @@ -6,7 +6,7 @@ UsePrivateHeaders screen_saver ; Addon screen_saver : ScreenSaverFilter.cpp - : be libscreensaver.so input_server ; + : be libscreensaver.so input_server $(TARGET_LIBSUPC++) ; Package haiku-screensaverkit-cvs : screen_saver : diff --git a/src/add-ons/input_server/methods/canna/Jamfile b/src/add-ons/input_server/methods/canna/Jamfile index 193cface1f..ef0e7f517c 100644 --- a/src/add-ons/input_server/methods/canna/Jamfile +++ b/src/add-ons/input_server/methods/canna/Jamfile @@ -17,7 +17,7 @@ Addon canna : CannaMethod.cpp KouhoWindow.cpp PaletteWindow.cpp - : be textencoding input_server libcanna.a librk.a ; + : be textencoding input_server libcanna.a librk.a $(TARGET_LIBSUPC++) ; Package haiku-cannaIM-cvs : canna : diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/Jamfile b/src/add-ons/kernel/file_systems/userlandfs/server/Jamfile index 7d2fb773b7..91198c6275 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/Jamfile +++ b/src/add-ons/kernel/file_systems/userlandfs/server/Jamfile @@ -43,6 +43,7 @@ Application userlandfs_server : be + $(TARGET_LIBSUPC++) ; HaikuSubInclude beos ; diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/beos/Jamfile b/src/add-ons/kernel/file_systems/userlandfs/server/beos/Jamfile index bc49178f14..0d01508c58 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/beos/Jamfile +++ b/src/add-ons/kernel/file_systems/userlandfs/server/beos/Jamfile @@ -27,4 +27,5 @@ SharedLibrary libuserlandfs_beos_kernel.so : userlandfs_server + $(TARGET_LIBSUPC++) ; diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/fuse/Jamfile b/src/add-ons/kernel/file_systems/userlandfs/server/fuse/Jamfile index 67d6c6ff12..ad2ea40d62 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/fuse/Jamfile +++ b/src/add-ons/kernel/file_systems/userlandfs/server/fuse/Jamfile @@ -29,5 +29,5 @@ SharedLibrary libuserlandfs_fuse.so FUSEVolume.cpp : - userlandfs_server libshared.a be + userlandfs_server libshared.a be $(TARGET_LIBSUPC++) ; diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/Jamfile b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/Jamfile index a8eedcfb26..76ffab0347 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/Jamfile +++ b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/Jamfile @@ -51,6 +51,7 @@ SharedLibrary libuserlandfs_haiku_kernel.so : userlandfs_server be # for BLocker only + $(TARGET_LIBSUPC++) ; SEARCH on [ FGristFiles diff --git a/src/add-ons/locale/catalogs/zeta/Jamfile b/src/add-ons/locale/catalogs/zeta/Jamfile index 78d62cc5de..e6c9edf543 100644 --- a/src/add-ons/locale/catalogs/zeta/Jamfile +++ b/src/add-ons/locale/catalogs/zeta/Jamfile @@ -4,5 +4,5 @@ UsePublicHeaders locale ; Addon zeta : Catalog.cpp - : be liblocale.so + : be liblocale.so $(TARGET_LIBSUPC++) ; diff --git a/src/add-ons/locale/collators/Jamfile b/src/add-ons/locale/collators/Jamfile index e23568becc..b90c300bd4 100644 --- a/src/add-ons/locale/collators/Jamfile +++ b/src/add-ons/locale/collators/Jamfile @@ -12,11 +12,11 @@ Depends LocaleKitCollatorAddons Addon GermanDIN-2 : GermanDIN-2.cpp - : be liblocale.so + : be liblocale.so $(TARGET_LIBSUPC++) ; Addon French : French.cpp - : be liblocale.so + : be liblocale.so $(TARGET_LIBSUPC++) ; diff --git a/src/add-ons/mail_daemon/inbound_filters/match_header/Jamfile b/src/add-ons/mail_daemon/inbound_filters/match_header/Jamfile index 3e76c7be68..5b8e28b976 100644 --- a/src/add-ons/mail_daemon/inbound_filters/match_header/Jamfile +++ b/src/add-ons/mail_daemon/inbound_filters/match_header/Jamfile @@ -17,7 +17,7 @@ Addon Match\ Header : StringMatcher.cpp ; LinkAgainst Match\ Header : - be libmail.so ; + be libmail.so $(TARGET_LIBSUPC++) ; Package haiku-maildaemon-cvs : Match\ Header : diff --git a/src/add-ons/mail_daemon/inbound_filters/r5_filter/Jamfile b/src/add-ons/mail_daemon/inbound_filters/r5_filter/Jamfile index dd0aa4f6bd..9fcb651e2a 100644 --- a/src/add-ons/mail_daemon/inbound_filters/r5_filter/Jamfile +++ b/src/add-ons/mail_daemon/inbound_filters/r5_filter/Jamfile @@ -15,7 +15,7 @@ Addon R5\ Daemon\ Filter : filter.cpp ; LinkAgainst R5\ Daemon\ Filter : - be libmail.so ; + be libmail.so $(TARGET_LIBSUPC++) ; Package haiku-maildaemon-cvs : R5\ Daemon\ Filter : diff --git a/src/add-ons/mail_daemon/inbound_filters/spam_filter/Jamfile b/src/add-ons/mail_daemon/inbound_filters/spam_filter/Jamfile index 381f149dbd..52809713b1 100644 --- a/src/add-ons/mail_daemon/inbound_filters/spam_filter/Jamfile +++ b/src/add-ons/mail_daemon/inbound_filters/spam_filter/Jamfile @@ -16,7 +16,7 @@ Addon Spam\ Filter : SpamFilter.cpp ; LinkAgainst Spam\ Filter : - be libmail.so ; + be libmail.so $(TARGET_LIBSUPC++) ; Package haiku-maildaemon-cvs : Spam\ Filter : diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile b/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile index 7e8a33e04f..1de9a1a50d 100644 --- a/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile +++ b/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile @@ -31,7 +31,8 @@ if $(HAIKU_OPENSSL_ENABLED) { Addon IMAP : $(sources) - : be libmail.so $(TARGET_NETWORK_LIBS) $(HAIKU_OPENSSL_LIBS) + : be libmail.so $(TARGET_NETWORK_LIBS) $(HAIKU_OPENSSL_LIBS) + $(TARGET_LIBSUPC++) ; Package haiku-maildaemon-cvs : diff --git a/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile b/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile index cd939269b1..708fb10b69 100644 --- a/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile +++ b/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile @@ -33,6 +33,7 @@ if $(HAIKU_OPENSSL_ENABLED) { Addon POP3 : $(sources) : be libmail.so $(TARGET_NETWORK_LIBS) $(HAIKU_OPENSSL_LIBS) + $(TARGET_LIBSUPC++) ; Package haiku-maildaemon-cvs : diff --git a/src/add-ons/mail_daemon/outbound_filters/fortune/Jamfile b/src/add-ons/mail_daemon/outbound_filters/fortune/Jamfile index 8ef03583a7..8a75d8d144 100644 --- a/src/add-ons/mail_daemon/outbound_filters/fortune/Jamfile +++ b/src/add-ons/mail_daemon/outbound_filters/fortune/Jamfile @@ -16,7 +16,7 @@ Addon Fortune : filter.cpp ; LinkAgainst Fortune : - be libmail.so ; + be libmail.so $(TARGET_LIBSUPC++) ; Package haiku-maildaemon-cvs : Fortune : diff --git a/src/add-ons/mail_daemon/system_filters/inbox/Jamfile b/src/add-ons/mail_daemon/system_filters/inbox/Jamfile index b022268c61..e2a48048ee 100644 --- a/src/add-ons/mail_daemon/system_filters/inbox/Jamfile +++ b/src/add-ons/mail_daemon/system_filters/inbox/Jamfile @@ -15,7 +15,7 @@ Addon Inbox : filter.cpp ; LinkAgainst Inbox : - be libmail.so ; + be libmail.so $(TARGET_LIBSUPC++) ; Package haiku-maildaemon-cvs : Inbox : diff --git a/src/add-ons/mail_daemon/system_filters/notifier/Jamfile b/src/add-ons/mail_daemon/system_filters/notifier/Jamfile index e4af5c47c4..8431f02a87 100644 --- a/src/add-ons/mail_daemon/system_filters/notifier/Jamfile +++ b/src/add-ons/mail_daemon/system_filters/notifier/Jamfile @@ -15,7 +15,7 @@ Addon New\ Mail\ Notification : filter.cpp ConfigView.cpp ; LinkAgainst New\ Mail\ Notification : - be libmail.so ; + be libmail.so $(TARGET_LIBSUPC++) ; Package haiku-maildaemon-cvs : New\ Mail\ Notification : diff --git a/src/add-ons/mail_daemon/system_filters/outbox/Jamfile b/src/add-ons/mail_daemon/system_filters/outbox/Jamfile index 0948e507f4..18c15e6b07 100644 --- a/src/add-ons/mail_daemon/system_filters/outbox/Jamfile +++ b/src/add-ons/mail_daemon/system_filters/outbox/Jamfile @@ -15,7 +15,7 @@ Addon Outbox : filter.cpp ; LinkAgainst Outbox : - be libmail.so ; + be libmail.so $(TARGET_LIBSUPC++) ; Package haiku-maildaemon-cvs : Outbox : diff --git a/src/add-ons/mail_daemon/system_filters/parser/Jamfile b/src/add-ons/mail_daemon/system_filters/parser/Jamfile index 907f91887d..5b40cf8568 100644 --- a/src/add-ons/mail_daemon/system_filters/parser/Jamfile +++ b/src/add-ons/mail_daemon/system_filters/parser/Jamfile @@ -15,7 +15,7 @@ Addon Message\ Parser : filter.cpp ; LinkAgainst Message\ Parser : - be libmail.so ; + be libmail.so $(TARGET_LIBSUPC++) ; Package haiku-maildaemon-cvs : Message\ Parser : diff --git a/src/add-ons/media/media-add-ons/dvb/Jamfile b/src/add-ons/media/media-add-ons/dvb/Jamfile index 25aa899242..a0eb17b84b 100644 --- a/src/add-ons/media/media-add-ons/dvb/Jamfile +++ b/src/add-ons/media/media-add-ons/dvb/Jamfile @@ -12,5 +12,5 @@ Addon dvb.media_addon : PacketQueue.cpp pes.cpp TransportStreamDemux.cpp - : be media + : be media $(TARGET_LIBSUPC++) ; diff --git a/src/add-ons/media/media-add-ons/esound_sink/Jamfile b/src/add-ons/media/media-add-ons/esound_sink/Jamfile index ac80e92eca..94a5360a1d 100644 --- a/src/add-ons/media/media-add-ons/esound_sink/Jamfile +++ b/src/add-ons/media/media-add-ons/esound_sink/Jamfile @@ -10,7 +10,7 @@ Addon ESDSink.media_addon : ESDEndpoint.cpp ESDSinkAddOn.cpp ESDSinkNode.cpp - : be media network + : be media network $(TARGET_LIBSUPC++) ; #Package haiku-multi_audio-cvs diff --git a/src/add-ons/media/media-add-ons/firewire_dv/Jamfile b/src/add-ons/media/media-add-ons/firewire_dv/Jamfile index c53df0ccce..7e472975b6 100644 --- a/src/add-ons/media/media-add-ons/firewire_dv/Jamfile +++ b/src/add-ons/media/media-add-ons/firewire_dv/Jamfile @@ -10,5 +10,5 @@ Addon firewire_dv.media_addon : FireWireCard.cpp FireWireDVAddOn.cpp FireWireDVNode.cpp - : be media + : be media $(TARGET_LIBSUPC++) ; diff --git a/src/add-ons/media/media-add-ons/legacy/Jamfile b/src/add-ons/media/media-add-ons/legacy/Jamfile index 6d96ebf626..70e0134c71 100644 --- a/src/add-ons/media/media-add-ons/legacy/Jamfile +++ b/src/add-ons/media/media-add-ons/legacy/Jamfile @@ -7,5 +7,5 @@ Addon legacy.media_addon : LegacyAudioDevice.cpp LegacyAudioProducer.cpp LegacyMediaAddOn.cpp - : be media + : be media $(TARGET_LIBSUPC++) ; diff --git a/src/add-ons/media/media-add-ons/mixer/Jamfile b/src/add-ons/media/media-add-ons/mixer/Jamfile index 201e4a2f6e..6f2a8be6f5 100644 --- a/src/add-ons/media/media-add-ons/mixer/Jamfile +++ b/src/add-ons/media/media-add-ons/mixer/Jamfile @@ -12,7 +12,7 @@ Addon mixer.media_addon : MixerSettings.cpp MixerUtils.cpp Resampler.cpp - : be media + : be media $(TARGET_LIBSUPC++) ; Package haiku-mixer-cvs diff --git a/src/add-ons/media/media-add-ons/multi_audio/Jamfile b/src/add-ons/media/media-add-ons/multi_audio/Jamfile index 035f12e2c3..34fbed64e1 100644 --- a/src/add-ons/media/media-add-ons/multi_audio/Jamfile +++ b/src/add-ons/media/media-add-ons/multi_audio/Jamfile @@ -13,7 +13,7 @@ Addon hmulti_audio.media_addon : MultiAudioDevice.cpp MultiAudioNode.cpp MultiAudioUtility.cpp - : be media + : be media $(TARGET_LIBSUPC++) ; Package haiku-multi_audio-cvs diff --git a/src/add-ons/media/media-add-ons/opensound/Jamfile b/src/add-ons/media/media-add-ons/opensound/Jamfile index 57d693a4c3..c4742b9cdf 100644 --- a/src/add-ons/media/media-add-ons/opensound/Jamfile +++ b/src/add-ons/media/media-add-ons/opensound/Jamfile @@ -14,7 +14,7 @@ Addon opensound.media_addon : OpenSoundDeviceEngine.cpp OpenSoundDeviceMixer.cpp OpenSoundNode.cpp - : be media + : be media $(TARGET_LIBSUPC++) ; Package haiku-opensound-cvs diff --git a/src/add-ons/media/media-add-ons/reader/Jamfile b/src/add-ons/media/media-add-ons/reader/Jamfile index 9294c97452..3b9135d449 100644 --- a/src/add-ons/media/media-add-ons/reader/Jamfile +++ b/src/add-ons/media/media-add-ons/reader/Jamfile @@ -10,5 +10,5 @@ Application reader.media_addon : MediaReader.cpp MediaReaderAddOn.cpp misc.cpp - : be media + : be media $(TARGET_LIBSUPC++) ; diff --git a/src/add-ons/media/media-add-ons/tone_producer_demo/Jamfile b/src/add-ons/media/media-add-ons/tone_producer_demo/Jamfile index 633cdd6600..d181b11336 100644 --- a/src/add-ons/media/media-add-ons/tone_producer_demo/Jamfile +++ b/src/add-ons/media/media-add-ons/tone_producer_demo/Jamfile @@ -3,5 +3,5 @@ SubDir HAIKU_TOP src add-ons media media-add-ons tone_producer_demo ; Addon tone_producer_demo.media_addon : ToneProducerAddOn.cpp ToneProducer.cpp - : be media + : be media $(TARGET_LIBSUPC++) ; diff --git a/src/add-ons/media/media-add-ons/usb_webcam/Jamfile b/src/add-ons/media/media-add-ons/usb_webcam/Jamfile index 7532a2f48f..e2e91f2188 100644 --- a/src/add-ons/media/media-add-ons/usb_webcam/Jamfile +++ b/src/add-ons/media/media-add-ons/usb_webcam/Jamfile @@ -81,7 +81,7 @@ Addon usb_webcam.media_addon : CamRoster.cpp CamSensor.cpp CamStreamingDeframer.cpp - : be media $(usbKitLibraryName) + : be media $(usbKitLibraryName) $(TARGET_LIBSUPC++) ; # force dependancies diff --git a/src/add-ons/media/media-add-ons/video_producer_demo/Jamfile b/src/add-ons/media/media-add-ons/video_producer_demo/Jamfile index 0e36be7513..8dcd49bc84 100644 --- a/src/add-ons/media/media-add-ons/video_producer_demo/Jamfile +++ b/src/add-ons/media/media-add-ons/video_producer_demo/Jamfile @@ -3,5 +3,5 @@ SubDir HAIKU_TOP src add-ons media media-add-ons video_producer_demo ; Addon video_producer_demo.media_addon : AddOn.cpp Producer.cpp - : be media + : be media $(TARGET_LIBSUPC++) ; diff --git a/src/add-ons/media/media-add-ons/videowindow/Jamfile b/src/add-ons/media/media-add-ons/videowindow/Jamfile index 6067f9fee4..b86ac006c7 100644 --- a/src/add-ons/media/media-add-ons/videowindow/Jamfile +++ b/src/add-ons/media/media-add-ons/videowindow/Jamfile @@ -5,5 +5,5 @@ Addon video_window_demo.media_addon : VideoNode.cpp VideoView.cpp VideoWindow.cpp - : be media + : be media $(TARGET_LIBSUPC++) ; diff --git a/src/add-ons/media/plugins/ac3_decoder/Jamfile b/src/add-ons/media/plugins/ac3_decoder/Jamfile index 4c5b74d08f..989c32e53d 100644 --- a/src/add-ons/media/plugins/ac3_decoder/Jamfile +++ b/src/add-ons/media/plugins/ac3_decoder/Jamfile @@ -4,7 +4,7 @@ UsePrivateHeaders media ; Addon ac3_decoder : ac3_decoder.cpp - : liba52.a be libmedia.so + : liba52.a be libmedia.so $(TARGET_LIBSUPC++) ; SubIncludeGPL HAIKU_TOP src add-ons media plugins ac3_decoder liba52 ; diff --git a/src/add-ons/media/plugins/aiff_reader/Jamfile b/src/add-ons/media/plugins/aiff_reader/Jamfile index 337ca1ae12..55139da416 100644 --- a/src/add-ons/media/plugins/aiff_reader/Jamfile +++ b/src/add-ons/media/plugins/aiff_reader/Jamfile @@ -6,4 +6,4 @@ UsePrivateHeaders media ; Addon aiff_reader : aiff_reader.cpp - : be libmedia.so ; + : be libmedia.so $(TARGET_LIBSUPC++) ; diff --git a/src/add-ons/media/plugins/ape_reader/Jamfile b/src/add-ons/media/plugins/ape_reader/Jamfile index f2b8a3da19..0f705724a0 100644 --- a/src/add-ons/media/plugins/ape_reader/Jamfile +++ b/src/add-ons/media/plugins/ape_reader/Jamfile @@ -9,7 +9,7 @@ SubDirHdrs [ FDirName $(SUBDIR) MAClib ] ; Addon ape_reader : APEReader.cpp - : libMonkeysAudio.a MAClib.a be libmedia.so + : libMonkeysAudio.a MAClib.a be libmedia.so $(TARGET_LIBSUPC++) ; SubInclude HAIKU_TOP src add-ons media plugins ape_reader LibMonkeysAudio ; diff --git a/src/add-ons/media/plugins/au_reader/Jamfile b/src/add-ons/media/plugins/au_reader/Jamfile index 703d1ba5b7..a5404f0862 100644 --- a/src/add-ons/media/plugins/au_reader/Jamfile +++ b/src/add-ons/media/plugins/au_reader/Jamfile @@ -6,5 +6,5 @@ UsePrivateHeaders media ; Addon au_reader : au_reader.cpp - : be libmedia.so + : be libmedia.so $(TARGET_LIBSUPC++) ; diff --git a/src/add-ons/media/plugins/ffmpeg/Jamfile b/src/add-ons/media/plugins/ffmpeg/Jamfile index e8776ca7f4..c7f8060e7b 100644 --- a/src/add-ons/media/plugins/ffmpeg/Jamfile +++ b/src/add-ons/media/plugins/ffmpeg/Jamfile @@ -29,6 +29,7 @@ Addon ffmpeg : be libmedia.so libz.a + $(TARGET_LIBSUPC++) ; SubInclude HAIKU_TOP src add-ons media plugins ffmpeg libavcodec ; diff --git a/src/add-ons/media/plugins/mp3_decoder/Jamfile b/src/add-ons/media/plugins/mp3_decoder/Jamfile index 2a1e317fba..1d4250d000 100644 --- a/src/add-ons/media/plugins/mp3_decoder/Jamfile +++ b/src/add-ons/media/plugins/mp3_decoder/Jamfile @@ -12,6 +12,7 @@ Addon mp3_decoder : libmpglib.a be libmedia.so + $(TARGET_LIBSUPC++) ; SubInclude HAIKU_TOP src add-ons media plugins mp3_decoder mpglib ; diff --git a/src/add-ons/media/plugins/mp3_reader/Jamfile b/src/add-ons/media/plugins/mp3_reader/Jamfile index cfa27102aa..502e5b21b1 100644 --- a/src/add-ons/media/plugins/mp3_reader/Jamfile +++ b/src/add-ons/media/plugins/mp3_reader/Jamfile @@ -6,5 +6,5 @@ UsePrivateHeaders media ; Addon mp3_reader : MP3ReaderPlugin.cpp - : be libmedia.so + : be libmedia.so $(TARGET_LIBSUPC++) ; diff --git a/src/add-ons/media/plugins/musepack/Jamfile b/src/add-ons/media/plugins/musepack/Jamfile index 937b960588..e5e0bc609c 100644 --- a/src/add-ons/media/plugins/musepack/Jamfile +++ b/src/add-ons/media/plugins/musepack/Jamfile @@ -10,7 +10,7 @@ Addon musepack : MusePack.cpp MusePackReader.cpp MusePackDecoder.cpp - : libmusepack.a be libmedia.so + : libmusepack.a be libmedia.so $(TARGET_LIBSUPC++) ; SubInclude HAIKU_TOP src add-ons media plugins musepack mpc ; diff --git a/src/add-ons/media/plugins/raw_decoder/Jamfile b/src/add-ons/media/plugins/raw_decoder/Jamfile index 4f434e41fb..4f4f2a3cce 100644 --- a/src/add-ons/media/plugins/raw_decoder/Jamfile +++ b/src/add-ons/media/plugins/raw_decoder/Jamfile @@ -7,6 +7,6 @@ UsePrivateHeaders media ; Addon raw_decoder : AudioConversion.cpp RawDecoderPlugin.cpp - : be libmedia.so + : be libmedia.so $(TARGET_LIBSUPC++) ; diff --git a/src/add-ons/media/plugins/speex/Jamfile b/src/add-ons/media/plugins/speex/Jamfile index 61a089c24a..1e8cbbdebd 100644 --- a/src/add-ons/media/plugins/speex/Jamfile +++ b/src/add-ons/media/plugins/speex/Jamfile @@ -11,7 +11,7 @@ SubDirHdrs $(SUBDIR) libspeex ; Addon speex : speexCodecPlugin.cpp speexCodecDefaults.cpp - : libspeex.a be libmedia.so + : libspeex.a be libmedia.so $(TARGET_LIBSUPC++) ; SubInclude HAIKU_TOP src add-ons media plugins speex libspeex ; diff --git a/src/add-ons/media/plugins/vorbis/Jamfile b/src/add-ons/media/plugins/vorbis/Jamfile index 3839613b86..2981ffe558 100644 --- a/src/add-ons/media/plugins/vorbis/Jamfile +++ b/src/add-ons/media/plugins/vorbis/Jamfile @@ -10,7 +10,7 @@ SubDirHdrs $(SUBDIR) libvorbis vorbis ; Addon vorbis : vorbisCodecPlugin.cpp - : libvorbis.a libogg.a be libmedia.so + : libvorbis.a libogg.a be libmedia.so $(TARGET_LIBSUPC++) ; SubInclude HAIKU_TOP src add-ons media plugins vorbis libvorbis ; diff --git a/src/add-ons/media/plugins/wav_reader/Jamfile b/src/add-ons/media/plugins/wav_reader/Jamfile index 65032bffe8..f56f20e565 100644 --- a/src/add-ons/media/plugins/wav_reader/Jamfile +++ b/src/add-ons/media/plugins/wav_reader/Jamfile @@ -6,5 +6,5 @@ UsePrivateHeaders media ; Addon wav_reader : WavReaderPlugin.cpp - : be libmedia.so + : be libmedia.so $(TARGET_LIBSUPC++) ; diff --git a/src/add-ons/opengl/mesa_software_renderer/Jamfile b/src/add-ons/opengl/mesa_software_renderer/Jamfile index 880a38c5bb..391bd287c8 100644 --- a/src/add-ons/opengl/mesa_software_renderer/Jamfile +++ b/src/add-ons/opengl/mesa_software_renderer/Jamfile @@ -36,7 +36,7 @@ UseHeaders [ FDirName $(HAIKU_TOP) src kits opengl mesa sparc ] ; Addon Mesa\ Software\ Renderer : MesaSoftwareRenderer.cpp - : libGL.so libmesa.a be + : libGL.so libmesa.a be $(TARGET_LIBSUPC++) ; Package haiku-opengl-cvs : diff --git a/src/add-ons/print/drivers/pdf/source/Jamfile b/src/add-ons/print/drivers/pdf/source/Jamfile index 39120a300a..783c16bfff 100644 --- a/src/add-ons/print/drivers/pdf/source/Jamfile +++ b/src/add-ons/print/drivers/pdf/source/Jamfile @@ -49,6 +49,7 @@ Addon PDF\ Writer : libpdf.a libprint.a libprintutils.a + $(TARGET_LIBSUPC++) ; Package haiku-pdf_writer-cvs : diff --git a/src/add-ons/print/transports/hp_jetdirect/Jamfile b/src/add-ons/print/transports/hp_jetdirect/Jamfile index efbf8ff995..30e801e3e4 100644 --- a/src/add-ons/print/transports/hp_jetdirect/Jamfile +++ b/src/add-ons/print/transports/hp_jetdirect/Jamfile @@ -8,7 +8,7 @@ Addon HP\ JetDirect : print_transport.cpp HPJetDirectTransport.cpp SetupWindow.cpp - : be $(TARGET_NETAPI_LIB) + : be $(TARGET_NETAPI_LIB) $(TARGET_LIBSUPC++) ; Package haiku-printingkit-cvs : diff --git a/src/add-ons/print/transports/parallel_port/Jamfile b/src/add-ons/print/transports/parallel_port/Jamfile index 5c20750200..d994a75e11 100644 --- a/src/add-ons/print/transports/parallel_port/Jamfile +++ b/src/add-ons/print/transports/parallel_port/Jamfile @@ -7,7 +7,7 @@ SubDirHdrs [ FDirName $(HAIKU_TOP) src add-ons print transports shared ] ; Addon Parallel\ Port : ParallelTransport.cpp - : be libprintutils.a + : be libprintutils.a $(TARGET_LIBSUPC++) ; Package haiku-printingkit-cvs : diff --git a/src/add-ons/print/transports/print_to_file/Jamfile b/src/add-ons/print/transports/print_to_file/Jamfile index e5f8d5ea31..29d465d921 100644 --- a/src/add-ons/print/transports/print_to_file/Jamfile +++ b/src/add-ons/print/transports/print_to_file/Jamfile @@ -8,7 +8,7 @@ SetSubDirSupportedPlatformsBeOSCompatible ; Addon Print\ To\ File : print_transport.cpp FileSelector.cpp - : be tracker + : be tracker $(TARGET_LIBSUPC++) ; Package haiku-printingkit-cvs : diff --git a/src/add-ons/print/transports/serial_port/Jamfile b/src/add-ons/print/transports/serial_port/Jamfile index d155433ca8..4d6bba87d1 100644 --- a/src/add-ons/print/transports/serial_port/Jamfile +++ b/src/add-ons/print/transports/serial_port/Jamfile @@ -7,7 +7,7 @@ SubDirHdrs [ FDirName $(HAIKU_TOP) src add-ons print transports shared ] ; Addon Serial\ Port : SerialTransport.cpp - : be libprintutils.a + : be libprintutils.a $(TARGET_LIBSUPC++) ; Package haiku-printingkit-cvs : diff --git a/src/add-ons/print/transports/usb_port/Jamfile b/src/add-ons/print/transports/usb_port/Jamfile index 154b8d5b2a..be32de1143 100644 --- a/src/add-ons/print/transports/usb_port/Jamfile +++ b/src/add-ons/print/transports/usb_port/Jamfile @@ -7,7 +7,7 @@ SubDirHdrs [ FDirName $(HAIKU_TOP) src add-ons print transports shared ] ; Addon USB\ Port : USBTransport.cpp - : be libprintutils.a + : be libprintutils.a $(TARGET_LIBSUPC++) ; Package haiku-printingkit-cvs : diff --git a/src/add-ons/screen_savers/debugnow/Jamfile b/src/add-ons/screen_savers/debugnow/Jamfile index 8698cfa0bc..075c615c4a 100644 --- a/src/add-ons/screen_savers/debugnow/Jamfile +++ b/src/add-ons/screen_savers/debugnow/Jamfile @@ -4,7 +4,7 @@ SetSubDirSupportedPlatformsBeOSCompatible ; ScreenSaver DebugNow : DebugNow.cpp : - be libscreensaver.so ; + be libscreensaver.so $(TARGET_LIBSUPC++) ; Package haiku-screensaverkit-cvs : DebugNow : diff --git a/src/add-ons/screen_savers/flurry/Jamfile b/src/add-ons/screen_savers/flurry/Jamfile index 978c32f537..59afa77271 100644 --- a/src/add-ons/screen_savers/flurry/Jamfile +++ b/src/add-ons/screen_savers/flurry/Jamfile @@ -8,6 +8,6 @@ ScreenSaver Flurry : Spark.cpp Star.cpp Texture.cpp - : be screensaver GL libshared.a + : be screensaver GL libshared.a $(TARGET_LIBSUPC++) ; diff --git a/src/add-ons/screen_savers/haiku/Jamfile b/src/add-ons/screen_savers/haiku/Jamfile index b7ba8d4a86..b5a62c42a4 100644 --- a/src/add-ons/screen_savers/haiku/Jamfile +++ b/src/add-ons/screen_savers/haiku/Jamfile @@ -4,7 +4,7 @@ SetSubDirSupportedPlatformsBeOSCompatible ; Addon Haiku : ScreenSaver.cpp - : be screensaver + : be screensaver $(TARGET_LIBSUPC++) ; Package haiku-screensaverkit-cvs : diff --git a/src/add-ons/screen_savers/ifs/Jamfile b/src/add-ons/screen_savers/ifs/Jamfile index 79f0e334af..02e7a827e6 100644 --- a/src/add-ons/screen_savers/ifs/Jamfile +++ b/src/add-ons/screen_savers/ifs/Jamfile @@ -6,6 +6,6 @@ ScreenSaver IFS : IFS.cpp IFSSaver.cpp - : be libscreensaver.so + : be libscreensaver.so $(TARGET_LIBSUPC++) ; diff --git a/src/add-ons/screen_savers/message/Jamfile b/src/add-ons/screen_savers/message/Jamfile index 00b255cd40..90431a04a3 100644 --- a/src/add-ons/screen_savers/message/Jamfile +++ b/src/add-ons/screen_savers/message/Jamfile @@ -7,7 +7,7 @@ SetSubDirSupportedPlatformsBeOSCompatible ; ScreenSaver Message : Message.cpp : - be libscreensaver.so ; + be libscreensaver.so $(TARGET_LIBSUPC++) ; Package haiku-screensaverkit-cvs : Message : diff --git a/src/add-ons/screen_savers/simpleclock/Jamfile b/src/add-ons/screen_savers/simpleclock/Jamfile index 14a9c423c0..a2f4a545f6 100644 --- a/src/add-ons/screen_savers/simpleclock/Jamfile +++ b/src/add-ons/screen_savers/simpleclock/Jamfile @@ -5,6 +5,6 @@ SetSubDirSupportedPlatformsBeOSCompatible ; ScreenSaver SimpleClock : SimpleClock.cpp - : be libscreensaver.so + : be libscreensaver.so $(TARGET_LIBSUPC++) ; diff --git a/src/add-ons/screen_savers/spider/Jamfile b/src/add-ons/screen_savers/spider/Jamfile index e5b195e62b..c6d21362cf 100644 --- a/src/add-ons/screen_savers/spider/Jamfile +++ b/src/add-ons/screen_savers/spider/Jamfile @@ -7,6 +7,6 @@ ScreenSaver Spider : PolygonQueue.cpp SpiderSaver.cpp - : be libscreensaver.so + : be libscreensaver.so $(TARGET_LIBSUPC++) ; diff --git a/src/add-ons/tracker/opentargetfolder/Jamfile b/src/add-ons/tracker/opentargetfolder/Jamfile index a53a44292d..5feee6ee8d 100644 --- a/src/add-ons/tracker/opentargetfolder/Jamfile +++ b/src/add-ons/tracker/opentargetfolder/Jamfile @@ -3,6 +3,6 @@ SubDir HAIKU_TOP src add-ons tracker opentargetfolder ; Application Open\ Target\ Folder-T : opentargetfolder.cpp - : be tracker + : be tracker $(TARGET_LIBSUPC++) : opentargetfolder.rdef ; diff --git a/src/add-ons/tracker/zipomatic/Jamfile b/src/add-ons/tracker/zipomatic/Jamfile index 3b56e08224..242eec92a9 100644 --- a/src/add-ons/tracker/zipomatic/Jamfile +++ b/src/add-ons/tracker/zipomatic/Jamfile @@ -10,6 +10,6 @@ Application ZipOMatic-Z : ZipOMaticWindow.cpp ZipperThread.cpp - : be tracker + : be tracker $(TARGET_LIBSUPC++) : ZipOMatic.rdef ; diff --git a/src/add-ons/translators/bmp/Jamfile b/src/add-ons/translators/bmp/Jamfile index 18246c8553..6c3c0b1e74 100644 --- a/src/add-ons/translators/bmp/Jamfile +++ b/src/add-ons/translators/bmp/Jamfile @@ -9,7 +9,7 @@ Translator BMPTranslator : BMPTranslator.cpp BMPView.cpp - : be translation libtranslatorsutils.a + : be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) : true ; diff --git a/src/add-ons/translators/gif/Jamfile b/src/add-ons/translators/gif/Jamfile index 50ab729425..9d40f9c294 100644 --- a/src/add-ons/translators/gif/Jamfile +++ b/src/add-ons/translators/gif/Jamfile @@ -16,7 +16,7 @@ Translator GIFTranslator : SavePalette.cpp SFHash.cpp : - be translation + be translation $(TARGET_LIBSUPC++) : true ; diff --git a/src/add-ons/translators/hpgs/Jamfile b/src/add-ons/translators/hpgs/Jamfile index a445bd86cf..b75eaf128f 100644 --- a/src/add-ons/translators/hpgs/Jamfile +++ b/src/add-ons/translators/hpgs/Jamfile @@ -45,6 +45,7 @@ Translator HPGSTranslator : HPGSTranslator.cpp $(sources) : be translation libpng.so libtextencoding.so libz.so libtranslatorsutils.a + $(TARGET_LIBSUPC++) : true ; diff --git a/src/add-ons/translators/hvif/Jamfile b/src/add-ons/translators/hvif/Jamfile index f95a2c5d9d..41c9153be2 100644 --- a/src/add-ons/translators/hvif/Jamfile +++ b/src/add-ons/translators/hvif/Jamfile @@ -8,6 +8,6 @@ Translator HVIFTranslator : HVIFMain.cpp HVIFTranslator.cpp HVIFView.cpp - : be translation libtranslatorsutils.a + : be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) : true ; diff --git a/src/add-ons/translators/ico/Jamfile b/src/add-ons/translators/ico/Jamfile index a629ae8eda..72a277241e 100644 --- a/src/add-ons/translators/ico/Jamfile +++ b/src/add-ons/translators/ico/Jamfile @@ -10,7 +10,7 @@ Translator ICOTranslator : ICOTranslator.cpp ConfigView.cpp ICO.cpp - : be translation libtranslatorsutils.a + : be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) : true ; diff --git a/src/add-ons/translators/jpeg2000/Jamfile b/src/add-ons/translators/jpeg2000/Jamfile index 9af7af5d92..bacbb7de9a 100644 --- a/src/add-ons/translators/jpeg2000/Jamfile +++ b/src/add-ons/translators/jpeg2000/Jamfile @@ -66,7 +66,7 @@ Translator JPEG2000Translator : $(jasper_files) - : be translation + : be translation $(TARGET_LIBSUPC++) : true ; diff --git a/src/add-ons/translators/pcx/Jamfile b/src/add-ons/translators/pcx/Jamfile index 006fa6b9e6..0da0bea94d 100644 --- a/src/add-ons/translators/pcx/Jamfile +++ b/src/add-ons/translators/pcx/Jamfile @@ -10,7 +10,7 @@ Translator PCXTranslator : PCXTranslator.cpp ConfigView.cpp PCX.cpp - : be translation libtranslatorsutils.a + : be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) : true ; diff --git a/src/add-ons/translators/png/Jamfile b/src/add-ons/translators/png/Jamfile index acdf7a8b70..c293dd3e96 100644 --- a/src/add-ons/translators/png/Jamfile +++ b/src/add-ons/translators/png/Jamfile @@ -10,7 +10,7 @@ Translator PNGTranslator : PNGTranslator.cpp PNGView.cpp - : be translation libpng.a z libtranslatorsutils.a + : be translation libpng.a z libtranslatorsutils.a $(TARGET_LIBSUPC++) : true ; diff --git a/src/add-ons/translators/ppm/Jamfile b/src/add-ons/translators/ppm/Jamfile index af1a126b61..3771f35a2d 100644 --- a/src/add-ons/translators/ppm/Jamfile +++ b/src/add-ons/translators/ppm/Jamfile @@ -4,7 +4,7 @@ SetSubDirSupportedPlatformsBeOSCompatible ; Translator PPMTranslator : PPMMain.cpp PPMTranslator.cpp colorspace.cpp - : be translation + : be translation $(TARGET_LIBSUPC++) : true ; diff --git a/src/add-ons/translators/raw/Jamfile b/src/add-ons/translators/raw/Jamfile index 200e841467..afb4cd2c2c 100644 --- a/src/add-ons/translators/raw/Jamfile +++ b/src/add-ons/translators/raw/Jamfile @@ -10,7 +10,7 @@ Translator RAWTranslator : RAWTranslator.cpp ConfigView.cpp RAW.cpp - : be translation libtranslatorsutils.a + : be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) : true ; diff --git a/src/add-ons/translators/rtf/Jamfile b/src/add-ons/translators/rtf/Jamfile index 5191eb8eb0..00fa7c7e2b 100644 --- a/src/add-ons/translators/rtf/Jamfile +++ b/src/add-ons/translators/rtf/Jamfile @@ -17,7 +17,7 @@ Translator RTF-Translator : ConfigView.cpp RTF.cpp convert.cpp - : be translation libtranslatorsutils.a + : be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) : true ; diff --git a/src/add-ons/translators/sgi/Jamfile b/src/add-ons/translators/sgi/Jamfile index 9b04b7f84a..7f11ce42b7 100644 --- a/src/add-ons/translators/sgi/Jamfile +++ b/src/add-ons/translators/sgi/Jamfile @@ -10,7 +10,7 @@ Translator SGITranslator : SGITranslator.cpp SGIView.cpp - : be translation libtranslatorsutils.a + : be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) : true ; diff --git a/src/add-ons/translators/stxt/Jamfile b/src/add-ons/translators/stxt/Jamfile index c69491db22..20ed4956d4 100644 --- a/src/add-ons/translators/stxt/Jamfile +++ b/src/add-ons/translators/stxt/Jamfile @@ -12,7 +12,8 @@ Translator STXTTranslator : STXTMain.cpp STXTTranslator.cpp STXTView.cpp - : be translation libtextencoding.so libtranslatorsutils.a + : be translation libtextencoding.so libtranslatorsutils.a + $(TARGET_LIBSUPC++) : true ; diff --git a/src/add-ons/translators/tga/Jamfile b/src/add-ons/translators/tga/Jamfile index bbb28381b8..d426654558 100644 --- a/src/add-ons/translators/tga/Jamfile +++ b/src/add-ons/translators/tga/Jamfile @@ -8,7 +8,7 @@ Translator TGATranslator : TGAMain.cpp TGATranslator.cpp TGAView.cpp - : be translation libtranslatorsutils.a + : be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) : true ; diff --git a/src/add-ons/translators/tiff/Jamfile b/src/add-ons/translators/tiff/Jamfile index e0228d1dac..6c3f93bd4a 100644 --- a/src/add-ons/translators/tiff/Jamfile +++ b/src/add-ons/translators/tiff/Jamfile @@ -54,7 +54,7 @@ Translator TIFFTranslator : TIFFTranslator.cpp TIFFView.cpp - : be translation z libtranslatorsutils.a + : be translation z libtranslatorsutils.a $(TARGET_LIBSUPC++) : true ; diff --git a/src/add-ons/translators/wonderbrush/Jamfile b/src/add-ons/translators/wonderbrush/Jamfile index 17f53d50eb..0f9fffb5cc 100644 --- a/src/add-ons/translators/wonderbrush/Jamfile +++ b/src/add-ons/translators/wonderbrush/Jamfile @@ -21,7 +21,7 @@ Translator WonderBrushTranslator : blending.cpp lab_convert.cpp - : be translation z libtranslatorsutils.a + : be translation z libtranslatorsutils.a $(TARGET_LIBSUPC++) : true ; diff --git a/src/apps/3dmov/Jamfile b/src/apps/3dmov/Jamfile index 40d20aeb01..799b2ab6e8 100644 --- a/src/apps/3dmov/Jamfile +++ b/src/apps/3dmov/Jamfile @@ -7,6 +7,6 @@ Application 3DMov : GLMovApp.cpp GLMovView.cpp GLMovWindow.cpp - : be GL game + : be GL game $(TARGET_LIBSUPC++) : 3dmov.rdef ; diff --git a/src/apps/bootman/Jamfile b/src/apps/bootman/Jamfile index 24c2564964..4539b2d471 100644 --- a/src/apps/bootman/Jamfile +++ b/src/apps/bootman/Jamfile @@ -18,6 +18,6 @@ Application bootman : WizardController.cpp WizardPageView.cpp WizardView.cpp - : be tracker + : be tracker $(TARGET_LIBSUPC++) : bootman.rdef ; diff --git a/src/apps/bsnow/Jamfile b/src/apps/bsnow/Jamfile index b644fffdcc..b144ba1e1e 100644 --- a/src/apps/bsnow/Jamfile +++ b/src/apps/bsnow/Jamfile @@ -6,6 +6,6 @@ Application BSnow : Flakes.cpp SnowView.cpp SnowApp.cpp - : be + : be $(TARGET_LIBSUPC++) : BSnow.rdef ; diff --git a/src/apps/charactermap/Jamfile b/src/apps/charactermap/Jamfile index b0ea13f2ae..a4879659eb 100644 --- a/src/apps/charactermap/Jamfile +++ b/src/apps/charactermap/Jamfile @@ -11,6 +11,6 @@ Application CharacterMap : UnicodeBlocks.cpp UnicodeBlockView.cpp - : be + : be $(TARGET_LIBSUPC++) : CharacterMap.rdef ; diff --git a/src/apps/clock/Jamfile b/src/apps/clock/Jamfile index 8f563627c7..ca92df7afe 100644 --- a/src/apps/clock/Jamfile +++ b/src/apps/clock/Jamfile @@ -6,6 +6,6 @@ Application Clock : cl_view.cpp cl_wind.cpp clock.cpp - : be + : be $(TARGET_LIBSUPC++) : Clock.rdef ; diff --git a/src/apps/cortex/addons/AudioAdapter/Jamfile b/src/apps/cortex/addons/AudioAdapter/Jamfile index be184055e7..dff82f0390 100644 --- a/src/apps/cortex/addons/AudioAdapter/Jamfile +++ b/src/apps/cortex/addons/AudioAdapter/Jamfile @@ -21,5 +21,5 @@ Addon cortex_audioadapter.media_addon : RawBuffer.cpp SoundUtils.cpp - : be media + : be media $(TARGET_LIBSUPC++) ; diff --git a/src/apps/cortex/addons/Flanger/Jamfile b/src/apps/cortex/addons/Flanger/Jamfile index 44e18525bf..e1e389609d 100644 --- a/src/apps/cortex/addons/Flanger/Jamfile +++ b/src/apps/cortex/addons/Flanger/Jamfile @@ -10,6 +10,6 @@ Addon cortex_flanger.media_addon : MediaNodeControlApp.cpp RawBuffer.cpp SoundUtils.cpp - : be media + : be media $(TARGET_LIBSUPC++) : Resource.rsrc ; diff --git a/src/apps/debugger/gui/running_teams_window/Jamfile b/src/apps/debugger/gui/running_teams_window/Jamfile index 6f265c3548..ba8a4582d7 100644 --- a/src/apps/debugger/gui/running_teams_window/Jamfile +++ b/src/apps/debugger/gui/running_teams_window/Jamfile @@ -12,5 +12,5 @@ Application hdb : TeamsListView.cpp TeamWindow.cpp - : be tracker translation libdebug.so + : be tracker translation libdebug.so $(TARGET_LIBSUPC++) ; diff --git a/src/apps/deskbar/Jamfile b/src/apps/deskbar/Jamfile index d55ca58fef..70c7dfd62f 100644 --- a/src/apps/deskbar/Jamfile +++ b/src/apps/deskbar/Jamfile @@ -44,5 +44,5 @@ Application Deskbar : ResourceSet.cpp Switcher.cpp $(targetSource) - : be tracker $(targetLib) + : be tracker $(targetLib) $(TARGET_LIBSUPC++) ; diff --git a/src/apps/diskprobe/Jamfile b/src/apps/diskprobe/Jamfile index 6b7ea3c58f..1449b189b8 100644 --- a/src/apps/diskprobe/Jamfile +++ b/src/apps/diskprobe/Jamfile @@ -16,6 +16,7 @@ Application DiskProbe : ProbeView.cpp OpenWindow.cpp FindWindow.cpp - : be tracker translation libexpression_parser.a libmapm.a + : be tracker translation libexpression_parser.a libmapm.a + $(TARGET_LIBSUPC++) : DiskProbe.rdef ; diff --git a/src/apps/drivesetup/Jamfile b/src/apps/drivesetup/Jamfile index 422adf6efa..574e8946c5 100644 --- a/src/apps/drivesetup/Jamfile +++ b/src/apps/drivesetup/Jamfile @@ -13,7 +13,7 @@ Preference DriveSetup : PartitionList.cpp Support.cpp - : be libcolumnlistview.a libshared.a + : be libcolumnlistview.a libshared.a $(TARGET_LIBSUPC++) : DriveSetup.rdef ; diff --git a/src/apps/expander/Jamfile b/src/apps/expander/Jamfile index 734c3c08b2..9f05c21d1b 100644 --- a/src/apps/expander/Jamfile +++ b/src/apps/expander/Jamfile @@ -11,7 +11,7 @@ Application Expander : ExpanderPreferences.cpp DirectoryFilePanel.cpp ExpanderRules.cpp - : be tracker + : be tracker $(TARGET_LIBSUPC++) : Expander.rdef ; diff --git a/src/apps/fontdemo/Jamfile b/src/apps/fontdemo/Jamfile index b68b767010..514ae18a03 100644 --- a/src/apps/fontdemo/Jamfile +++ b/src/apps/fontdemo/Jamfile @@ -6,6 +6,6 @@ Application FontDemo : ControlView.cpp FontDemo.cpp FontDemoView.cpp - : be + : be $(TARGET_LIBSUPC++) : FontDemo.rdef ; diff --git a/src/apps/glteapot/Jamfile b/src/apps/glteapot/Jamfile index 953ef21eff..8dcc073b4a 100644 --- a/src/apps/glteapot/Jamfile +++ b/src/apps/glteapot/Jamfile @@ -9,6 +9,6 @@ Application GLTeapot : error.cpp TeapotWindow.cpp TeapotApp.cpp - : be GL game + : be GL game $(TARGET_LIBSUPC++) : GLTeapot.rdef ; diff --git a/src/apps/gradients/Jamfile b/src/apps/gradients/Jamfile index eaaaae9002..d71ae003b7 100644 --- a/src/apps/gradients/Jamfile +++ b/src/apps/gradients/Jamfile @@ -2,6 +2,6 @@ SubDir HAIKU_TOP src apps gradients ; Application Gradients : Gradients.cpp - : be + : be $(TARGET_LIBSUPC++) : Gradients.rdef ; diff --git a/src/apps/installedpackages/Jamfile b/src/apps/installedpackages/Jamfile index 78afe6431f..56b13de668 100644 --- a/src/apps/installedpackages/Jamfile +++ b/src/apps/installedpackages/Jamfile @@ -13,5 +13,5 @@ Application InstalledPackages : main.cpp UninstallWindow.cpp UninstallView.cpp - : be tracker + : be tracker $(TARGET_LIBSUPC++) ; diff --git a/src/apps/launchbox/Jamfile b/src/apps/launchbox/Jamfile index 835c8bcf2c..28b32ab1b6 100644 --- a/src/apps/launchbox/Jamfile +++ b/src/apps/launchbox/Jamfile @@ -12,7 +12,7 @@ Application LaunchBox : PadView.cpp Panel.cpp support.cpp - : be translation libshared.a + : be translation libshared.a $(TARGET_LIBSUPC++) : LaunchBox.rdef ; diff --git a/src/apps/magnify/Jamfile b/src/apps/magnify/Jamfile index a03cc74fc6..7f3854f10d 100644 --- a/src/apps/magnify/Jamfile +++ b/src/apps/magnify/Jamfile @@ -6,7 +6,7 @@ AddSubDirSupportedPlatforms libbe_test ; Application Magnify : Magnify.cpp - : be tracker game + : be tracker game $(TARGET_LIBSUPC++) : Magnify.rdef ; diff --git a/src/apps/mandelbrot/Jamfile b/src/apps/mandelbrot/Jamfile index e78a346652..b75b7e02b3 100644 --- a/src/apps/mandelbrot/Jamfile +++ b/src/apps/mandelbrot/Jamfile @@ -6,5 +6,5 @@ AddSubDirSupportedPlatforms libbe_test ; Application Mandelbrot : Mandelbrot.cpp tsb.cpp - : be + : be $(TARGET_LIBSUPC++) : Mandelbrot.rdef ; diff --git a/src/apps/midiplayer/Jamfile b/src/apps/midiplayer/Jamfile index a551e4347a..24e6e35cef 100644 --- a/src/apps/midiplayer/Jamfile +++ b/src/apps/midiplayer/Jamfile @@ -7,7 +7,7 @@ Application MidiPlayer : MidiPlayerWindow.cpp ScopeView.cpp SynthBridge.cpp - : be midi midi2 + : be midi midi2 $(TARGET_LIBSUPC++) : MidiPlayer.rdef ; diff --git a/src/apps/networkstatus/Jamfile b/src/apps/networkstatus/Jamfile index a90414ee19..a4d9effcc4 100644 --- a/src/apps/networkstatus/Jamfile +++ b/src/apps/networkstatus/Jamfile @@ -14,6 +14,6 @@ Application NetworkStatus : NetworkStatusWindow.cpp NetworkStatusView.cpp NetworkStatus.cpp - : be $(icon_libs) $(TARGET_NETWORK_LIBS) + : be $(icon_libs) $(TARGET_NETWORK_LIBS) $(TARGET_LIBSUPC++) : NetworkStatus.rdef NetworkStatusIcons.rdef ; diff --git a/src/apps/packageinstaller/Jamfile b/src/apps/packageinstaller/Jamfile index 3f7c70596d..37044c50ef 100644 --- a/src/apps/packageinstaller/Jamfile +++ b/src/apps/packageinstaller/Jamfile @@ -15,7 +15,7 @@ Application PackageInstaller : PackageTextViewer.cpp PackageImageViewer.cpp InstalledPackageInfo.cpp - : be tracker translation z + : be tracker translation z $(TARGET_LIBSUPC++) : PackageInstaller.rdef ; diff --git a/src/apps/people/Jamfile b/src/apps/people/Jamfile index 7212fff4b6..d71ad0fa5b 100644 --- a/src/apps/people/Jamfile +++ b/src/apps/people/Jamfile @@ -5,7 +5,7 @@ Application People : main.cpp PeopleView.cpp PeopleWindow.cpp TTextControl.cpp - : libbe.so libtracker.so + : libbe.so libtracker.so $(TARGET_LIBSUPC++) : People.rdef ; diff --git a/src/apps/powerstatus/Jamfile b/src/apps/powerstatus/Jamfile index 573ae76a3b..bb77ec3993 100644 --- a/src/apps/powerstatus/Jamfile +++ b/src/apps/powerstatus/Jamfile @@ -9,6 +9,6 @@ Application PowerStatus : PowerStatusWindow.cpp PowerStatusView.cpp PowerStatus.cpp - : be + : be $(TARGET_LIBSUPC++) : PowerStatus.rdef ; diff --git a/src/apps/processcontroller/Jamfile b/src/apps/processcontroller/Jamfile index a68ac32b68..8329cd4932 100644 --- a/src/apps/processcontroller/Jamfile +++ b/src/apps/processcontroller/Jamfile @@ -20,6 +20,6 @@ Application ProcessController : ThreadBarMenu.cpp ThreadBarMenuItem.cpp Utilities.cpp - : be + : be $(TARGET_LIBSUPC++) : ProcessController.rdef ; diff --git a/src/apps/pulse/Jamfile b/src/apps/pulse/Jamfile index 60e1f36421..6db294044a 100644 --- a/src/apps/pulse/Jamfile +++ b/src/apps/pulse/Jamfile @@ -23,6 +23,6 @@ Application Pulse : PulseView.cpp PulseWindow.cpp - : be + : be $(TARGET_LIBSUPC++) : Pulse.rdef ; diff --git a/src/apps/resedit/Jamfile b/src/apps/resedit/Jamfile index 3c1df5db68..c0649b54e2 100644 --- a/src/apps/resedit/Jamfile +++ b/src/apps/resedit/Jamfile @@ -26,5 +26,5 @@ Application ResEdit : ResourceRoster.cpp ResView.cpp ResWindow.cpp - : be tracker translation libcolumnlistview.a + : be tracker translation libcolumnlistview.a $(TARGET_LIBSUPC++) ; diff --git a/src/apps/screenshot/Jamfile b/src/apps/screenshot/Jamfile index 8f69a08c8e..366ed6cb1e 100644 --- a/src/apps/screenshot/Jamfile +++ b/src/apps/screenshot/Jamfile @@ -9,7 +9,7 @@ Application Screenshot : PreviewView.cpp Screenshot.cpp ScreenshotWindow.cpp - : be tracker translation libpng.so libz.so + : be tracker translation libpng.so libz.so $(TARGET_LIBSUPC++) : Screenshot.rdef ; diff --git a/src/apps/showimage/Jamfile b/src/apps/showimage/Jamfile index 797ff0903b..1e014a076f 100644 --- a/src/apps/showimage/Jamfile +++ b/src/apps/showimage/Jamfile @@ -18,7 +18,7 @@ Application ShowImage : ProgressWindow.cpp ResizerWindow.cpp : libshared.a - be tracker translation + be tracker translation $(TARGET_LIBSUPC++) : ShowImage.rdef ; diff --git a/src/apps/stylededit/Jamfile b/src/apps/stylededit/Jamfile index bd084a6b95..ec261d3669 100644 --- a/src/apps/stylededit/Jamfile +++ b/src/apps/stylededit/Jamfile @@ -32,7 +32,7 @@ Application StyledEdit : # Haiku String String.cpp strcasestr.c - : be translation tracker libtextencoding.so + : be translation tracker libtextencoding.so $(TARGET_LIBSUPC++) : $(styled_edit_rsrc) ; diff --git a/src/apps/terminal/Jamfile b/src/apps/terminal/Jamfile index 86af72ef53..d26e7cd532 100644 --- a/src/apps/terminal/Jamfile +++ b/src/apps/terminal/Jamfile @@ -31,6 +31,6 @@ Application Terminal : UTF8WidthTbl.c VTKeyTbl.c VTPrsTbl.c - : be game tracker textencoding + : be game tracker textencoding $(TARGET_LIBSUPC++) : Terminal.rdef Terminal.icons.rdef ; diff --git a/src/apps/text_search/Jamfile b/src/apps/text_search/Jamfile index 117c98e3e7..c910c00e1d 100644 --- a/src/apps/text_search/Jamfile +++ b/src/apps/text_search/Jamfile @@ -24,6 +24,6 @@ Application TextSearch : $(additionalBeOSSources) - : be tracker textencoding libshared.a + : be tracker textencoding libshared.a $(TARGET_LIBSUPC++) : TextSearch.rdef ; diff --git a/src/apps/tv/Jamfile b/src/apps/tv/Jamfile index d6051045b5..7942644169 100644 --- a/src/apps/tv/Jamfile +++ b/src/apps/tv/Jamfile @@ -8,6 +8,6 @@ Application TV : MainWin.cpp VideoNode.cpp VideoView.cpp - : be media + : be media $(TARGET_LIBSUPC++) : tv.rdef ; diff --git a/src/apps/webwatch/Jamfile b/src/apps/webwatch/Jamfile index 6172576102..6f453e80e7 100644 --- a/src/apps/webwatch/Jamfile +++ b/src/apps/webwatch/Jamfile @@ -10,7 +10,7 @@ SetSubDirSupportedPlatformsBeOSCompatible ; Application WebWatch : WatchApp.cpp WatchView.cpp - : be + : be $(TARGET_LIBSUPC++) : WebWatch.rdef ; diff --git a/src/apps/workspaces/Jamfile b/src/apps/workspaces/Jamfile index cf6c475f3a..a321fc062a 100644 --- a/src/apps/workspaces/Jamfile +++ b/src/apps/workspaces/Jamfile @@ -7,7 +7,7 @@ UsePrivateHeaders app interface ; Application Workspaces : Workspaces.cpp - : be + : be $(TARGET_LIBSUPC++) : Workspaces.rdef ; diff --git a/src/bin/Jamfile b/src/bin/Jamfile index 98977deef9..66dede506f 100644 --- a/src/bin/Jamfile +++ b/src/bin/Jamfile @@ -74,17 +74,14 @@ StdBinCommands # standard commands that need libbe.so StdBinCommands - alert.cpp beep.cpp checkfs.cpp clipboard.cpp df.cpp dpms.cpp draggers.cpp - dstcheck.cpp # factor.cpp ffm.cpp - hey.cpp iroster.cpp listattr.cpp listfont.cpp @@ -96,19 +93,26 @@ StdBinCommands play.cpp query.cpp quit.cpp - reindex.cpp roster.cpp setdecor.cpp - settype.cpp setversion.cpp - spybmessage.cpp trash.cpp - urlwrapper.cpp version.cpp WindowShade.cpp # yes.cpp : be : $(haiku-utils_rsrc) ; +# standard commands that need libbe.so and libsupc++.so +StdBinCommands + alert.cpp + dstcheck.cpp + hey.cpp + reindex.cpp + settype.cpp + spybmessage.cpp + urlwrapper.cpp + : be $(TARGET_LIBSUPC++) : $(haiku-utils_rsrc) ; + # Haiku-specific apps which need libbe.so if $(TARGET_PLATFORM) = haiku { StdBinCommands @@ -135,17 +139,21 @@ StdBinCommands diff_zip.cpp : $(TARGET_LIBSTDC++) : $(haiku-utils_rsrc) ; -# standard commands that need libbe.so, libtranslation.so +# standard commands that need libbe.so, libtranslation.so, libsupc++.so StdBinCommands translate.cpp - : be translation : $(haiku-utils_rsrc) ; + : be translation $(TARGET_LIBSUPC++) : $(haiku-utils_rsrc) ; # standard commands that need libbe.so, libmedia.so StdBinCommands installsound.cpp - setvolume.cpp : be libmedia.so : $(haiku-utils_rsrc) ; +# standard commands that need libbe.so, libmedia.so, libsupc++.so +StdBinCommands + setvolume.cpp + : be libmedia.so $(TARGET_LIBSUPC++) : $(haiku-utils_rsrc) ; + # standard commands that need libbe.so, libmail.so StdBinCommands mail.cpp @@ -163,13 +171,13 @@ StdBinCommands StdBinCommands bt_discovery.cpp - : be libbluetooth.so : $(haiku-utils_rsrc) ; + : be libbluetooth.so $(TARGET_LIBSUPC++) : $(haiku-utils_rsrc) ; # standard commands that need libbe.so, libtracker.so StdBinCommands filepanel.cpp - : be tracker : $(haiku-utils_rsrc) ; + : be tracker $(TARGET_LIBSUPC++) : $(haiku-utils_rsrc) ; # standard commands that need libncurses.a StdBinCommands diff --git a/src/bin/desklink/Jamfile b/src/bin/desklink/Jamfile index 6637818879..ee3d7ff0ee 100644 --- a/src/bin/desklink/Jamfile +++ b/src/bin/desklink/Jamfile @@ -12,6 +12,6 @@ BinCommand desklink : VolumeControl.cpp VolumeWindow.cpp - : be libmedia.so + : be libmedia.so $(TARGET_LIBSUPC++) : desklink.rdef ; diff --git a/src/bin/keymap/Jamfile b/src/bin/keymap/Jamfile index c24c6629ca..6802086ad9 100644 --- a/src/bin/keymap/Jamfile +++ b/src/bin/keymap/Jamfile @@ -5,7 +5,7 @@ SetSubDirSupportedPlatformsBeOSCompatible ; BinCommand keymap : main.cpp Keymap.cpp - : be ; + : be $(TARGET_LIBSUPC++) ; Package haiku-inputkit-cvs : keymap : diff --git a/src/bin/locale/Jamfile b/src/bin/locale/Jamfile index 13836e86db..19b330e5a9 100644 --- a/src/bin/locale/Jamfile +++ b/src/bin/locale/Jamfile @@ -4,8 +4,9 @@ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits tracker ] ; UsePublicHeaders locale ; -BinCommand collectcatkeys : collectcatkeys.cpp RegExp.cpp : be liblocale.so ; +BinCommand collectcatkeys : collectcatkeys.cpp RegExp.cpp + : be liblocale.so $(TARGET_LIBSUPC++) ; BinCommand linkcatkeys : linkcatkeys.cpp : be liblocale.so $(TARGET_LIBSTDC++) ; -BinCommand dumpcatalog : dumpcatalog.cpp : be liblocale.so ; +BinCommand dumpcatalog : dumpcatalog.cpp : be liblocale.so $(TARGET_LIBSUPC++) ; diff --git a/src/bin/makebootable/platform/bios_ia32/Jamfile b/src/bin/makebootable/platform/bios_ia32/Jamfile index 92577c32b2..1aecb510e3 100644 --- a/src/bin/makebootable/platform/bios_ia32/Jamfile +++ b/src/bin/makebootable/platform/bios_ia32/Jamfile @@ -7,4 +7,4 @@ UsePrivateHeaders shared storage ; # write the stage 1 boot loader into the makebootable resources AddFileDataResource makebootable : RAWT:666:BootCode : stage1.bin ; -BinCommand makebootable : makebootable.cpp : be ; +BinCommand makebootable : makebootable.cpp : be $(TARGET_LIBSUPC++) ; diff --git a/src/bin/makebootable/platform/pxe_ia32/Jamfile b/src/bin/makebootable/platform/pxe_ia32/Jamfile index fe8d24eebb..5e989d028d 100644 --- a/src/bin/makebootable/platform/pxe_ia32/Jamfile +++ b/src/bin/makebootable/platform/pxe_ia32/Jamfile @@ -3,7 +3,7 @@ SubDir HAIKU_TOP src bin makebootable platform pxe_ia32 ; # write the stage 1 boot loader into the makebootable resources AddFileDataResource makebootable : RAWT:666:BootCode : stage1.bin ; -BinCommand makebootable : makebootable.cpp : be ; +BinCommand makebootable : makebootable.cpp : be $(TARGET_LIBSUPC++) ; SEARCH on [ FGristFiles makebootable.cpp ] = [ FDirName $(SUBDIR) $(DOTDOT) bios_ia32 ] ; diff --git a/src/bin/network/mount_nfs/Jamfile b/src/bin/network/mount_nfs/Jamfile index 0a8b13d01a..1a5f0f013f 100644 --- a/src/bin/network/mount_nfs/Jamfile +++ b/src/bin/network/mount_nfs/Jamfile @@ -4,5 +4,5 @@ UsePrivateHeaders net ; BinCommand mount_nfs : mount_nfs.cpp - : libnetwork.so + : libnetwork.so $(TARGET_LIBSUPC++) ; diff --git a/src/bin/playsound/Jamfile b/src/bin/playsound/Jamfile index 8a2f2ec316..0c6b465be4 100644 --- a/src/bin/playsound/Jamfile +++ b/src/bin/playsound/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src bin playsound ; BinCommand playfile : playfile.cpp - : be media + : be media $(TARGET_LIBSUPC++) ; BinCommand playsound : @@ -12,5 +12,5 @@ BinCommand playsound : BinCommand playwav : playwav.cpp - : be media + : be media $(TARGET_LIBSUPC++) ; diff --git a/src/bin/screen_blanker/Jamfile b/src/bin/screen_blanker/Jamfile index bbeff13ad1..c103b53d03 100644 --- a/src/bin/screen_blanker/Jamfile +++ b/src/bin/screen_blanker/Jamfile @@ -16,7 +16,7 @@ BinCommand screen_blanker : # needed for some old/broken screen saver add-ons that do not # link against libscreensaver.so - : be game libscreensaver.so + : be game libscreensaver.so $(TARGET_LIBSUPC++) : screen_blanker.rdef ; diff --git a/src/bin/screenmode/Jamfile b/src/bin/screenmode/Jamfile index c57c3212b5..756315fb95 100644 --- a/src/bin/screenmode/Jamfile +++ b/src/bin/screenmode/Jamfile @@ -14,7 +14,7 @@ BinCommand screenmode : ScreenMode.cpp multimon.cpp - : be + : be $(TARGET_LIBSUPC++) ; #SEARCH on [ FGristFiles diff --git a/src/bin/unrar/Jamfile b/src/bin/unrar/Jamfile index 21242e3671..b7a0dce075 100644 --- a/src/bin/unrar/Jamfile +++ b/src/bin/unrar/Jamfile @@ -43,5 +43,5 @@ BinCommand unrar : filestr.cpp recvol.cpp rs.cpp - : be : unrar.rdef + : be $(TARGET_LIBSUPC++) : unrar.rdef ; diff --git a/src/bin/vim/src/Jamfile b/src/bin/vim/src/Jamfile index b89fa22523..3488de3b74 100644 --- a/src/bin/vim/src/Jamfile +++ b/src/bin/vim/src/Jamfile @@ -60,7 +60,7 @@ BinCommand vim : os_beos.c version.c pathdef.c - : be libtermcap.a $(TARGET_SELECT_UNAME_ETC_LIB) + : be libtermcap.a $(TARGET_SELECT_UNAME_ETC_LIB) $(TARGET_LIBSUPC++) : vim.rdef ; SEARCH on [ FGristFiles pathdef.c ] = [ FDirName $(SUBDIR) auto ] ; diff --git a/src/kits/debug/Jamfile b/src/kits/debug/Jamfile index 8440c5de2e..61993bffb2 100644 --- a/src/kits/debug/Jamfile +++ b/src/kits/debug/Jamfile @@ -19,5 +19,5 @@ SharedLibrary libdebug.so : # architecture specific arch_debug_support.cpp - : be + : be $(TARGET_LIBSUPC++) ; diff --git a/src/kits/device/Jamfile b/src/kits/device/Jamfile index 94e8c8fc27..3ecf274e57 100644 --- a/src/kits/device/Jamfile +++ b/src/kits/device/Jamfile @@ -19,5 +19,5 @@ SharedLibrary libdevice.so : USBEndpoint.cpp USBInterface.cpp USBRoster.cpp - : be + : be $(TARGET_LIBSUPC++) ; diff --git a/src/kits/game/Jamfile b/src/kits/game/Jamfile index e52fe0303e..0d53d20f80 100644 --- a/src/kits/game/Jamfile +++ b/src/kits/game/Jamfile @@ -28,7 +28,7 @@ if $(TARGET_PLATFORM) = haiku { GameSoundBuffer.cpp GameSoundDevice.cpp GSUtility.cpp - : be media + : be media $(TARGET_LIBSUPC++) ; } else if $(TARGET_PLATFORM) = libbe_test { diff --git a/src/kits/media/Jamfile b/src/kits/media/Jamfile index 1e0d60c338..5755db6ca0 100644 --- a/src/kits/media/Jamfile +++ b/src/kits/media/Jamfile @@ -82,5 +82,5 @@ SharedLibrary libmedia.so : PluginManager.cpp ReaderPlugin.cpp : - be + be $(TARGET_LIBSUPC++) ; diff --git a/src/kits/midi/Jamfile b/src/kits/midi/Jamfile index d184d31ef5..997fb77749 100644 --- a/src/kits/midi/Jamfile +++ b/src/kits/midi/Jamfile @@ -27,4 +27,5 @@ SharedLibrary libmidi.so : libmidi2.so media libfluidsynth.so + $(TARGET_LIBSUPC++) ; diff --git a/src/kits/midi2/Jamfile b/src/kits/midi2/Jamfile index a599bf61f5..93270a86cd 100644 --- a/src/kits/midi2/Jamfile +++ b/src/kits/midi2/Jamfile @@ -18,6 +18,6 @@ SharedLibrary libmidi2.so : MidiRoster.cpp MidiRosterLooper.cpp : - be + be $(TARGET_LIBSUPC++) ; diff --git a/src/kits/network/Jamfile b/src/kits/network/Jamfile index 4f039aff2e..456fec355d 100644 --- a/src/kits/network/Jamfile +++ b/src/kits/network/Jamfile @@ -18,6 +18,7 @@ SharedLibrary libnetwork.so : dns_nameser.o dns_resolv.o dns_private.o + $(TARGET_LIBSUPC++) ; local services = [ FGristFiles services ] ; diff --git a/src/kits/network/libnetapi/Jamfile b/src/kits/network/libnetapi/Jamfile index d5cd401ed6..8b7fda43a4 100644 --- a/src/kits/network/libnetapi/Jamfile +++ b/src/kits/network/libnetapi/Jamfile @@ -26,7 +26,7 @@ if $(TARGET_PLATFORM) != haiku { SharedLibrary libnetapi.so : $(netapi_sources) - : be $(TARGET_NETWORK_LIBS) + : be $(TARGET_NETWORK_LIBS) $(TARGET_LIBSUPC++) ; # Installation -- in the test directory for the time being @@ -47,6 +47,6 @@ if $(TARGET_PLATFORM) != haiku { } else { SharedLibrary libbnetapi.so : $(netapi_sources) - : be $(TARGET_NETWORK_LIBS) + : be $(TARGET_NETWORK_LIBS) $(TARGET_LIBSUPC++) ; } diff --git a/src/kits/screensaver/Jamfile b/src/kits/screensaver/Jamfile index 4789f9b0a0..f09a833a9e 100644 --- a/src/kits/screensaver/Jamfile +++ b/src/kits/screensaver/Jamfile @@ -12,7 +12,7 @@ SharedLibrary libscreensaver.so : ScreenSaverSettings.cpp ScreenSaverRunner.cpp : - be game + be game $(TARGET_LIBSUPC++) ; Package haiku-screensaverkit-cvs : diff --git a/src/kits/textencoding/Jamfile b/src/kits/textencoding/Jamfile index a4813b6c4a..a0ae840aab 100644 --- a/src/kits/textencoding/Jamfile +++ b/src/kits/textencoding/Jamfile @@ -11,7 +11,7 @@ SharedLibrary libtextencoding.so : CharacterSetRoster.cpp character_sets.cpp utf8_conversions.cpp - : be libiconv.so ; + : be libiconv.so $(TARGET_LIBSUPC++) ; Package haiku-maildaemon-cvs : libtextencoding.so : diff --git a/src/libs/alm/Jamfile b/src/libs/alm/Jamfile index b599a2ca97..6774682135 100644 --- a/src/libs/alm/Jamfile +++ b/src/libs/alm/Jamfile @@ -12,6 +12,6 @@ SharedLibrary libalm.so : XTab.cpp YTab.cpp : - be liblpsolve55.so liblinprog.so + be liblpsolve55.so liblinprog.so $(TARGET_LIBSUPC++) ; diff --git a/src/libs/linprog/Jamfile b/src/libs/linprog/Jamfile index 99b7566dc5..5713382ffa 100644 --- a/src/libs/linprog/Jamfile +++ b/src/libs/linprog/Jamfile @@ -11,6 +11,6 @@ SharedLibrary liblinprog.so : PenaltyFunction.cpp Variable.cpp : - be liblpsolve55.so + be liblpsolve55.so $(TARGET_LIBSUPC++) ; diff --git a/src/libs/stdc++/Jamfile b/src/libs/stdc++/Jamfile index 53073715d8..9054e4d324 100644 --- a/src/libs/stdc++/Jamfile +++ b/src/libs/stdc++/Jamfile @@ -1,176 +1,9 @@ SubDir HAIKU_TOP src libs stdc++ ; -# disable undesired warnings, and add some required C++ flags -CCFLAGS += -Wno-missing-prototypes ; -C++FLAGS += -nostdinc++ -fno-implicit-templates -Wno-sign-compare -fpic ; - -# define header-searchpaths all by ourselves, as including system headers -# messes things up: -# use the following paths to make use of the headers contained in glibc, -# but this doesn't work yet, as the libio we are using here and the one -# contained in our libroot are different versions. -SYSHDRS = - $(SUBDIR) - [ FDirName $(HAIKU_TOP) src system libroot posix glibc libio ] - [ FDirName $(HAIKU_TOP) src system libroot posix glibc stdlib ] - [ FDirName $(HAIKU_TOP) src system libroot posix glibc stdio-common ] - [ FDirName $(HAIKU_TOP) src system libroot posix glibc include ] - [ FDirName $(HAIKU_TOP) src system libroot posix glibc include arch x86 ] - [ FDirName $(HAIKU_TOP) headers cpp ] - [ FDirName $(HAIKU_TOP) src system libroot posix glibc ] - [ FDirName $(HAIKU_TOP) headers posix ] - [ FDirName $(HAIKU_TOP) headers os ] - [ FDirName $(HAIKU_TOP) headers os kernel ] - [ FDirName $(HAIKU_TOP) headers os storage ] - [ FDirName $(HAIKU_TOP) headers os support ] - $(TARGET_GCC_HEADERS_DIR) ; # such that include_next will work - -# some source-files generate several different objects, depending on -# the defines that are used during the compilation call. -# So we explicitly state each of these (with their respective defines): -rule GenerateStdC++Object -{ - # GenerateStdC++Object : : ; - local object = [ FGristFiles $(1) ] ; - local sources = $(2) ; - local defines = $(3) ; - - if $(object) { - Object $(object) : $(sources) ; - ObjectDefines $(object) : $(defines) ; - } else { - Objects $(sources) ; - ObjectDefines $(sources) : $(defines) ; - } +if $(HAIKU_GCC_VERSION[1]) = 2 || $(isHybridBuild) { + SubInclude HAIKU_TOP src libs stdc++ legacy ; } -GenerateStdC++Object cstrio.o - : sinst.cc - : C EXTRACT INSERT GETLINE - ; - -GenerateStdC++Object cstrmain.o - : sinst.cc - : C REP MAIN TRAITS ADDSS ADDPS ADDCS ADDSP ADDSC EQSS EQPS EQSP NESS NEPS - NESP LTSS LTPS LTSP GTSS GTPS GTSP LESS LEPS LESP GESS GEPS GESP ; - -GenerateStdC++Object dcomio.o - : cinst.cc - : D EXTRACT INSERT ; - -GenerateStdC++Object dcomplex.o - : cinst.cc - : D MAIN ADDCC ADDCF ADDFC SUBCC SUBCF SUBFC MULCC MULCF MULFC DIVCC DIVCF - DIVFC PLUS MINUS EQCC EQCF EQFC NECC NECF NEFC ABS ARG POLAR CONJ NORM COS - COSH EXP LOG POWCC POWCF POWCI POWFC SIN SINH SQRT ; - -GenerateStdC++Object fcomio.o - : cinst.cc - : F EXTRACT INSERT ; - -GenerateStdC++Object fcomplex.o - : cinst.cc - : F MAIN ADDCC ADDCF ADDFC SUBCC SUBCF SUBFC MULCC MULCF MULFC DIVCC DIVCF - DIVFC PLUS MINUS EQCC EQCF EQFC NECC NECF NEFC ABS ARG POLAR CONJ NORM COS - COSH EXP LOG POWCC POWCF POWCI POWFC SIN SINH SQRT ; - -GenerateStdC++Object ldcomio.o - : cinst.cc - : LD EXTRACT INSERT ; - -GenerateStdC++Object ldcomplex.o - : cinst.cc - : LD MAIN ADDCC ADDCF ADDFC SUBCC SUBCF SUBFC MULCC MULCF MULFC DIVCC DIVCF - DIVFC PLUS MINUS EQCC EQCF EQFC NECC NECF NEFC ABS ARG POLAR CONJ NORM COS - COSH EXP LOG POWCC POWCF POWCI POWFC SIN SINH SQRT ; - -# generate standard objects through our new rule, too: -GenerateStdC++Object - : cmathi.cc - cstdlibi.cc - cstringi.cc - stdexcepti.cc ; - -# c++ parts from libio: -GenerateStdC++Object - : builtinbuf.cc - editbuf.cc - filebuf.cc - fstream.cc - indstream.cc - ioassign.cc - ioextend.cc - iomanip.cc - iostream.cc - isgetline.cc - isgetsb.cc - isscan.cc - osform.cc - parsestream.cc - pfstream.cc - PlotFile.cc - procbuf.cc - sbform.cc - sbgetline.cc - sbscan.cc - SFile.cc - stdexcepti.cc - stdiostream.cc - stdstrbufs.cc - stdstreams.cc - stlinst.cc - stream.cc - streambuf.cc - strstream.cc ; - -# stuff imported from libiberty: -GenerateStdC++Object - : basename.c getpagesize.c insque.c sigsetmask.c strerror.c vfork.c ; - -SharedLibraryFromObjects libstdc++.r4.so : - basename.o - builtinbuf.o - cmathi.o - cstdlibi.o - cstringi.o - cstrio.o - cstrmain.o - dcomio.o - dcomplex.o - editbuf.o - fcomio.o - fcomplex.o - filebuf.o - fstream.o - getpagesize.o - indstream.o - insque.o - ioassign.o - ioextend.o - iomanip.o - iostream.o - isgetline.o - isgetsb.o - isscan.o - ldcomio.o - ldcomplex.o - osform.o - parsestream.o - pfstream.o - PlotFile.o - procbuf.o - sbform.o - sbgetline.o - sbscan.o - SFile.o - sigsetmask.o - stdexcepti.o - stdiostream.o - stdstrbufs.o - stdstreams.o - stlinst.o - stream.o - streambuf.o - strerror.o - strstream.o - vfork.o ; +if $(HAIKU_GCC_VERSION[1]) = 4 || $(isHybridBuild) { + SubInclude HAIKU_TOP src libs stdc++ current ; +} diff --git a/src/libs/stdc++/current/Jamfile b/src/libs/stdc++/current/Jamfile new file mode 100644 index 0000000000..37f3fc041e --- /dev/null +++ b/src/libs/stdc++/current/Jamfile @@ -0,0 +1,49 @@ +SubDir HAIKU_TOP src libs stdc++ current ; + + + +# create libstdc++.so from the libstdc++.a build with the compiler +rule CreateLibStdC++FromArchive +{ + local _lib = $(1) ; + local neededLibs ; + + if ! [ IsPlatformSupportedForTarget $(1) ] { + return ; + } + + MainFromObjects $(_lib) : $(2) ; + LINKFLAGS on $(_lib) = [ on $(_lib) return $(LINKFLAGS) ] + -nostart -Xlinker -soname=\"$(_lib:G=)\" + -Xlinker --strip-debug + -Xlinker --whole-archive ; + LinkAgainst $(_lib) : $(3) ; + + AddSharedObjectGlueCode $(_lib) : false ; +} + +CreateLibStdC++FromArchive $(HAIKU_SHARED_LIBSTDC++) + : $(HAIKU_STATIC_LIBSTDC++) ; + +# create libsupc++.so from the libsupc++.a build with the compiler +rule CreateLibSupC++FromArchive +{ + local _lib = $(1) ; + local neededLibs ; + + if ! [ IsPlatformSupportedForTarget $(1) ] { + return ; + } + + MainFromObjects $(_lib) : $(2) ; + LINKFLAGS on $(_lib) = [ on $(_lib) return $(LINKFLAGS) ] + -nostart -Xlinker -soname=\"$(_lib:G=)\" + -Xlinker --strip-debug + -Xlinker --whole-archive ; + LinkAgainst $(_lib) : $(3) ; + + AddSharedObjectGlueCode $(_lib) : false ; +} + +CreateLibSupC++FromArchive $(HAIKU_SHARED_LIBSUPC++) + : $(HAIKU_STATIC_LIBSUPC++) ; diff --git a/src/libs/stdc++/legacy/Jamfile b/src/libs/stdc++/legacy/Jamfile new file mode 100644 index 0000000000..2db2e5e76f --- /dev/null +++ b/src/libs/stdc++/legacy/Jamfile @@ -0,0 +1,176 @@ +SubDir HAIKU_TOP src libs stdc++ legacy ; + +# disable undesired warnings, and add some required C++ flags +CCFLAGS += -Wno-missing-prototypes ; +C++FLAGS += -nostdinc++ -fno-implicit-templates -Wno-sign-compare -fpic ; + +# define header-searchpaths all by ourselves, as including system headers +# messes things up: +# use the following paths to make use of the headers contained in glibc, +# but this doesn't work yet, as the libio we are using here and the one +# contained in our libroot are different versions. +SYSHDRS = + $(SUBDIR) + [ FDirName $(HAIKU_TOP) src system libroot posix glibc libio ] + [ FDirName $(HAIKU_TOP) src system libroot posix glibc stdlib ] + [ FDirName $(HAIKU_TOP) src system libroot posix glibc stdio-common ] + [ FDirName $(HAIKU_TOP) src system libroot posix glibc include ] + [ FDirName $(HAIKU_TOP) src system libroot posix glibc include arch x86 ] + [ FDirName $(HAIKU_TOP) headers cpp ] + [ FDirName $(HAIKU_TOP) src system libroot posix glibc ] + [ FDirName $(HAIKU_TOP) headers posix ] + [ FDirName $(HAIKU_TOP) headers os ] + [ FDirName $(HAIKU_TOP) headers os kernel ] + [ FDirName $(HAIKU_TOP) headers os storage ] + [ FDirName $(HAIKU_TOP) headers os support ] + $(TARGET_GCC_HEADERS_DIR) ; # such that include_next will work + +# some source-files generate several different objects, depending on +# the defines that are used during the compilation call. +# So we explicitly state each of these (with their respective defines): +rule GenerateStdC++Object +{ + # GenerateStdC++Object : : ; + local object = [ FGristFiles $(1) ] ; + local sources = $(2) ; + local defines = $(3) ; + + if $(object) { + Object $(object) : $(sources) ; + ObjectDefines $(object) : $(defines) ; + } else { + Objects $(sources) ; + ObjectDefines $(sources) : $(defines) ; + } +} + +GenerateStdC++Object cstrio.o + : sinst.cc + : C EXTRACT INSERT GETLINE + ; + +GenerateStdC++Object cstrmain.o + : sinst.cc + : C REP MAIN TRAITS ADDSS ADDPS ADDCS ADDSP ADDSC EQSS EQPS EQSP NESS NEPS + NESP LTSS LTPS LTSP GTSS GTPS GTSP LESS LEPS LESP GESS GEPS GESP ; + +GenerateStdC++Object dcomio.o + : cinst.cc + : D EXTRACT INSERT ; + +GenerateStdC++Object dcomplex.o + : cinst.cc + : D MAIN ADDCC ADDCF ADDFC SUBCC SUBCF SUBFC MULCC MULCF MULFC DIVCC DIVCF + DIVFC PLUS MINUS EQCC EQCF EQFC NECC NECF NEFC ABS ARG POLAR CONJ NORM COS + COSH EXP LOG POWCC POWCF POWCI POWFC SIN SINH SQRT ; + +GenerateStdC++Object fcomio.o + : cinst.cc + : F EXTRACT INSERT ; + +GenerateStdC++Object fcomplex.o + : cinst.cc + : F MAIN ADDCC ADDCF ADDFC SUBCC SUBCF SUBFC MULCC MULCF MULFC DIVCC DIVCF + DIVFC PLUS MINUS EQCC EQCF EQFC NECC NECF NEFC ABS ARG POLAR CONJ NORM COS + COSH EXP LOG POWCC POWCF POWCI POWFC SIN SINH SQRT ; + +GenerateStdC++Object ldcomio.o + : cinst.cc + : LD EXTRACT INSERT ; + +GenerateStdC++Object ldcomplex.o + : cinst.cc + : LD MAIN ADDCC ADDCF ADDFC SUBCC SUBCF SUBFC MULCC MULCF MULFC DIVCC DIVCF + DIVFC PLUS MINUS EQCC EQCF EQFC NECC NECF NEFC ABS ARG POLAR CONJ NORM COS + COSH EXP LOG POWCC POWCF POWCI POWFC SIN SINH SQRT ; + +# generate standard objects through our new rule, too: +GenerateStdC++Object + : cmathi.cc + cstdlibi.cc + cstringi.cc + stdexcepti.cc ; + +# c++ parts from libio: +GenerateStdC++Object + : builtinbuf.cc + editbuf.cc + filebuf.cc + fstream.cc + indstream.cc + ioassign.cc + ioextend.cc + iomanip.cc + iostream.cc + isgetline.cc + isgetsb.cc + isscan.cc + osform.cc + parsestream.cc + pfstream.cc + PlotFile.cc + procbuf.cc + sbform.cc + sbgetline.cc + sbscan.cc + SFile.cc + stdexcepti.cc + stdiostream.cc + stdstrbufs.cc + stdstreams.cc + stlinst.cc + stream.cc + streambuf.cc + strstream.cc ; + +# stuff imported from libiberty: +GenerateStdC++Object + : basename.c getpagesize.c insque.c sigsetmask.c strerror.c vfork.c ; + +SharedLibraryFromObjects libstdc++.r4.so : + basename.o + builtinbuf.o + cmathi.o + cstdlibi.o + cstringi.o + cstrio.o + cstrmain.o + dcomio.o + dcomplex.o + editbuf.o + fcomio.o + fcomplex.o + filebuf.o + fstream.o + getpagesize.o + indstream.o + insque.o + ioassign.o + ioextend.o + iomanip.o + iostream.o + isgetline.o + isgetsb.o + isscan.o + ldcomio.o + ldcomplex.o + osform.o + parsestream.o + pfstream.o + PlotFile.o + procbuf.o + sbform.o + sbgetline.o + sbscan.o + SFile.o + sigsetmask.o + stdexcepti.o + stdiostream.o + stdstrbufs.o + stdstreams.o + stlinst.o + stream.o + streambuf.o + strerror.o + strstream.o + vfork.o ; diff --git a/src/libs/stdc++/PlotFile.cc b/src/libs/stdc++/legacy/PlotFile.cc similarity index 100% rename from src/libs/stdc++/PlotFile.cc rename to src/libs/stdc++/legacy/PlotFile.cc diff --git a/src/libs/stdc++/SFile.cc b/src/libs/stdc++/legacy/SFile.cc similarity index 100% rename from src/libs/stdc++/SFile.cc rename to src/libs/stdc++/legacy/SFile.cc diff --git a/src/libs/stdc++/ansidecl.h b/src/libs/stdc++/legacy/ansidecl.h similarity index 100% rename from src/libs/stdc++/ansidecl.h rename to src/libs/stdc++/legacy/ansidecl.h diff --git a/src/libs/stdc++/basename.c b/src/libs/stdc++/legacy/basename.c similarity index 100% rename from src/libs/stdc++/basename.c rename to src/libs/stdc++/legacy/basename.c diff --git a/src/libs/stdc++/builtinbuf.cc b/src/libs/stdc++/legacy/builtinbuf.cc similarity index 100% rename from src/libs/stdc++/builtinbuf.cc rename to src/libs/stdc++/legacy/builtinbuf.cc diff --git a/src/libs/stdc++/cinst.cc b/src/libs/stdc++/legacy/cinst.cc similarity index 100% rename from src/libs/stdc++/cinst.cc rename to src/libs/stdc++/legacy/cinst.cc diff --git a/src/libs/stdc++/cmathi.cc b/src/libs/stdc++/legacy/cmathi.cc similarity index 100% rename from src/libs/stdc++/cmathi.cc rename to src/libs/stdc++/legacy/cmathi.cc diff --git a/src/libs/stdc++/config.h b/src/libs/stdc++/legacy/config.h similarity index 100% rename from src/libs/stdc++/config.h rename to src/libs/stdc++/legacy/config.h diff --git a/src/libs/stdc++/cstdlibi.cc b/src/libs/stdc++/legacy/cstdlibi.cc similarity index 100% rename from src/libs/stdc++/cstdlibi.cc rename to src/libs/stdc++/legacy/cstdlibi.cc diff --git a/src/libs/stdc++/cstringi.cc b/src/libs/stdc++/legacy/cstringi.cc similarity index 100% rename from src/libs/stdc++/cstringi.cc rename to src/libs/stdc++/legacy/cstringi.cc diff --git a/src/libs/stdc++/editbuf.cc b/src/libs/stdc++/legacy/editbuf.cc similarity index 100% rename from src/libs/stdc++/editbuf.cc rename to src/libs/stdc++/legacy/editbuf.cc diff --git a/src/libs/stdc++/filebuf.cc b/src/libs/stdc++/legacy/filebuf.cc similarity index 100% rename from src/libs/stdc++/filebuf.cc rename to src/libs/stdc++/legacy/filebuf.cc diff --git a/src/libs/stdc++/fstream.cc b/src/libs/stdc++/legacy/fstream.cc similarity index 100% rename from src/libs/stdc++/fstream.cc rename to src/libs/stdc++/legacy/fstream.cc diff --git a/src/libs/stdc++/getpagesize.c b/src/libs/stdc++/legacy/getpagesize.c similarity index 100% rename from src/libs/stdc++/getpagesize.c rename to src/libs/stdc++/legacy/getpagesize.c diff --git a/src/libs/stdc++/indstream.cc b/src/libs/stdc++/legacy/indstream.cc similarity index 100% rename from src/libs/stdc++/indstream.cc rename to src/libs/stdc++/legacy/indstream.cc diff --git a/src/libs/stdc++/insque.c b/src/libs/stdc++/legacy/insque.c similarity index 100% rename from src/libs/stdc++/insque.c rename to src/libs/stdc++/legacy/insque.c diff --git a/src/libs/stdc++/ioassign.cc b/src/libs/stdc++/legacy/ioassign.cc similarity index 100% rename from src/libs/stdc++/ioassign.cc rename to src/libs/stdc++/legacy/ioassign.cc diff --git a/src/libs/stdc++/ioextend.cc b/src/libs/stdc++/legacy/ioextend.cc similarity index 100% rename from src/libs/stdc++/ioextend.cc rename to src/libs/stdc++/legacy/ioextend.cc diff --git a/src/libs/stdc++/iomanip.cc b/src/libs/stdc++/legacy/iomanip.cc similarity index 100% rename from src/libs/stdc++/iomanip.cc rename to src/libs/stdc++/legacy/iomanip.cc diff --git a/src/libs/stdc++/iostream.cc b/src/libs/stdc++/legacy/iostream.cc similarity index 100% rename from src/libs/stdc++/iostream.cc rename to src/libs/stdc++/legacy/iostream.cc diff --git a/src/libs/stdc++/iostreamP.h b/src/libs/stdc++/legacy/iostreamP.h similarity index 100% rename from src/libs/stdc++/iostreamP.h rename to src/libs/stdc++/legacy/iostreamP.h diff --git a/src/libs/stdc++/isgetline.cc b/src/libs/stdc++/legacy/isgetline.cc similarity index 100% rename from src/libs/stdc++/isgetline.cc rename to src/libs/stdc++/legacy/isgetline.cc diff --git a/src/libs/stdc++/isgetsb.cc b/src/libs/stdc++/legacy/isgetsb.cc similarity index 100% rename from src/libs/stdc++/isgetsb.cc rename to src/libs/stdc++/legacy/isgetsb.cc diff --git a/src/libs/stdc++/isscan.cc b/src/libs/stdc++/legacy/isscan.cc similarity index 100% rename from src/libs/stdc++/isscan.cc rename to src/libs/stdc++/legacy/isscan.cc diff --git a/src/libs/stdc++/libiberty.h b/src/libs/stdc++/legacy/libiberty.h similarity index 100% rename from src/libs/stdc++/libiberty.h rename to src/libs/stdc++/legacy/libiberty.h diff --git a/src/libs/stdc++/osform.cc b/src/libs/stdc++/legacy/osform.cc similarity index 100% rename from src/libs/stdc++/osform.cc rename to src/libs/stdc++/legacy/osform.cc diff --git a/src/libs/stdc++/parsestream.cc b/src/libs/stdc++/legacy/parsestream.cc similarity index 100% rename from src/libs/stdc++/parsestream.cc rename to src/libs/stdc++/legacy/parsestream.cc diff --git a/src/libs/stdc++/pfstream.cc b/src/libs/stdc++/legacy/pfstream.cc similarity index 100% rename from src/libs/stdc++/pfstream.cc rename to src/libs/stdc++/legacy/pfstream.cc diff --git a/src/libs/stdc++/procbuf.cc b/src/libs/stdc++/legacy/procbuf.cc similarity index 100% rename from src/libs/stdc++/procbuf.cc rename to src/libs/stdc++/legacy/procbuf.cc diff --git a/src/libs/stdc++/sbform.cc b/src/libs/stdc++/legacy/sbform.cc similarity index 100% rename from src/libs/stdc++/sbform.cc rename to src/libs/stdc++/legacy/sbform.cc diff --git a/src/libs/stdc++/sbgetline.cc b/src/libs/stdc++/legacy/sbgetline.cc similarity index 100% rename from src/libs/stdc++/sbgetline.cc rename to src/libs/stdc++/legacy/sbgetline.cc diff --git a/src/libs/stdc++/sbscan.cc b/src/libs/stdc++/legacy/sbscan.cc similarity index 100% rename from src/libs/stdc++/sbscan.cc rename to src/libs/stdc++/legacy/sbscan.cc diff --git a/src/libs/stdc++/sigsetmask.c b/src/libs/stdc++/legacy/sigsetmask.c similarity index 100% rename from src/libs/stdc++/sigsetmask.c rename to src/libs/stdc++/legacy/sigsetmask.c diff --git a/src/libs/stdc++/sinst.cc b/src/libs/stdc++/legacy/sinst.cc similarity index 100% rename from src/libs/stdc++/sinst.cc rename to src/libs/stdc++/legacy/sinst.cc diff --git a/src/libs/stdc++/stdexcepti.cc b/src/libs/stdc++/legacy/stdexcepti.cc similarity index 100% rename from src/libs/stdc++/stdexcepti.cc rename to src/libs/stdc++/legacy/stdexcepti.cc diff --git a/src/libs/stdc++/stdiostream.cc b/src/libs/stdc++/legacy/stdiostream.cc similarity index 100% rename from src/libs/stdc++/stdiostream.cc rename to src/libs/stdc++/legacy/stdiostream.cc diff --git a/src/libs/stdc++/stdstrbufs.cc b/src/libs/stdc++/legacy/stdstrbufs.cc similarity index 100% rename from src/libs/stdc++/stdstrbufs.cc rename to src/libs/stdc++/legacy/stdstrbufs.cc diff --git a/src/libs/stdc++/stdstreams.cc b/src/libs/stdc++/legacy/stdstreams.cc similarity index 100% rename from src/libs/stdc++/stdstreams.cc rename to src/libs/stdc++/legacy/stdstreams.cc diff --git a/src/libs/stdc++/stlinst.cc b/src/libs/stdc++/legacy/stlinst.cc similarity index 100% rename from src/libs/stdc++/stlinst.cc rename to src/libs/stdc++/legacy/stlinst.cc diff --git a/src/libs/stdc++/stream.cc b/src/libs/stdc++/legacy/stream.cc similarity index 100% rename from src/libs/stdc++/stream.cc rename to src/libs/stdc++/legacy/stream.cc diff --git a/src/libs/stdc++/streambuf.cc b/src/libs/stdc++/legacy/streambuf.cc similarity index 100% rename from src/libs/stdc++/streambuf.cc rename to src/libs/stdc++/legacy/streambuf.cc diff --git a/src/libs/stdc++/strerror.c b/src/libs/stdc++/legacy/strerror.c similarity index 100% rename from src/libs/stdc++/strerror.c rename to src/libs/stdc++/legacy/strerror.c diff --git a/src/libs/stdc++/strstream.cc b/src/libs/stdc++/legacy/strstream.cc similarity index 100% rename from src/libs/stdc++/strstream.cc rename to src/libs/stdc++/legacy/strstream.cc diff --git a/src/libs/stdc++/valarray.cc b/src/libs/stdc++/legacy/valarray.cc similarity index 100% rename from src/libs/stdc++/valarray.cc rename to src/libs/stdc++/legacy/valarray.cc diff --git a/src/libs/stdc++/vfork.c b/src/libs/stdc++/legacy/vfork.c similarity index 100% rename from src/libs/stdc++/vfork.c rename to src/libs/stdc++/legacy/vfork.c diff --git a/src/preferences/backgrounds/Jamfile b/src/preferences/backgrounds/Jamfile index a78ef491d2..599b6a4dfc 100644 --- a/src/preferences/backgrounds/Jamfile +++ b/src/preferences/backgrounds/Jamfile @@ -9,7 +9,7 @@ Preference Backgrounds : Backgrounds.cpp BackgroundsView.cpp ImageFilePanel.cpp - : be tracker translation + : be tracker translation $(TARGET_LIBSUPC++) : Backgrounds.rdef ; diff --git a/src/preferences/bluetooth/Jamfile b/src/preferences/bluetooth/Jamfile index 68d7857d86..ab0cee3922 100644 --- a/src/preferences/bluetooth/Jamfile +++ b/src/preferences/bluetooth/Jamfile @@ -13,6 +13,6 @@ Preference Bluetooth : ExtendedLocalDeviceView.cpp InquiryPanel.cpp RemoteDevicesView.cpp - : be libbluetooth.so + : be libbluetooth.so $(TARGET_LIBSUPC++) ; diff --git a/src/preferences/cpufrequency/Jamfile b/src/preferences/cpufrequency/Jamfile index 26e6101a41..177e6e90b5 100644 --- a/src/preferences/cpufrequency/Jamfile +++ b/src/preferences/cpufrequency/Jamfile @@ -8,6 +8,6 @@ Preference CPUFrequency : DriverInterface.cpp main.cpp StatusView.cpp - : be + : be $(TARGET_LIBSUPC++) : cpufrequency.rdef ; diff --git a/src/preferences/datatranslations/Jamfile b/src/preferences/datatranslations/Jamfile index 4c7a672b5b..c3358470f7 100644 --- a/src/preferences/datatranslations/Jamfile +++ b/src/preferences/datatranslations/Jamfile @@ -7,6 +7,6 @@ Preference DataTranslations : IconView.cpp TranslatorListView.cpp - : be translation + : be translation $(TARGET_LIBSUPC++) : DataTranslations.rdef ; diff --git a/src/preferences/devices/Jamfile b/src/preferences/devices/Jamfile index 890c116409..fd4d21c572 100644 --- a/src/preferences/devices/Jamfile +++ b/src/preferences/devices/Jamfile @@ -64,7 +64,7 @@ Preference Devices : cm_wrapper.c DevicesInfo.cpp ConfigurationWindow.cpp - : be + : be $(TARGET_LIBSUPC++) : Devices.rdef ; diff --git a/src/preferences/filetypes/Jamfile b/src/preferences/filetypes/Jamfile index a0787b03eb..c99fa38049 100644 --- a/src/preferences/filetypes/Jamfile +++ b/src/preferences/filetypes/Jamfile @@ -25,7 +25,7 @@ Preference FileTypes : PreferredAppMenu.cpp StringView.cpp - : be tracker + : be tracker $(TARGET_LIBSUPC++) : FileTypes.rdef FileTypes.icons.rdef ; diff --git a/src/preferences/fonts/Jamfile b/src/preferences/fonts/Jamfile index 837525b5b2..f179c253df 100644 --- a/src/preferences/fonts/Jamfile +++ b/src/preferences/fonts/Jamfile @@ -9,7 +9,7 @@ Preference Fonts : FontView.cpp main.cpp MainWindow.cpp - : be + : be $(TARGET_LIBSUPC++) : Fonts.rdef ; diff --git a/src/preferences/keyboard/Jamfile b/src/preferences/keyboard/Jamfile index 189336bd36..cd75ae1231 100644 --- a/src/preferences/keyboard/Jamfile +++ b/src/preferences/keyboard/Jamfile @@ -14,6 +14,6 @@ Preference Keyboard : KeyboardSettings.cpp KeyboardView.cpp KeyboardWindow.cpp - : translation be + : translation be $(TARGET_LIBSUPC++) : Keyboard.rdef ; diff --git a/src/preferences/locale/Jamfile b/src/preferences/locale/Jamfile index 07bf91daa6..7a5bc2366b 100644 --- a/src/preferences/locale/Jamfile +++ b/src/preferences/locale/Jamfile @@ -3,6 +3,6 @@ SubDir HAIKU_TOP src preferences locale ; Preference Locale : Locale.cpp LocaleWindow.cpp - : be liblocale.so + : be liblocale.so $(TARGET_LIBSUPC++) : Locale.rdef ; diff --git a/src/preferences/mail/Jamfile b/src/preferences/mail/Jamfile index a3b96ff837..8de084145c 100644 --- a/src/preferences/mail/Jamfile +++ b/src/preferences/mail/Jamfile @@ -46,7 +46,7 @@ if $(HAIKU_OPENSSL_ENABLED) { Preference E-mail : $(sources) : be libmail.so $(HAIKU_NETWORK_LIBS) $(TARGET_NETAPI_LIB) - $(HAIKU_OPENSSL_LIBS) + $(HAIKU_OPENSSL_LIBS) $(TARGET_LIBSUPC++) : e-mail.rdef ; diff --git a/src/preferences/media/Jamfile b/src/preferences/media/Jamfile index ee1009ad2c..5d9af292d0 100644 --- a/src/preferences/media/Jamfile +++ b/src/preferences/media/Jamfile @@ -15,7 +15,7 @@ Preference Media : MediaViews.cpp MediaListItem.cpp MediaAlert.cpp - : media be + : media be $(TARGET_LIBSUPC++) : media.rdef ; diff --git a/src/preferences/mouse/Jamfile b/src/preferences/mouse/Jamfile index 9720e546e8..340ea24dea 100644 --- a/src/preferences/mouse/Jamfile +++ b/src/preferences/mouse/Jamfile @@ -8,7 +8,7 @@ Preference Mouse : MouseWindow.cpp MouseView.cpp SettingsView.cpp - : translation be + : translation be $(TARGET_LIBSUPC++) : Mouse.rdef ; diff --git a/src/preferences/network/Jamfile b/src/preferences/network/Jamfile index 3bfdd75d27..1ea532cf3e 100644 --- a/src/preferences/network/Jamfile +++ b/src/preferences/network/Jamfile @@ -8,7 +8,7 @@ Preference Network : NetworkWindow.cpp EthernetSettingsView.cpp settings.cpp - : be root $(HAIKU_NETWORK_LIBS) + : be root $(HAIKU_NETWORK_LIBS) $(TARGET_LIBSUPC++) : Network.rdef ; diff --git a/src/preferences/print/Jamfile b/src/preferences/print/Jamfile index 74fb225641..5f33e6a562 100644 --- a/src/preferences/print/Jamfile +++ b/src/preferences/print/Jamfile @@ -16,6 +16,7 @@ Preference Printers : be translation libprintutils.a + $(TARGET_LIBSUPC++) : Printers.rdef ; diff --git a/src/preferences/screen/Jamfile b/src/preferences/screen/Jamfile index 00b459b877..5258a8dfb3 100644 --- a/src/preferences/screen/Jamfile +++ b/src/preferences/screen/Jamfile @@ -18,7 +18,7 @@ Preference Screen : ScreenSettings.cpp ScreenWindow.cpp Utility.cpp - : be + : be $(TARGET_LIBSUPC++) : Screen.rdef ; diff --git a/src/preferences/sounds/Jamfile b/src/preferences/sounds/Jamfile index 0faac0c5d7..9db5f32875 100644 --- a/src/preferences/sounds/Jamfile +++ b/src/preferences/sounds/Jamfile @@ -9,6 +9,6 @@ Preference Sounds : # HEventItem.cpp HWindow.cpp HEventList.cpp - : be libcolumnlistview.a game tracker libmedia.so + : be libcolumnlistview.a game tracker libmedia.so $(TARGET_LIBSUPC++) : Sounds.rdef ; diff --git a/src/preferences/time/Jamfile b/src/preferences/time/Jamfile index 41c1540580..0fbc36cdd3 100644 --- a/src/preferences/time/Jamfile +++ b/src/preferences/time/Jamfile @@ -17,7 +17,7 @@ Preference Time : TimeWindow.cpp TZDisplay.cpp ZoneView.cpp - : be libshared.a + : be libshared.a $(TARGET_LIBSUPC++) : Time.rdef ; diff --git a/src/preferences/touchpad/Jamfile b/src/preferences/touchpad/Jamfile index b801d58f0b..4fbbebe15c 100644 --- a/src/preferences/touchpad/Jamfile +++ b/src/preferences/touchpad/Jamfile @@ -6,6 +6,6 @@ Preference Touchpad : TouchpadPref.cpp TouchpadPrefView.cpp main.cpp - : be + : be $(TARGET_LIBSUPC++) : Touchpad.rdef ; diff --git a/src/servers/cddb_daemon/Jamfile b/src/servers/cddb_daemon/Jamfile index b295bd43a6..f75bf483ef 100644 --- a/src/servers/cddb_daemon/Jamfile +++ b/src/servers/cddb_daemon/Jamfile @@ -7,5 +7,5 @@ AddResources cddb_daemon : cddb_daemon.rdef ; Server cddb_daemon : cddb_daemon.cpp cddb_server.cpp - : be bnetapi + : be bnetapi $(TARGET_LIBSUPC++) ; diff --git a/src/servers/media_addon/Jamfile b/src/servers/media_addon/Jamfile index b5e62aae5b..49f607947f 100644 --- a/src/servers/media_addon/Jamfile +++ b/src/servers/media_addon/Jamfile @@ -15,5 +15,5 @@ Server media_addon_server : MediaFilePlayer.cpp SystemTimeSource.cpp : - be libmedia.so game + be libmedia.so game $(TARGET_LIBSUPC++) ; diff --git a/src/servers/midi/Jamfile b/src/servers/midi/Jamfile index 56b79b8471..f81095d5e2 100644 --- a/src/servers/midi/Jamfile +++ b/src/servers/midi/Jamfile @@ -8,7 +8,7 @@ Server midi_server : MidiServerApp.cpp DeviceWatcher.cpp PortDrivers.cpp - : be midi2 + : be midi2 $(TARGET_LIBSUPC++) : midi_server.rdef ; diff --git a/src/servers/power/Jamfile b/src/servers/power/Jamfile index 7d8fb3564c..5921ebceb8 100644 --- a/src/servers/power/Jamfile +++ b/src/servers/power/Jamfile @@ -7,4 +7,4 @@ Server power_daemon : power_button_monitor.cpp ; -LinkAgainst power_daemon : be ; +LinkAgainst power_daemon : be $(TARGET_LIBSUPC++) ; diff --git a/src/servers/print/Jamfile b/src/servers/print/Jamfile index 55fa99692f..327b56ac49 100644 --- a/src/servers/print/Jamfile +++ b/src/servers/print/Jamfile @@ -28,6 +28,7 @@ LinkAgainst print_server : translation libprint.a libprintutils.a + $(TARGET_LIBSUPC++) ; Package haiku-printingkit-cvs : diff --git a/src/servers/services_daemon/Jamfile b/src/servers/services_daemon/Jamfile index e0aa61721f..bf99b59342 100644 --- a/src/servers/services_daemon/Jamfile +++ b/src/servers/services_daemon/Jamfile @@ -4,6 +4,6 @@ SetSubDirSupportedPlatformsBeOSCompatible ; Application services_daemon : ServicesDaemon.cpp - : be media + : be media $(TARGET_LIBSUPC++) : ServicesDaemon.rdef ; diff --git a/src/servers/syslog_daemon/Jamfile b/src/servers/syslog_daemon/Jamfile index a7fb921e37..235bd24660 100644 --- a/src/servers/syslog_daemon/Jamfile +++ b/src/servers/syslog_daemon/Jamfile @@ -13,7 +13,7 @@ Server syslog_daemon : # ToDo: this can be removed for the Haiku build strlcpy.c : - be + be $(TARGET_LIBSUPC++) ; SEARCH on [ FGristFiles diff --git a/src/system/libroot/Jamfile b/src/system/libroot/Jamfile index 264d7f9702..1d480b2321 100644 --- a/src/system/libroot/Jamfile +++ b/src/system/libroot/Jamfile @@ -49,8 +49,8 @@ SharedLibrary libroot.so libroot_init.c : $(TARGET_GCC_LIBGCC_OBJECTS) - $(librootObjects:G=nogrist) + $(TARGET_STATIC_LIBSUPC++) ; diff --git a/src/system/libroot/posix/glibc/ctype/Jamfile b/src/system/libroot/posix/glibc/ctype/Jamfile index 01c42e7b8d..75b0f7e105 100644 --- a/src/system/libroot/posix/glibc/ctype/Jamfile +++ b/src/system/libroot/posix/glibc/ctype/Jamfile @@ -9,6 +9,7 @@ SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc locale ; SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc ; MergeObject posix_gnu_ctype.o : + ctype_l.c ctype.c ctype-extn.c ctype-info.c diff --git a/src/system/libroot/posix/glibc/ctype/ctype.h b/src/system/libroot/posix/glibc/ctype/ctype.h index e73a06d64e..4336ed2e62 100644 --- a/src/system/libroot/posix/glibc/ctype/ctype.h +++ b/src/system/libroot/posix/glibc/ctype/ctype.h @@ -238,7 +238,7 @@ __exctype_l (__isblank_l); /* Return the lowercase version of C in locale L. */ extern int __tolower_l (int __c, __locale_t __l) __THROW; -/* Return the uppercase version of C. */ +/* Return the uppercase version of C in locale L. */ extern int __toupper_l (int __c, __locale_t __l) __THROW; # if __GNUC__ >= 2 && defined __OPTIMIZE__ && !defined __cplusplus diff --git a/src/system/libroot/posix/glibc/ctype/ctype_l.c b/src/system/libroot/posix/glibc/ctype/ctype_l.c index f35ce5f519..e47992c592 100644 --- a/src/system/libroot/posix/glibc/ctype/ctype_l.c +++ b/src/system/libroot/posix/glibc/ctype/ctype_l.c @@ -18,9 +18,12 @@ #define __NO_CTYPE #include +#include /* Provide real-function versions of all the ctype macros. */ +int __isctype_l(int c, unsigned short int t, __locale_t l); + #define func(name, type) \ int __##name (int c, __locale_t l) { return __isctype_l (c, type, l); } \ weak_alias (__##name, name) @@ -50,3 +53,11 @@ int return l->__ctype_toupper[c]; } weak_alias (__toupper_l, toupper_l) + +int +(__isctype_l) (int c, unsigned short int t, __locale_t l) +{ + return (l->__ctype_b[c] & t); +} +weak_alias (__isctype_l, isctype_l) + diff --git a/src/system/libroot/posix/glibc/extensions/obstack.c b/src/system/libroot/posix/glibc/extensions/obstack.c index 503e4eb039..6eed71da4d 100644 --- a/src/system/libroot/posix/glibc/extensions/obstack.c +++ b/src/system/libroot/posix/glibc/extensions/obstack.c @@ -144,7 +144,7 @@ struct obstack *_obstack; } while (0) # endif - + /* Initialize an obstack H for use. Specify chunk size SIZE (0 means default). Objects start on multiples of ALIGNMENT (0 means use default). CHUNKFUN is the function to use to allocate chunks, @@ -375,7 +375,7 @@ _obstack_allocated_p (h, obj) } return lp != 0; } - + /* Free objects in obstack H, including OBJ and everything allocate more recently than OBJ. If OBJ is zero, free everything in H. */ @@ -454,7 +454,7 @@ obstack_free (h, obj) abort (); } #endif - + int _obstack_memory_used (h) struct obstack *h; @@ -468,7 +468,7 @@ _obstack_memory_used (h) } return nbytes; } - + /* Define the error handler. */ # ifndef _ # if (HAVE_LIBINTL_H && ENABLE_NLS) /*|| defined _LIBC*/ @@ -500,17 +500,15 @@ print_and_abort () happen because the "memory exhausted" message appears in other places like this and the translation should be reused instead of creating a very similar string which requires a separate translation. */ -#if 0 # if defined _LIBC && defined USE_IN_LIBIO if (_IO_fwide (stderr, 0) > 0) __fwprintf (stderr, L"%s\n", _("memory exhausted")); else # endif -#endif fprintf (stderr, "%s\n", _("memory exhausted")); exit (obstack_exit_failure); } - + # if 0 /* These are now turned off because the applications do not use it and it uses bcopy via obstack_grow, which causes trouble on sysV. */ diff --git a/src/system/libroot/posix/glibc/libio/Jamfile b/src/system/libroot/posix/glibc/libio/Jamfile index 8b8fb9032d..1c430f74ff 100644 --- a/src/system/libroot/posix/glibc/libio/Jamfile +++ b/src/system/libroot/posix/glibc/libio/Jamfile @@ -95,7 +95,7 @@ MergeObject posix_gnu_libio.o : fputwc.c fputwc_u.c fwprintf.c -# fwscanf.c + fwscanf.c getwc.c getwc_u.c getwchar.c @@ -104,22 +104,22 @@ MergeObject posix_gnu_libio.o : iofputws_u.c iogetwline.c ioungetwc.c -# iovswscanf.c + iovswscanf.c iowpadn.c putwc.c putwc_u.c putwchar.c putwchar_u.c swprintf.c -# swscanf.c + swscanf.c vswprintf.c vwprintf.c -# vwscanf.c + vwscanf.c wfiledoalloc.c wfileops.c wgenops.c wprintf.c -# wscanf.c + wscanf.c wstrops.c ; diff --git a/src/system/libroot/posix/glibc/libio/fileops.c b/src/system/libroot/posix/glibc/libio/fileops.c index 4cff5e447c..2297883f47 100644 --- a/src/system/libroot/posix/glibc/libio/fileops.c +++ b/src/system/libroot/posix/glibc/libio/fileops.c @@ -180,7 +180,6 @@ _IO_new_file_close_it (fp) _IO_setg (fp, NULL, NULL, NULL); _IO_setp (fp, NULL, NULL); } -#if 0 #if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T else { @@ -190,7 +189,6 @@ _IO_new_file_close_it (fp) _IO_wsetg (fp, NULL, NULL, NULL); _IO_wsetp (fp, NULL, NULL); } -#endif #endif INTUSE(_IO_un_link) ((struct _IO_FILE_plus *) fp); diff --git a/src/system/libroot/posix/glibc/libio/genops.c b/src/system/libroot/posix/glibc/libio/genops.c index ce0614cc68..b5b4936f19 100644 --- a/src/system/libroot/posix/glibc/libio/genops.c +++ b/src/system/libroot/posix/glibc/libio/genops.c @@ -32,7 +32,6 @@ #include #include - #ifdef _IO_MTSAFE_IO static _IO_lock_t list_all_lock = _IO_lock_initializer; #endif @@ -400,7 +399,7 @@ _IO_setb (f, b, eb, a) int a; { if (f->_IO_buf_base && !(f->_flags & _IO_USER_BUF)) - FREE_BUF (f->_IO_buf_base, _IO_blen (f)); + FREE_BUF (f->_IO_buf_base, _IO_blen (f)); f->_IO_buf_base = b; f->_IO_buf_end = eb; if (a) @@ -678,7 +677,8 @@ _IO_default_finish (fp, dummy) int dummy; { struct _IO_marker *mark; - if (fp->_IO_buf_base && !(fp->_flags & _IO_USER_BUF)) + if (fp->_IO_buf_base && fp->_IO_buf_base != fp->_shortbuf + && !(fp->_flags & _IO_USER_BUF)) { FREE_BUF (fp->_IO_buf_base, _IO_blen (fp)); fp->_IO_buf_base = fp->_IO_buf_end = NULL; diff --git a/src/system/libroot/posix/glibc/libio/iofwide.c b/src/system/libroot/posix/glibc/libio/iofwide.c index d9a11c3a66..20d8718bf7 100644 --- a/src/system/libroot/posix/glibc/libio/iofwide.c +++ b/src/system/libroot/posix/glibc/libio/iofwide.c @@ -42,7 +42,6 @@ # include #endif -#if 0 /* Prototypes of libio's codecvt functions. */ static enum __codecvt_result do_out (struct _IO_codecvt *codecvt, __mbstate_t *statep, @@ -87,7 +86,6 @@ struct __gconv_trans_data __libio_translit attribute_hidden = .__trans_fct = __gconv_transliterate }; #endif -#endif /* Return orientation of stream. If mode is nonzero try to change * the orientation first. @@ -119,12 +117,7 @@ _IO_fwide(_IO_FILE *fp, int mode) return fp->_mode; } - /* Set the orientation appropriately. */ - if (mode > 0) { - // wide-orientation is currently disabled! - return -1; - } -#if 0 + { struct _IO_codecvt *cc = fp->_codecvt = &fp->_wide_data->_codecvt; fp->_wide_data->_IO_read_ptr = fp->_wide_data->_IO_read_end; @@ -215,15 +208,12 @@ _IO_fwide(_IO_FILE *fp, int mode) which allows the functions without knowing the position. */ fp->_offset = _IO_SYSSEEK (fp, 0, _IO_seek_cur); } -#endif - /* Set the mode now. */ fp->_mode = mode; return mode; } -#if 0 static enum __codecvt_result do_out (struct _IO_codecvt *codecvt, __mbstate_t *statep, const wchar_t *from_start, const wchar_t *from_end, @@ -504,4 +494,3 @@ do_max_length (struct _IO_codecvt *codecvt) return MB_CUR_MAX; #endif } -#endif diff --git a/src/system/libroot/posix/glibc/libio/ioseekoff.c b/src/system/libroot/posix/glibc/libio/ioseekoff.c index bcaaf3b07d..fe3f57e74e 100644 --- a/src/system/libroot/posix/glibc/libio/ioseekoff.c +++ b/src/system/libroot/posix/glibc/libio/ioseekoff.c @@ -52,11 +52,7 @@ _IO_seekoff_unlocked (fp, offset, dir, mode) callback may not know to do the right thing about it. This may be over-kill, but it'll do for now. TODO */ if (mode != 0 && ((_IO_fwide (fp, 0) < 0 && _IO_have_backup (fp)) -#if 0 || (_IO_fwide (fp, 0) > 0 && _IO_have_wbackup (fp)))) -#else - )) -#endif { if (dir == _IO_seek_cur && _IO_in_backup (fp)) { @@ -67,10 +63,8 @@ _IO_seekoff_unlocked (fp, offset, dir, mode) } if (_IO_fwide (fp, 0) < 0) INTUSE(_IO_free_backup_area) (fp); -#if 0 else INTUSE(_IO_free_wbackup_area) (fp); -#endif } return _IO_SEEKOFF (fp, offset, dir, mode); diff --git a/src/system/libroot/posix/glibc/libio/ioseekpos.c b/src/system/libroot/posix/glibc/libio/ioseekpos.c index 0351024aa7..1cb38dd28a 100644 --- a/src/system/libroot/posix/glibc/libio/ioseekpos.c +++ b/src/system/libroot/posix/glibc/libio/ioseekpos.c @@ -42,10 +42,8 @@ _IO_seekpos_unlocked(_IO_FILE *fp, _IO_off64_t pos, int mode) if (_IO_have_backup(fp)) INTUSE(_IO_free_backup_area)(fp); } else { -#if 0 if (_IO_have_wbackup(fp)) INTUSE(_IO_free_wbackup_area)(fp); -#endif } return _IO_SEEKPOS(fp, pos, mode); diff --git a/src/system/libroot/posix/glibc/libio/libioP.h b/src/system/libroot/posix/glibc/libio/libioP.h index 8ea7b4e54d..4c808e4184 100644 --- a/src/system/libroot/posix/glibc/libio/libioP.h +++ b/src/system/libroot/posix/glibc/libio/libioP.h @@ -482,7 +482,6 @@ extern int _IO_new_fsetpos64 __P ((_IO_FILE *, const _IO_fpos64_t *)); extern int _IO_old_fsetpos64 __P ((_IO_FILE *, const _IO_fpos64_t *)); -#if 0 #if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T # define _IO_do_flush(_f) \ ((_f)->_mode <= 0 \ @@ -491,12 +490,11 @@ extern int _IO_old_fsetpos64 __P ((_IO_FILE *, const _IO_fpos64_t *)); : INTUSE(_IO_wdo_write)(_f, (_f)->_wide_data->_IO_write_base, \ ((_f)->_wide_data->_IO_write_ptr \ - (_f)->_wide_data->_IO_write_base))) -#endif // was #else -#endif - +#else # define _IO_do_flush(_f) \ INTUSE(_IO_do_write)(_f, (_f)->_IO_write_base, \ (_f)->_IO_write_ptr-(_f)->_IO_write_base) +#endif #define _IO_old_do_flush(_f) \ _IO_old_do_write(_f, (_f)->_IO_write_base, \ diff --git a/src/system/libroot/posix/glibc/libio/stdfiles.c b/src/system/libroot/posix/glibc/libio/stdfiles.c index 1f43b29c4f..cbc1407900 100644 --- a/src/system/libroot/posix/glibc/libio/stdfiles.c +++ b/src/system/libroot/posix/glibc/libio/stdfiles.c @@ -35,7 +35,7 @@ #include "libioP.h" #ifdef _IO_MTSAFE_IO -/*# if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T +# if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T # define DEF_STDFILE(NAME, FD, CHAIN, FLAGS) \ static _IO_lock_t _IO_stdfile_##FD##_lock = _IO_lock_initializer; \ static struct _IO_wide_data _IO_wide_data_##FD \ @@ -44,15 +44,13 @@ = {FILEBUF_LITERAL(CHAIN, FLAGS, FD, &_IO_wide_data_##FD), \ &INTUSE(_IO_file_jumps)}; # else -*/ # define DEF_STDFILE(NAME, FD, CHAIN, FLAGS) \ static _IO_lock_t _IO_stdfile_##FD##_lock = _IO_lock_initializer; \ struct _IO_FILE_plus NAME \ = {FILEBUF_LITERAL(CHAIN, FLAGS, FD, NULL), \ &INTUSE(_IO_file_jumps)}; -//# endif +# endif #else -/* # if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T # define DEF_STDFILE(NAME, FD, CHAIN, FLAGS) \ static struct _IO_wide_data _IO_wide_data_##FD \ @@ -61,12 +59,11 @@ = {FILEBUF_LITERAL(CHAIN, FLAGS, FD, &_IO_wide_data_##FD), \ &INTUSE(_IO_file_jumps)}; # else -*/ # define DEF_STDFILE(NAME, FD, CHAIN, FLAGS) \ struct _IO_FILE_plus NAME \ = {FILEBUF_LITERAL(CHAIN, FLAGS, FD, NULL), \ &INTUSE(_IO_file_jumps)}; -//# endif +# endif #endif DEF_STDFILE(_IO_2_1_stdin_, 0, 0, _IO_NO_WRITES); diff --git a/src/system/libroot/posix/glibc/stdio-common/Jamfile b/src/system/libroot/posix/glibc/stdio-common/Jamfile index 68a9878b15..b13bad0384 100644 --- a/src/system/libroot/posix/glibc/stdio-common/Jamfile +++ b/src/system/libroot/posix/glibc/stdio-common/Jamfile @@ -30,7 +30,7 @@ MergeObject posix_gnu_stdio.o : #_common.o : printf.c printf_fp.c printf_fphex.c -# printf_size.c + printf_size.c putw.c reg-printf.c scanf.c @@ -47,6 +47,6 @@ MergeObject posix_gnu_stdio.o : #_common.o : # vfscanf_stub.c vfscanf.c vfwprintf.c -# vfwscanf.c + vfwscanf.c vprintf.c ; diff --git a/src/system/libroot/posix/glibc/stdio-common/vfscanf.c b/src/system/libroot/posix/glibc/stdio-common/vfscanf.c index b4b7d4dff1..41504c8a9e 100644 --- a/src/system/libroot/posix/glibc/stdio-common/vfscanf.c +++ b/src/system/libroot/posix/glibc/stdio-common/vfscanf.c @@ -1996,7 +1996,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr) { /* The current character is not in the scanset. */ - ungetwc (c, s); + ungetc (c, s); goto out; } @@ -2008,7 +2008,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr) break; if (*runp == c && not_in) { - ungetwc (c, s); + ungetc (c, s); goto out; } @@ -2018,7 +2018,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr) if (runp == wp && !not_in) { - ungetwc (c, s); + ungetc (c, s); goto out; } @@ -2213,7 +2213,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr) { /* The current character is not in the scanset. */ - ungetwc (c, s); + ungetc (c, s); goto out2; } @@ -2225,7 +2225,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr) break; if (*runp == c && not_in) { - ungetwc (c, s); + ungetc (c, s); goto out2; } @@ -2235,7 +2235,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr) if (runp == wp && !not_in) { - ungetwc (c, s); + ungetc (c, s); goto out2; } diff --git a/src/tests/add-ons/kernel/file_systems/bfs/queries/Jamfile b/src/tests/add-ons/kernel/file_systems/bfs/queries/Jamfile index 972a0c22f3..b587723788 100644 --- a/src/tests/add-ons/kernel/file_systems/bfs/queries/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/bfs/queries/Jamfile @@ -2,5 +2,5 @@ SubDir HAIKU_TOP src tests add-ons kernel file_systems bfs queries ; SimpleTest queryTest : test.cpp - : be ; + : be $(TARGET_LIBSUPC++) ; diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/bfs/Jamfile b/src/tests/add-ons/kernel/file_systems/userlandfs/bfs/Jamfile index f0d9518d6c..63afad8d2b 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/bfs/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/bfs/Jamfile @@ -42,5 +42,5 @@ Addon bfs kernel_interface.cpp - : libuserlandfs_haiku_kernel.so + : libuserlandfs_haiku_kernel.so $(TARGET_LIBSUPC++) ; diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/ramfs/beos_interface/Jamfile b/src/tests/add-ons/kernel/file_systems/userlandfs/ramfs/beos_interface/Jamfile index fffb4d9f68..e9c5b6611f 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/ramfs/beos_interface/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/ramfs/beos_interface/Jamfile @@ -59,4 +59,5 @@ Addon ramfs Volume.cpp : libuserlandfs_beos_kernel.so be # for BLocker only + $(TARGET_LIBSUPC++) ; diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/reiserfs/Jamfile b/src/tests/add-ons/kernel/file_systems/userlandfs/reiserfs/Jamfile index 59da2d5b28..ef82fb5ea3 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/reiserfs/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/reiserfs/Jamfile @@ -32,6 +32,7 @@ Addon reiserfs : libuserlandfs_haiku_kernel.so be # for BLocker only + $(TARGET_LIBSUPC++) ; HaikuSubInclude beos_interface ; diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/reiserfs/beos_interface/Jamfile b/src/tests/add-ons/kernel/file_systems/userlandfs/reiserfs/beos_interface/Jamfile index 63e3471989..863e6a98f3 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/reiserfs/beos_interface/Jamfile +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/reiserfs/beos_interface/Jamfile @@ -33,5 +33,5 @@ Addon reiserfs String.cpp SuperBlock.cpp - : libuserlandfs_beos_kernel.so + : libuserlandfs_beos_kernel.so $(TARGET_LIBSUPC++) ; diff --git a/src/tests/add-ons/media/plugins/musepack/Jamfile b/src/tests/add-ons/media/plugins/musepack/Jamfile index d3c1476926..adc59512ab 100644 --- a/src/tests/add-ons/media/plugins/musepack/Jamfile +++ b/src/tests/add-ons/media/plugins/musepack/Jamfile @@ -15,7 +15,7 @@ SimpleTest mpc_reader_test : MusePackReader.cpp MusePackDecoder.cpp - : libmusepack.a media be + : libmusepack.a media be $(TARGET_LIBSUPC++) ; # Tell Jam where to find these sources diff --git a/src/tests/add-ons/print/pdf/bezierbounds/Jamfile b/src/tests/add-ons/print/pdf/bezierbounds/Jamfile index 81e153e1dc..5fb896bdaa 100644 --- a/src/tests/add-ons/print/pdf/bezierbounds/Jamfile +++ b/src/tests/add-ons/print/pdf/bezierbounds/Jamfile @@ -13,7 +13,7 @@ local sources = SimpleTest BezierBounds : $(sources) - : be root + : be $(TARGET_LIBSUPC++) root ; # Tell Jam where to find these sources: diff --git a/src/tests/add-ons/print/pdf/linepathbuilder/Jamfile b/src/tests/add-ons/print/pdf/linepathbuilder/Jamfile index 5b8031e2b8..f45c706ad4 100644 --- a/src/tests/add-ons/print/pdf/linepathbuilder/Jamfile +++ b/src/tests/add-ons/print/pdf/linepathbuilder/Jamfile @@ -13,7 +13,7 @@ local sources = SimpleTest LinePathBuilder : $(sources) - : be root + : be $(TARGET_LIBSUPC++) root ; # Tell Jam where to find these sources: diff --git a/src/tests/add-ons/print/ppd/test/Jamfile b/src/tests/add-ons/print/ppd/test/Jamfile index f4fc0c7049..cb512dddd3 100644 --- a/src/tests/add-ons/print/ppd/test/Jamfile +++ b/src/tests/add-ons/print/ppd/test/Jamfile @@ -11,7 +11,7 @@ SubDirHdrs $(HAIKU_TOP) src tests add-ons print ppd ui ; SimpleTest PPDConfig : PPDConfigApplication.cpp - : be root libppdtest.a + : be root libppdtest.a $(TARGET_LIBSUPC++) ; SimpleTest PPDTest : @@ -19,6 +19,6 @@ SimpleTest PPDTest : TestParser.cpp TestScanner.cpp : - be root libppdtest.a + be root libppdtest.a $(TARGET_LIBSUPC++) ; diff --git a/src/tests/add-ons/print/transports/Jamfile b/src/tests/add-ons/print/transports/Jamfile index 0ea3b4d7cb..bd43990e7a 100644 --- a/src/tests/add-ons/print/transports/Jamfile +++ b/src/tests/add-ons/print/transports/Jamfile @@ -1,4 +1,4 @@ SubDir HAIKU_TOP src tests add-ons print transports ; -SimpleTest print_transport_loader : main.cpp : be ; +SimpleTest print_transport_loader : main.cpp : be $(TARGET_LIBSUPC++) ; diff --git a/src/tests/add-ons/translators/exif/Jamfile b/src/tests/add-ons/translators/exif/Jamfile index f05be7d5f8..2fa8ff1288 100644 --- a/src/tests/add-ons/translators/exif/Jamfile +++ b/src/tests/add-ons/translators/exif/Jamfile @@ -10,7 +10,7 @@ SimpleTest dump_exif : dump_exif.cpp exif_parser.cpp - : be + : be $(TARGET_LIBSTDC++) ; SEARCH on [ FGristFiles diff --git a/src/tests/apps/fake_app_server/Jamfile b/src/tests/apps/fake_app_server/Jamfile index 65ea11c53e..650e0303fd 100644 --- a/src/tests/apps/fake_app_server/Jamfile +++ b/src/tests/apps/fake_app_server/Jamfile @@ -12,5 +12,5 @@ UseFreeTypeHeaders ; Server fake_app_server : AppServer.cpp ServerApp.cpp - : be + : be $(TARGET_LIBSUPC++) ; diff --git a/src/tests/apps/miniterminal/Jamfile b/src/tests/apps/miniterminal/Jamfile index 90d0a04834..cbb2e0ceb5 100644 --- a/src/tests/apps/miniterminal/Jamfile +++ b/src/tests/apps/miniterminal/Jamfile @@ -14,5 +14,5 @@ Application MiniTerminal : MiniView.cpp MiniWin.cpp ViewBuffer.cpp - : be + : be $(TARGET_LIBSUPC++) ; diff --git a/src/tests/apps/partitioner/Jamfile b/src/tests/apps/partitioner/Jamfile index 87688fcc35..ee91cb9b38 100644 --- a/src/tests/apps/partitioner/Jamfile +++ b/src/tests/apps/partitioner/Jamfile @@ -6,5 +6,5 @@ UsePrivateHeaders storage ; SimpleTest Partitioner : Partitioner.cpp - : be + : be $(TARGET_LIBSUPC++) ; diff --git a/src/tests/apps/terminal_replicant/Jamfile b/src/tests/apps/terminal_replicant/Jamfile index ad1241252d..ac83201a43 100644 --- a/src/tests/apps/terminal_replicant/Jamfile +++ b/src/tests/apps/terminal_replicant/Jamfile @@ -6,7 +6,7 @@ SubDirHdrs [ FDirName $(HAIKU_TOP) src apps terminal ] ; Application RepliTerminal : main.cpp - : be + : be $(TARGET_LIBSUPC++) ; diff --git a/src/tests/kits/game/chart/Jamfile b/src/tests/kits/game/chart/Jamfile index 168e2cffc6..05e3c2759f 100644 --- a/src/tests/kits/game/chart/Jamfile +++ b/src/tests/kits/game/chart/Jamfile @@ -8,7 +8,7 @@ Application Chart : ChartRender.cpp ChartView.cpp ChartWindow.cpp - : be game + : be game $(TARGET_LIBSUPC++) : Chart.rdef ; diff --git a/src/tests/kits/game/direct_window_info_test/Jamfile b/src/tests/kits/game/direct_window_info_test/Jamfile index 473ff12e98..13f299c816 100644 --- a/src/tests/kits/game/direct_window_info_test/Jamfile +++ b/src/tests/kits/game/direct_window_info_test/Jamfile @@ -2,6 +2,6 @@ SubDir HAIKU_TOP src tests kits game direct_window_info_test ; SimpleTest dw_info : dwinfo.cpp - : game be root + : game be root $(TARGET_LIBSUPC++) ; diff --git a/src/tests/kits/game/direct_window_test/Jamfile b/src/tests/kits/game/direct_window_test/Jamfile index 2360f45df3..54c3404974 100644 --- a/src/tests/kits/game/direct_window_test/Jamfile +++ b/src/tests/kits/game/direct_window_test/Jamfile @@ -5,7 +5,7 @@ AddSubDirSupportedPlatforms libbe_test ; SimpleTest DirectWindowStars : Stars.cpp StarWindow.cpp - : game be + : game be $(TARGET_LIBSUPC++) ; if ( $(TARGET_PLATFORM) = libbe_test ) { diff --git a/src/tests/kits/game/page_flipper/Jamfile b/src/tests/kits/game/page_flipper/Jamfile index 550f90d5c3..8fa7f67e13 100644 --- a/src/tests/kits/game/page_flipper/Jamfile +++ b/src/tests/kits/game/page_flipper/Jamfile @@ -2,6 +2,6 @@ SubDir HAIKU_TOP src tests kits game page_flipper ; SimpleTest PageFlipper : page_flip.cpp - : game be root + : game be root $(TARGET_LIBSUPC++) ; diff --git a/src/tests/kits/game/simple_game_sound_test/Jamfile b/src/tests/kits/game/simple_game_sound_test/Jamfile index 9458c95938..d5e1e53971 100644 --- a/src/tests/kits/game/simple_game_sound_test/Jamfile +++ b/src/tests/kits/game/simple_game_sound_test/Jamfile @@ -2,5 +2,5 @@ SubDir HAIKU_TOP src tests kits game simple_game_sound_test ; SimpleTest simple_game_sound_test : SimpleSoundTest.cpp - : game tracker be root + : game tracker be root $(TARGET_LIBSUPC++) ; diff --git a/src/tests/kits/interface/Jamfile b/src/tests/kits/interface/Jamfile index c1076427a8..cbe66af830 100644 --- a/src/tests/kits/interface/Jamfile +++ b/src/tests/kits/interface/Jamfile @@ -58,26 +58,26 @@ ObjectDefines SimpleTest ScrollViewTest_r5 : ScrollViewTest.cpp - : be + : be $(TARGET_LIBSUPC++) ; SimpleTest ScrollViewTest : ScrollViewTest.cpp ScrollView.cpp - : be + : be $(TARGET_LIBSUPC++) ; SimpleTest ChannelSliderTest : ChannelSliderTest.cpp ChannelSlider.cpp ChannelControl.cpp - : be + : be $(TARGET_LIBSUPC++) ; SimpleTest CheckBoxTest : CheckBoxTest.cpp CheckBox.cpp - : be + : be $(TARGET_LIBSUPC++) ; SimpleTest ScreenTest : @@ -87,40 +87,40 @@ SimpleTest ScreenTest : SimpleTest StatusBarTest : StatusBarTest.cpp - : be + : be $(TARGET_LIBSUPC++) ; SimpleTest GetMouseTest : GetMouseTest.cpp - : be + : be $(TARGET_LIBSUPC++) ; SimpleTest PulseTest : PulseTest.cpp - : be + : be $(TARGET_LIBSUPC++) ; SimpleTest SliderTest_r5 : SliderTest.cpp - : be + : be $(TARGET_LIBSUPC++) ; SimpleTest SliderTest : SliderTest.cpp Slider.cpp Control.cpp - : be + : be $(TARGET_LIBSUPC++) ; SimpleTest MenuBeginningTest : MenuBeginningTest.cpp - : be + : be $(TARGET_LIBSUPC++) ; Application MenuTriggerTest : MenuTriggerTest.cpp - : be + : be $(TARGET_LIBSUPC++) ; @@ -132,24 +132,24 @@ SimpleTest WidthBufferTest : SimpleTest ClippingPlusRedraw : ClippingPlusRedraw.cpp - : be + : be $(TARGET_LIBSUPC++) ; SimpleTest SetDiskModeTest : SetDiskModeTest.cpp - : be + : be $(TARGET_LIBSUPC++) ; SimpleTest SetBorderScrollViewTest : ScrollViewSetBorderTest.cpp ScrollView.cpp - : be + : be $(TARGET_LIBSUPC++) ; SimpleTest TextViewTest : TextViewTest.cpp - : be + : be $(TARGET_LIBSUPC++) ; SEARCH on [ FGristFiles diff --git a/src/tests/kits/interface/bshelf/Jamfile b/src/tests/kits/interface/bshelf/Jamfile index 3768d03a77..6bb285cf97 100644 --- a/src/tests/kits/interface/bshelf/Jamfile +++ b/src/tests/kits/interface/bshelf/Jamfile @@ -12,7 +12,7 @@ if $(TARGET_PLATFORM) != haiku { SimpleTest ShelfTest : ShelfTest.cpp - : be + : be $(TARGET_LIBSUPC++) ; SEARCH on [ FGristFiles diff --git a/src/tests/kits/interface/flatten_picture/Jamfile b/src/tests/kits/interface/flatten_picture/Jamfile index 007fd0bc32..401e11c8a0 100644 --- a/src/tests/kits/interface/flatten_picture/Jamfile +++ b/src/tests/kits/interface/flatten_picture/Jamfile @@ -11,4 +11,5 @@ SimpleTest FlattenPictureTest : LinkAgainst FlattenPictureTest : be root + $(TARGET_LIBSUPC++) ; diff --git a/src/tests/kits/interface/layout/Jamfile b/src/tests/kits/interface/layout/Jamfile index aa94f38794..232428b20e 100644 --- a/src/tests/kits/interface/layout/Jamfile +++ b/src/tests/kits/interface/layout/Jamfile @@ -5,7 +5,7 @@ SetSubDirSupportedPlatforms haiku libbe_test ; SimpleTest LayoutTest1 : LayoutTest1.cpp : - be + be $(TARGET_LIBSUPC++) ; if $(TARGET_PLATFORM) = libbe_test { diff --git a/src/tests/kits/interface/look/Jamfile b/src/tests/kits/interface/look/Jamfile index 35e10ae74a..738eda26f0 100644 --- a/src/tests/kits/interface/look/Jamfile +++ b/src/tests/kits/interface/look/Jamfile @@ -4,5 +4,5 @@ UsePrivateHeaders interface ; SimpleTest LookTest : Look.cpp - : be tracker libcolumnlistview.a + : be tracker libcolumnlistview.a $(TARGET_LIBSUPC++) ; diff --git a/src/tests/kits/interface/picture/Jamfile b/src/tests/kits/interface/picture/Jamfile index 0916fa0778..5d4209c74f 100644 --- a/src/tests/kits/interface/picture/Jamfile +++ b/src/tests/kits/interface/picture/Jamfile @@ -21,5 +21,5 @@ UseLibraryHeaders agg expat ; SimpleTest PictureTest : PictureTest.cpp SVGViewView.cpp - : be translation libexpat.a + : be translation libexpat.a $(TARGET_LIBSUPC++) ; diff --git a/src/tests/kits/interface/pictureprint/Jamfile b/src/tests/kits/interface/pictureprint/Jamfile index 0af96a2459..b1235522f3 100644 --- a/src/tests/kits/interface/pictureprint/Jamfile +++ b/src/tests/kits/interface/pictureprint/Jamfile @@ -13,6 +13,7 @@ LinkAgainst TestPictureApp : be root libprintutils.a + $(TARGET_LIBSUPC++) ; SimpleTest DumpPrintJob : diff --git a/src/tests/kits/locale/Jamfile b/src/tests/kits/locale/Jamfile index 1634affb51..22d6e2c01c 100644 --- a/src/tests/kits/locale/Jamfile +++ b/src/tests/kits/locale/Jamfile @@ -20,7 +20,7 @@ rule LocaleTest # LocaleTest ; local sources = $(1) ; local name = $(sources[1]:B) ; - Application $(name) : $(sources) : be liblocale.so ; + Application $(name) : $(sources) : be liblocale.so $(TARGET_LIBSUPC++) ; } LocaleTest catalogSpeed.cpp ; @@ -32,7 +32,7 @@ LocaleTest localeTest.cpp ; Addon catalogTestAddOn : catalogTestAddOn.cpp - : be liblocale.so + : be liblocale.so ; SubInclude HAIKU_TOP src tests kits locale number_format ; diff --git a/src/tests/kits/media/Jamfile b/src/tests/kits/media/Jamfile index ba61d5c5ea..3f29b048f6 100644 --- a/src/tests/kits/media/Jamfile +++ b/src/tests/kits/media/Jamfile @@ -1,8 +1,8 @@ SubDir HAIKU_TOP src tests kits media ; -SimpleTest AreaTest : AreaTest.cpp : be ; +SimpleTest AreaTest : AreaTest.cpp : be $(TARGET_LIBSUPC++) ; -SimpleTest BufferTest : BufferTest.cpp : libmedia.so be ; +SimpleTest BufferTest : BufferTest.cpp : libmedia.so be $(TARGET_LIBSUPC++) ; SimpleTest SizeofTest : SizeofTest.cpp : be ; diff --git a/src/tests/kits/media/media_decoder/Jamfile b/src/tests/kits/media/media_decoder/Jamfile index de2aa063b3..dac93bd19e 100644 --- a/src/tests/kits/media/media_decoder/Jamfile +++ b/src/tests/kits/media/media_decoder/Jamfile @@ -4,5 +4,5 @@ UsePrivateHeaders media_decoder ; SimpleTest media_decoder : media_decoder.cpp - : libmedia.so be root + : libmedia.so be root $(TARGET_LIBSUPC++) ; diff --git a/src/tests/kits/media/mp3_reader_test/Jamfile b/src/tests/kits/media/mp3_reader_test/Jamfile index 5aac078cb9..4c5f569237 100644 --- a/src/tests/kits/media/mp3_reader_test/Jamfile +++ b/src/tests/kits/media/mp3_reader_test/Jamfile @@ -8,7 +8,7 @@ SimpleTest mp3_reader_test MediaPlugin.cpp ReaderPlugin.cpp MP3ReaderPlugin.cpp - : media be root + : media be root $(TARGET_LIBSUPC++) ; # Tell Jam where to find these sources diff --git a/src/tests/kits/media/notificationtest/Jamfile b/src/tests/kits/media/notificationtest/Jamfile index 75def795a1..979a3848b5 100644 --- a/src/tests/kits/media/notificationtest/Jamfile +++ b/src/tests/kits/media/notificationtest/Jamfile @@ -2,6 +2,6 @@ SubDir HAIKU_TOP src tests kits media notificationtest ; SimpleTest NotificationTest : main.cpp - : media be root + : media be root $(TARGET_LIBSUPC++) ; diff --git a/src/tests/kits/media/playwav/Jamfile b/src/tests/kits/media/playwav/Jamfile index 351613266f..0c00dcc464 100644 --- a/src/tests/kits/media/playwav/Jamfile +++ b/src/tests/kits/media/playwav/Jamfile @@ -4,5 +4,5 @@ UsePrivateHeaders media ; SimpleTest playwav : playwav.cpp - : media be root + : media be root $(TARGET_LIBSUPC++) ; diff --git a/src/tests/kits/media/wav_reader_test/Jamfile b/src/tests/kits/media/wav_reader_test/Jamfile index 0afcaf2a11..fad4182bb9 100644 --- a/src/tests/kits/media/wav_reader_test/Jamfile +++ b/src/tests/kits/media/wav_reader_test/Jamfile @@ -8,7 +8,7 @@ SimpleTest wav_reader_test MediaPlugin.cpp ReaderPlugin.cpp WavReaderPlugin.cpp - : media be root + : media be root $(TARGET_LIBSUPC++) ; # Tell Jam where to find these sources diff --git a/src/tests/kits/net/Jamfile b/src/tests/kits/net/Jamfile index cff0ab1a02..53980f007e 100644 --- a/src/tests/kits/net/Jamfile +++ b/src/tests/kits/net/Jamfile @@ -20,7 +20,7 @@ SimpleTest NetAddressTest : NetAddressTest.cpp : $(TARGET_NETWORK_LIBS) $(HAIKU_NETAPI_LIB) ; SimpleTest NetEndpointTest : NetEndpointTest.cpp - : $(TARGET_NETWORK_LIBS) $(HAIKU_NETAPI_LIB) be ; + : $(TARGET_NETWORK_LIBS) $(HAIKU_NETAPI_LIB) be $(TARGET_LIBSUPC++) ; SubInclude HAIKU_TOP src tests kits net DialUpPreflet ; SubInclude HAIKU_TOP src tests kits net multicast ; diff --git a/src/tests/kits/net/preflet/Jamfile b/src/tests/kits/net/preflet/Jamfile index c9f14f62e4..294c83a6b7 100644 --- a/src/tests/kits/net/preflet/Jamfile +++ b/src/tests/kits/net/preflet/Jamfile @@ -6,5 +6,5 @@ SimpleTest NetworkSetup : NetworkSetupProfile.cpp NetworkSetupAddOn.cpp BoneyardAddOn.cpp - : be root + : be root $(TARGET_LIBSUPC++) ; diff --git a/src/tests/kits/net/tcptester/Jamfile b/src/tests/kits/net/tcptester/Jamfile index 6ae38099da..57c169e628 100644 --- a/src/tests/kits/net/tcptester/Jamfile +++ b/src/tests/kits/net/tcptester/Jamfile @@ -2,5 +2,5 @@ SubDir HAIKU_TOP src tests kits net tcptester ; BinCommand tcptester : tcptester.cpp - : libnetwork.so + : libnetwork.so $(TARGET_LIBSUPC++) ; diff --git a/src/tests/kits/opengl/direct_mode/Jamfile b/src/tests/kits/opengl/direct_mode/Jamfile index c5dd4ea2d6..070d5e7abe 100644 --- a/src/tests/kits/opengl/direct_mode/Jamfile +++ b/src/tests/kits/opengl/direct_mode/Jamfile @@ -11,6 +11,6 @@ if $(TARGET_PLATFORM) != haiku { SimpleTest GLDirectMode : GLDirectMode.cpp - : be game libGL.so + : be game libGL.so $(TARGET_LIBSUPC++) : GLDirectMode.rdef ; diff --git a/src/tests/kits/opengl/glinfo/Jamfile b/src/tests/kits/opengl/glinfo/Jamfile index 8729ac3052..d2b64f494f 100644 --- a/src/tests/kits/opengl/glinfo/Jamfile +++ b/src/tests/kits/opengl/glinfo/Jamfile @@ -11,5 +11,5 @@ if $(TARGET_PLATFORM) != haiku { SimpleTest GLInfo : GLInfo.cpp - : be libGL.so + : be libGL.so $(TARGET_LIBSUPC++) ; diff --git a/src/tests/kits/storage/testapps/Jamfile b/src/tests/kits/storage/testapps/Jamfile index 981c714ac2..2698a85667 100644 --- a/src/tests/kits/storage/testapps/Jamfile +++ b/src/tests/kits/storage/testapps/Jamfile @@ -14,7 +14,7 @@ SimpleTest dump_mime_types : dump_mime_types.cpp : be ; SimpleTest NodeMonitorTest - : NodeMonitorTest.cpp : be ; + : NodeMonitorTest.cpp : be $(TARGET_LIBSUPC++) ; SimpleTest PathMonitorTest : PathMonitorTest.cpp PathMonitor.cpp diff --git a/src/tests/kits/support/barchivable/remoteobjectdef/Jamfile b/src/tests/kits/support/barchivable/remoteobjectdef/Jamfile index 17ef30192e..c7757bd0ab 100644 --- a/src/tests/kits/support/barchivable/remoteobjectdef/Jamfile +++ b/src/tests/kits/support/barchivable/remoteobjectdef/Jamfile @@ -5,6 +5,6 @@ AddSubDirSupportedPlatforms libbe_test ; UnitTestLib libsupporttest_RemoteTestObject.so : RemoteTestObject.cpp - : be $(LIBSTDC++) + : be $(TARGET_LIBSTDC++) : RemoteTestObject.rdef ; diff --git a/src/tests/libs/alm/Jamfile b/src/tests/libs/alm/Jamfile index 3f0cb09d84..7469c29bd9 100644 --- a/src/tests/libs/alm/Jamfile +++ b/src/tests/libs/alm/Jamfile @@ -7,24 +7,24 @@ UseLibraryHeaders lp_solve linprog alm ; Application ALMTableTest : TableTest.cpp : - be liblpsolve55.so liblinprog.so libalm.so + be liblpsolve55.so liblinprog.so libalm.so $(TARGET_LIBSUPC++) ; Application ALMTest1 : Test1.cpp : - be liblpsolve55.so be liblinprog.so libalm.so + be liblpsolve55.so be liblinprog.so libalm.so $(TARGET_LIBSUPC++) ; Application ALMTest2 : Test2.cpp : - be liblpsolve55.so be liblinprog.so libalm.so + be liblpsolve55.so be liblinprog.so libalm.so $(TARGET_LIBSUPC++) ; Application ALMSimpleTest : SimpleTest.cpp : - be liblpsolve55.so be liblinprog.so libalm.so + be liblpsolve55.so be liblinprog.so libalm.so $(TARGET_LIBSUPC++) ; diff --git a/src/tests/libs/linprog/Jamfile b/src/tests/libs/linprog/Jamfile index 960772b0a0..871e2df3b1 100644 --- a/src/tests/libs/linprog/Jamfile +++ b/src/tests/libs/linprog/Jamfile @@ -7,5 +7,5 @@ UseLibraryHeaders lp_solve linprog ; SimpleTest linprog_test : Program.cpp : - be liblpsolve55.so liblinprog.so + be liblpsolve55.so liblinprog.so $(TARGET_LIBSUPC++) ; diff --git a/src/tests/misc/Jamfile b/src/tests/misc/Jamfile index 8f9c1960ae..40aae93925 100644 --- a/src/tests/misc/Jamfile +++ b/src/tests/misc/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src tests misc ; SetSubDirSupportedPlatformsBeOSCompatible ; -SimpleTest rtti-test : rtti-test.cpp : be ; +SimpleTest rtti-test : rtti-test.cpp : be $(TARGET_LIBSUPC++) ; SimpleTest writev-test : writev-test.cpp : be ; SubInclude HAIKU_TOP src tests misc exception-test ; diff --git a/src/tests/misc/exception-test/Jamfile b/src/tests/misc/exception-test/Jamfile index 1309c8444f..0ff3df2d30 100644 --- a/src/tests/misc/exception-test/Jamfile +++ b/src/tests/misc/exception-test/Jamfile @@ -4,6 +4,7 @@ SetSubDirSupportedPlatformsBeOSCompatible ; SharedLibrary libexceptiontest.so : exceptions.cpp + : $(TARGET_LIBSUPC++) ; SimpleTest exception-test diff --git a/src/tests/servers/app/async_drawing/Jamfile b/src/tests/servers/app/async_drawing/Jamfile index 4e47dd7dfd..1d465a1ee4 100644 --- a/src/tests/servers/app/async_drawing/Jamfile +++ b/src/tests/servers/app/async_drawing/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; SimpleTest AsyncDrawing : main.cpp - : be ; + : be $(TARGET_LIBSUPC++) ; if ( $(TARGET_PLATFORM) = libbe_test ) { HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : AsyncDrawing diff --git a/src/tests/servers/app/avoid_focus/Jamfile b/src/tests/servers/app/avoid_focus/Jamfile index 7e1620b3e7..66ea9b041d 100644 --- a/src/tests/servers/app/avoid_focus/Jamfile +++ b/src/tests/servers/app/avoid_focus/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; Application AvoidFocus : AvoidFocus.cpp - : be + : be $(TARGET_LIBSUPC++) ; if $(TARGET_PLATFORM) = libbe_test { diff --git a/src/tests/servers/app/benchmark/Jamfile b/src/tests/servers/app/benchmark/Jamfile index 2e2dd927a9..e9f313d103 100644 --- a/src/tests/servers/app/benchmark/Jamfile +++ b/src/tests/servers/app/benchmark/Jamfile @@ -15,7 +15,7 @@ Application Benchmark : Test.cpp TestWindow.cpp VerticalLineTest.cpp - : be + : be $(TARGET_LIBSUPC++) ; if ( $(TARGET_PLATFORM) = libbe_test ) { diff --git a/src/tests/servers/app/bitmap_bounds/Jamfile b/src/tests/servers/app/bitmap_bounds/Jamfile index bf7c0532f6..16e76bbfce 100644 --- a/src/tests/servers/app/bitmap_bounds/Jamfile +++ b/src/tests/servers/app/bitmap_bounds/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; SimpleTest BitmapBounds : main.cpp - : be ; + : be $(TARGET_LIBSUPC++) ; if ( $(TARGET_PLATFORM) = libbe_test ) { HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : BitmapBounds diff --git a/src/tests/servers/app/bitmap_drawing/Jamfile b/src/tests/servers/app/bitmap_drawing/Jamfile index 55c8e35b9b..4337b51b47 100644 --- a/src/tests/servers/app/bitmap_drawing/Jamfile +++ b/src/tests/servers/app/bitmap_drawing/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; Application BitmapDrawing : main.cpp - : be + : be $(TARGET_LIBSUPC++) ; if ( $(TARGET_PLATFORM) = libbe_test ) { diff --git a/src/tests/servers/app/constrain_clipping_region/Jamfile b/src/tests/servers/app/constrain_clipping_region/Jamfile index 5a5285c457..4bac710651 100644 --- a/src/tests/servers/app/constrain_clipping_region/Jamfile +++ b/src/tests/servers/app/constrain_clipping_region/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; SimpleTest ClippingRegion : main.cpp - : be ; + : be $(TARGET_LIBSUPC++) ; if ( $(TARGET_PLATFORM) = libbe_test ) { HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : ClippingRegion diff --git a/src/tests/servers/app/copy_bits/Jamfile b/src/tests/servers/app/copy_bits/Jamfile index 24ecb98266..c35ffbc7eb 100644 --- a/src/tests/servers/app/copy_bits/Jamfile +++ b/src/tests/servers/app/copy_bits/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; SimpleTest CopyBits : main.cpp - : be ; + : be $(TARGET_LIBSUPC++) ; #if ( $(TARGET_PLATFORM) = libbe_test ) { # HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : CopyBits diff --git a/src/tests/servers/app/cursor_test/Jamfile b/src/tests/servers/app/cursor_test/Jamfile index bbc70f791f..13754f6269 100644 --- a/src/tests/servers/app/cursor_test/Jamfile +++ b/src/tests/servers/app/cursor_test/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; Application CursorTest : CursorTest.cpp - : be + : be $(TARGET_LIBSUPC++) ; if $(TARGET_PLATFORM) = libbe_test { diff --git a/src/tests/servers/app/desktop_window/Jamfile b/src/tests/servers/app/desktop_window/Jamfile index 9695260b47..ebebce035e 100644 --- a/src/tests/servers/app/desktop_window/Jamfile +++ b/src/tests/servers/app/desktop_window/Jamfile @@ -9,7 +9,7 @@ UsePrivateHeaders interface ; Application DesktopWindow : DesktopWindow.cpp - : be + : be $(TARGET_LIBSUPC++) ; if $(TARGET_PLATFORM) = libbe_test { diff --git a/src/tests/servers/app/drawing_debugger/Jamfile b/src/tests/servers/app/drawing_debugger/Jamfile index 2b20d6823c..b7800c2435 100644 --- a/src/tests/servers/app/drawing_debugger/Jamfile +++ b/src/tests/servers/app/drawing_debugger/Jamfile @@ -8,5 +8,5 @@ UseHeaders [ FDirName os interface ] ; Application DrawingDebugger : DrawingDebugger.cpp - : be + : be $(TARGET_LIBSUPC++) ; diff --git a/src/tests/servers/app/event_mask/Jamfile b/src/tests/servers/app/event_mask/Jamfile index 438067f73d..5b12d8db40 100644 --- a/src/tests/servers/app/event_mask/Jamfile +++ b/src/tests/servers/app/event_mask/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; Application EventMask : EventMask.cpp - : be + : be $(TARGET_LIBSUPC++) ; if $(TARGET_PLATFORM) = libbe_test { diff --git a/src/tests/servers/app/find_view/Jamfile b/src/tests/servers/app/find_view/Jamfile index 59590eff20..abea9de19c 100644 --- a/src/tests/servers/app/find_view/Jamfile +++ b/src/tests/servers/app/find_view/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; Application FindView : FindView.cpp - : be + : be $(TARGET_LIBSUPC++) ; if ( $(TARGET_PLATFORM) = libbe_test ) { diff --git a/src/tests/servers/app/following/Jamfile b/src/tests/servers/app/following/Jamfile index 3c01c443fd..7d81adf2e2 100644 --- a/src/tests/servers/app/following/Jamfile +++ b/src/tests/servers/app/following/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; SimpleTest Following : main.cpp - : be ; + : be $(TARGET_LIBSUPC++) ; if ( $(TARGET_PLATFORM) = libbe_test ) { HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : Following diff --git a/src/tests/servers/app/hide_and_show/Jamfile b/src/tests/servers/app/hide_and_show/Jamfile index 054a325ca2..3d7404b21d 100644 --- a/src/tests/servers/app/hide_and_show/Jamfile +++ b/src/tests/servers/app/hide_and_show/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; Application HideAndShow : HideAndShow.cpp - : be + : be $(TARGET_LIBSUPC++) ; if $(TARGET_PLATFORM) = libbe_test { diff --git a/src/tests/servers/app/lagging_get_mouse/Jamfile b/src/tests/servers/app/lagging_get_mouse/Jamfile index 1a56b25270..75bd492bd8 100644 --- a/src/tests/servers/app/lagging_get_mouse/Jamfile +++ b/src/tests/servers/app/lagging_get_mouse/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src tests servers app statusbar ; +SubDir HAIKU_TOP src tests servers app lagging_get_mouse ; SetSubDirSupportedPlatformsBeOSCompatible ; AddSubDirSupportedPlatforms libbe_test ; @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; SimpleTest LaggingGetMouse : main.cpp - : be ; + : be $(TARGET_LIBSUPC++) ; if ( $(TARGET_PLATFORM) = libbe_test ) { HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : LaggingGetMouse diff --git a/src/tests/servers/app/lock_focus/Jamfile b/src/tests/servers/app/lock_focus/Jamfile index 49a3e884f2..5cef6b53ec 100644 --- a/src/tests/servers/app/lock_focus/Jamfile +++ b/src/tests/servers/app/lock_focus/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; Application LockFocusTest : LockFocusTest.cpp - : be + : be $(TARGET_LIBSUPC++) ; if $(TARGET_PLATFORM) = libbe_test { diff --git a/src/tests/servers/app/look_and_feel/Jamfile b/src/tests/servers/app/look_and_feel/Jamfile index 06a409f541..e6f35b7a74 100644 --- a/src/tests/servers/app/look_and_feel/Jamfile +++ b/src/tests/servers/app/look_and_feel/Jamfile @@ -9,7 +9,7 @@ UsePrivateHeaders interface ; Application LookAndFeel : LookAndFeel.cpp - : be + : be $(TARGET_LIBSUPC++) ; if $(TARGET_PLATFORM) = libbe_test { diff --git a/src/tests/servers/app/menu_crash/Jamfile b/src/tests/servers/app/menu_crash/Jamfile index cbec8fcac3..9e851a28f2 100644 --- a/src/tests/servers/app/menu_crash/Jamfile +++ b/src/tests/servers/app/menu_crash/Jamfile @@ -8,6 +8,6 @@ UseHeaders [ FDirName os interface ] ; Application MenuCrash : MenuCrash.cpp - : be + : be $(TARGET_LIBSUPC++) ; diff --git a/src/tests/servers/app/playground/Jamfile b/src/tests/servers/app/playground/Jamfile index 5eda86a6f0..343845d4f9 100644 --- a/src/tests/servers/app/playground/Jamfile +++ b/src/tests/servers/app/playground/Jamfile @@ -11,7 +11,7 @@ Application Playground : ObjectView.cpp ObjectWindow.cpp States.cpp - : be + : be $(TARGET_LIBSUPC++) : Playground.rdef ; diff --git a/src/tests/servers/app/resize_limits/Jamfile b/src/tests/servers/app/resize_limits/Jamfile index bde2676923..72fdb30676 100644 --- a/src/tests/servers/app/resize_limits/Jamfile +++ b/src/tests/servers/app/resize_limits/Jamfile @@ -5,5 +5,5 @@ AddSubDirSupportedPlatforms libbe_test ; Application ResizeLimits : ResizeLimits.cpp - : be + : be $(TARGET_LIBSUPC++) ; diff --git a/src/tests/servers/app/scrollbar/Jamfile b/src/tests/servers/app/scrollbar/Jamfile index 387848e2f0..13a6f44c7e 100644 --- a/src/tests/servers/app/scrollbar/Jamfile +++ b/src/tests/servers/app/scrollbar/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; SimpleTest ScrollBar : main.cpp - : be ; + : be $(TARGET_LIBSUPC++) ; if ( $(TARGET_PLATFORM) = libbe_test ) { HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : ScrollBar diff --git a/src/tests/servers/app/scrolling/Jamfile b/src/tests/servers/app/scrolling/Jamfile index 07a36f887d..3b4c5300bb 100644 --- a/src/tests/servers/app/scrolling/Jamfile +++ b/src/tests/servers/app/scrolling/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; SimpleTest Scrolling : main.cpp - : be ; + : be $(TARGET_LIBSUPC++) ; #if ( $(TARGET_PLATFORM) = libbe_test ) { # HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : Scrolling diff --git a/src/tests/servers/app/statusbar/Jamfile b/src/tests/servers/app/statusbar/Jamfile index fd6edbb0d5..3163c774be 100644 --- a/src/tests/servers/app/statusbar/Jamfile +++ b/src/tests/servers/app/statusbar/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; SimpleTest StatusBar : main.cpp - : be ; + : be $(TARGET_LIBSUPC++) ; if ( $(TARGET_PLATFORM) = libbe_test ) { HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : StatusBar diff --git a/src/tests/servers/app/textview/Jamfile b/src/tests/servers/app/textview/Jamfile index f892485b46..a39df77cd8 100644 --- a/src/tests/servers/app/textview/Jamfile +++ b/src/tests/servers/app/textview/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; SimpleTest TextView : main.cpp - : be ; + : be $(TARGET_LIBSUPC++) ; #if ( $(TARGET_PLATFORM) = libbe_test ) { # HaikuInstall install-test-apps : $(HAIKU_APP_TEST_DIR) : TextView diff --git a/src/tests/servers/app/view_state/Jamfile b/src/tests/servers/app/view_state/Jamfile index 52e9a5468e..e856ed9cbf 100644 --- a/src/tests/servers/app/view_state/Jamfile +++ b/src/tests/servers/app/view_state/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; Application ViewState : ViewState.cpp - : be + : be $(TARGET_LIBSUPC++) ; if $(TARGET_PLATFORM) = libbe_test { diff --git a/src/tests/servers/app/view_transit/Jamfile b/src/tests/servers/app/view_transit/Jamfile index 33b09d3d0c..e6699d301b 100644 --- a/src/tests/servers/app/view_transit/Jamfile +++ b/src/tests/servers/app/view_transit/Jamfile @@ -8,6 +8,6 @@ UseHeaders [ FDirName os interface ] ; Application ViewTransit : ViewTransit.cpp - : be + : be $(TARGET_LIBSUPC++) ; diff --git a/src/tests/servers/app/workspace_activated/Jamfile b/src/tests/servers/app/workspace_activated/Jamfile index cd41bfbf24..e243b93ea2 100644 --- a/src/tests/servers/app/workspace_activated/Jamfile +++ b/src/tests/servers/app/workspace_activated/Jamfile @@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ; Application WorkspaceActivated : WorkspaceActivated.cpp - : be + : be $(TARGET_LIBSUPC++) ; if $(TARGET_PLATFORM) = libbe_test { diff --git a/src/tests/servers/input/replicant/Jamfile b/src/tests/servers/input/replicant/Jamfile index 3fce9902b6..029ad7c83a 100644 --- a/src/tests/servers/input/replicant/Jamfile +++ b/src/tests/servers/input/replicant/Jamfile @@ -12,7 +12,7 @@ SimpleTest ReplicantTest : MethodReplicant.cpp MethodMenuItem.cpp main.cpp - : be tracker ; + : be tracker $(TARGET_LIBSUPC++) ; SEARCH on [ FGristFiles MethodReplicant.cpp diff --git a/src/tests/servers/registrar/Jamfile b/src/tests/servers/registrar/Jamfile index 5022f20113..028c368052 100644 --- a/src/tests/servers/registrar/Jamfile +++ b/src/tests/servers/registrar/Jamfile @@ -9,7 +9,7 @@ SetSubDirSupportedPlatformsBeOSCompatible ; SimpleTest RegistrarTest1 : RegistrarTest1.cpp - : be + : be $(TARGET_LIBSUPC++) ; SimpleTest RosterShell diff --git a/src/tests/system/consoled/Jamfile b/src/tests/system/consoled/Jamfile index eb7290564d..d05a55670e 100644 --- a/src/tests/system/consoled/Jamfile +++ b/src/tests/system/consoled/Jamfile @@ -3,4 +3,4 @@ SubDir HAIKU_TOP src tests system consoled ; UsePrivateHeaders kernel ; UseHeaders [ FDirName $(HAIKU_TOP) src apps terminal ] ; -Application consoled : consoled.cpp ; +Application consoled : consoled.cpp : $(TARGET_LIBSUPC++) ; diff --git a/src/tests/system/kernel/Jamfile b/src/tests/system/kernel/Jamfile index 7d65ec63db..658e921323 100644 --- a/src/tests/system/kernel/Jamfile +++ b/src/tests/system/kernel/Jamfile @@ -42,7 +42,8 @@ SimpleTest sem_acquire_test1 : sem_acquire_test1.cpp : be ; SimpleTest spinlock_contention : spinlock_contention.cpp ; -SimpleTest syscall_restart_test : syscall_restart_test.cpp : network ; +SimpleTest syscall_restart_test : syscall_restart_test.cpp + : network $(TARGET_LIBSUPC++) ; SetSupportedPlatformsForTarget syscall_time : $(HAIKU_BEOS_COMPATIBLE_PLATFORMS) ; diff --git a/src/tests/system/libroot/posix/Jamfile b/src/tests/system/libroot/posix/Jamfile index 649cc496f4..0c8da1c546 100644 --- a/src/tests/system/libroot/posix/Jamfile +++ b/src/tests/system/libroot/posix/Jamfile @@ -92,13 +92,13 @@ SimpleTest tst-swprintf : tst-swprintf.c ; -#SimpleTest tst-swcanf -# : tst-swscanf.c -#; +SimpleTest tst-swscanf + : tst-swscanf.c +; -#SimpleTest tst-swscanf2 -# : tst-swscanf2.c -#; +SimpleTest tst-swscanf2 + : tst-swscanf2.c +; SimpleTest tst-ungetwc1 : tst-ungetwc1.c @@ -128,9 +128,9 @@ SimpleTest tst-wprintf2 : tst-wprintf2.c ; -#SimpleTest tst-wscanf -# : tst-wscanf.c -#; +SimpleTest tst-wscanf + : tst-wscanf.c +; SimpleTest test_wcfuncs : test_wcfuncs.c diff --git a/src/tests/system/libroot/posix/bonnie++-1.03d/Jamfile b/src/tests/system/libroot/posix/bonnie++-1.03d/Jamfile index d1797efe7a..edd67c39cb 100644 --- a/src/tests/system/libroot/posix/bonnie++-1.03d/Jamfile +++ b/src/tests/system/libroot/posix/bonnie++-1.03d/Jamfile @@ -9,9 +9,13 @@ SimpleTest bonnie++ : bon_suid.cpp bonnie++.cpp + : + $(TARGET_LIBSUPC++) ; SimpleTest zcav : bon_suid.cpp zcav.cpp + : + $(TARGET_LIBSUPC++) ; diff --git a/src/tools/translation/bitsinfo/Jamfile b/src/tools/translation/bitsinfo/Jamfile index d728124f48..50b011f5a5 100644 --- a/src/tools/translation/bitsinfo/Jamfile +++ b/src/tools/translation/bitsinfo/Jamfile @@ -1,4 +1,4 @@ SubDir HAIKU_TOP src tools translation bitsinfo ; -BinCommand bitsinfo : bitsinfo.cpp : be ; +BinCommand bitsinfo : bitsinfo.cpp : be $(TARGET_LIBSUPC++) ; diff --git a/src/tools/translation/inspector/Jamfile b/src/tools/translation/inspector/Jamfile index f26409384d..d37b9e95d2 100644 --- a/src/tools/translation/inspector/Jamfile +++ b/src/tools/translation/inspector/Jamfile @@ -11,5 +11,5 @@ Application Inspector : ImageWindow.cpp InspectorApp.cpp ; -LinkAgainst Inspector : be tracker translation ; +LinkAgainst Inspector : be tracker translation $(TARGET_LIBSUPC++) ; diff --git a/src/tools/translation/pnginfo/Jamfile b/src/tools/translation/pnginfo/Jamfile index 191fd50364..68c56b5922 100644 --- a/src/tools/translation/pnginfo/Jamfile +++ b/src/tools/translation/pnginfo/Jamfile @@ -3,5 +3,5 @@ SubDir HAIKU_TOP src tools translation pnginfo ; UseLibraryHeaders zlib ; UseLibraryHeaders png ; -BinCommand pnginfo : pnginfo.cpp : be libpng.a libz.a ; +BinCommand pnginfo : pnginfo.cpp : be libpng.a libz.a $(TARGET_LIBSUPC++) ; diff --git a/src/tools/translation/stxtinfo/Jamfile b/src/tools/translation/stxtinfo/Jamfile index ca2c395502..62b9993334 100644 --- a/src/tools/translation/stxtinfo/Jamfile +++ b/src/tools/translation/stxtinfo/Jamfile @@ -1,4 +1,4 @@ SubDir HAIKU_TOP src tools translation stxtinfo ; -BinCommand stxtinfo : stxtinfo.cpp : be ; +BinCommand stxtinfo : stxtinfo.cpp : be $(TARGET_LIBSUPC++) ;