hrev50354 adds 2 changesets to branch 'master'
old head: 408530de9c1499390f9373d23d8c35d964de73e5
new head: 0b20cac7c345bf5101ad2991ed959653f8cc4a0a
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=0b20cac7c345+%5E408530de9c14
----------------------------------------------------------------------------
9968f343022a: Debugger: Adjust header order.
- Ensure that the debugger lib's headers are included before those of
libshared
to minimize conflicts between the respective Thread classes. Fixes gcc2
build.
Thanks to Jerome for reporting.
0b20cac7c345: libdebugger: Remove unnecessary header dependency.
- The library does not depend on libedit/ncurses, these were contained
entirely within the application level code.
[ Rene Gollent <rene@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 7 insertions(+), 9 deletions(-)
src/apps/debugger/Jamfile | 8 ++++----
src/kits/debugger/Jamfile | 8 +++-----
############################################################################
Commit: 9968f343022ad8adfb3005a950f35c7c5d116190
URL: http://cgit.haiku-os.org/haiku/commit/?id=9968f343022a
Author: Rene Gollent <rene@xxxxxxxxxxx>
Date: Sun Jun 5 22:21:52 2016 UTC
Debugger: Adjust header order.
- Ensure that the debugger lib's headers are included before those of libshared
to minimize conflicts between the respective Thread classes. Fixes gcc2 build.
Thanks to Jerome for reporting.
----------------------------------------------------------------------------
diff --git a/src/apps/debugger/Jamfile b/src/apps/debugger/Jamfile
index 5c22dd5..fed5599 100644
--- a/src/apps/debugger/Jamfile
+++ b/src/apps/debugger/Jamfile
@@ -2,10 +2,7 @@ SubDir HAIKU_TOP src apps debugger ;
UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
-UsePrivateHeaders app interface kernel shared system ;
-UsePrivateSystemHeaders ;
-
-UsePrivateHeaders debugger ;
+UsePrivateHeaders debugger ;
UsePrivateHeaders [ FDirName debugger arch ] ;
UsePrivateHeaders [ FDirName debugger controllers ] ;
UsePrivateHeaders [ FDirName debugger debug_info ] ;
@@ -28,6 +25,9 @@ UsePrivateHeaders [ FDirName debugger value value_formatters
] ;
UsePrivateHeaders [ FDirName debugger value value_nodes ] ;
UsePrivateHeaders [ FDirName debugger value values ] ;
+UsePrivateHeaders app interface kernel shared system ;
+UsePrivateSystemHeaders ;
+
UseBuildFeatureHeaders libedit ;
LINKFLAGS += -Wl,--exclude-libs,ALL ;
diff --git a/src/kits/debugger/Jamfile b/src/kits/debugger/Jamfile
index b5bd704..45146e1 100644
--- a/src/kits/debugger/Jamfile
+++ b/src/kits/debugger/Jamfile
@@ -6,9 +6,6 @@ UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ]
: true ;
UseHeaders [ FDirName
$(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH))
system kernel ] ;
-UsePrivateHeaders app debug interface kernel package shared libroot ;
-UsePrivateSystemHeaders ;
-
UsePrivateHeaders debugger ;
UsePrivateHeaders [ FDirName debugger arch ] ;
UsePrivateHeaders [ FDirName debugger controllers ] ;
@@ -32,6 +29,9 @@ UsePrivateHeaders [ FDirName debugger value value_formatters
] ;
UsePrivateHeaders [ FDirName debugger value value_nodes ] ;
UsePrivateHeaders [ FDirName debugger value values ] ;
+UsePrivateHeaders app debug interface kernel package shared libroot ;
+UsePrivateSystemHeaders ;
+
LINKFLAGS += -Wl,--exclude-libs,ALL ;
SubDirC++Flags [ FDefines _BSD_SOURCE=1 ] ;
############################################################################
Revision: hrev50354
Commit: 0b20cac7c345bf5101ad2991ed959653f8cc4a0a
URL: http://cgit.haiku-os.org/haiku/commit/?id=0b20cac7c345
Author: Rene Gollent <rene@xxxxxxxxxxx>
Date: Sun Jun 5 22:24:33 2016 UTC
libdebugger: Remove unnecessary header dependency.
- The library does not depend on libedit/ncurses, these were contained
entirely within the application level code.
----------------------------------------------------------------------------
diff --git a/src/kits/debugger/Jamfile b/src/kits/debugger/Jamfile
index 45146e1..8dce62e 100644
--- a/src/kits/debugger/Jamfile
+++ b/src/kits/debugger/Jamfile
@@ -326,8 +326,6 @@ local sources =
# let Jam know about the dependency.
Includes [ FGristFiles $(sources) ] :
<syscalls!$(TARGET_PACKAGING_ARCH)>syscall_numbers.h
- [ BuildFeatureAttribute ncurses : headers ]
- [ BuildFeatureAttribute libedit : headers ]
;
SharedLibrary libdebugger.so :
