[haiku-commits] buildtools: btrev43066 - gcc/gcc/config legacy/gcc/gcc/config/i386
- From: kallisti5@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 15 Jan 2014 00:48:39 +0100 (CET)
btrev43066 adds 1 changeset to branch 'master'
old head: abc7211782a6eb447522fae39f956fedc12cb979
new head: fd576c8d8a83e3fe9a6443f9c0431bd11125314e
overview: http://cgit.haiku-os.org/buildtools/log/?qt=range&q=fd576c8+%5Eabc7211
----------------------------------------------------------------------------
fd576c8: gcc: Adjust gcc header search paths
* Drop /boot/common header paths
I don't think pre-pm haiku will build anyway
without using an older buildtools.
* Add secondary arch os header directories.
Anything secondary arch that provides os
headers will break without the proper search
paths in gcc.
* Fixes secondary packages that depend on the
OpenGL kit
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: btrev43066
Commit: fd576c8d8a83e3fe9a6443f9c0431bd11125314e
URL: http://cgit.haiku-os.org/buildtools/commit/?id=fd576c8
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Tue Jan 14 23:52:48 2014 UTC
----------------------------------------------------------------------------
2 files changed, 41 insertions(+), 9 deletions(-)
gcc/gcc/config/haiku.h | 24 ++++++++++++++++++++----
legacy/gcc/gcc/config/i386/haiku.h | 26 +++++++++++++++++++++-----
----------------------------------------------------------------------------
diff --git a/gcc/gcc/config/haiku.h b/gcc/gcc/config/haiku.h
index 8265616..63123d7 100644
--- a/gcc/gcc/config/haiku.h
+++ b/gcc/gcc/config/haiku.h
@@ -78,8 +78,7 @@ Boston, MA 02111-1307, USA. */
{ GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, \
{ FIXED_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, \
{ TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0 }, \
- { "/boot/common/non-packaged/develop/headers/" HYBRID_SECONDARY, 0, 0, 0,
1, 0 }, \
- { "/boot/common/develop/headers/" HYBRID_SECONDARY, 0, 0, 0, 1, 0 }, \
+ { "/boot/system/non-packaged/develop/headers/" HYBRID_SECONDARY, 0, 0, 0,
1, 0 }, \
{ "/boot/system/develop/headers/os", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers/os/app", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers/os/device", 0, 0, 1, 1, 0 }, \
@@ -112,6 +111,24 @@ Boston, MA 02111-1307, USA. */
{ "/boot/system/develop/headers/gnu", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers/posix", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers/" HYBRID_SECONDARY, 0, 0, 0, 1, 0 }, \
+ /* Hybrid secondary folders for os kits not in base haiku package */\
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os", 0, 0, 1, 1, 0 },
\
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/app", 0, 0, 1, 1,
0 }, \
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/device", 0, 0, 1,
1, 0 }, \
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/drivers", 0, 0, 1,
1, 0 }, \
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/game", 0, 0, 1, 1,
0 }, \
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/interface", 0, 0,
1, 1, 0 }, \
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/kernel", 0, 0, 1,
1, 0 }, \
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/locale", 0, 0, 1,
1, 0 }, \
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/mail", 0, 0, 1, 1,
0 }, \
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/media", 0, 0, 1,
1, 0 }, \
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/midi", 0, 0, 1, 1,
0 }, \
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/midi2", 0, 0, 1,
1, 0 }, \
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/net", 0, 0, 1, 1,
0 }, \
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/opengl", 0, 0, 1,
1, 0 }, \
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/storage", 0, 0, 1,
1, 0 }, \
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/support", 0, 0, 1,
1, 0 }, \
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/translation", 0,
0, 1, 1, 0 }, \
{ "/boot/system/develop/headers", 0, 0, 0, 1, 0 }, \
{ 0, 0, 0, 0, 0, 0 } \
}
@@ -129,8 +146,7 @@ Boston, MA 02111-1307, USA. */
{ GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, \
{ FIXED_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, \
{ TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0 }, \
- { "/boot/common/non-packaged/develop/headers", 0, 0, 0, 1, 0 }, \
- { "/boot/common/develop/headers", 0, 0, 0, 1, 0 }, \
+ { "/boot/system/non-packaged/develop/headers", 0, 0, 0, 1, 0 }, \
{ "/boot/system/develop/headers/os", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers/os/app", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers/os/device", 0, 0, 1, 1, 0 }, \
diff --git a/legacy/gcc/gcc/config/i386/haiku.h
b/legacy/gcc/gcc/config/i386/haiku.h
index cc0e853..96f536f 100644
--- a/legacy/gcc/gcc/config/i386/haiku.h
+++ b/legacy/gcc/gcc/config/i386/haiku.h
@@ -364,8 +364,7 @@ extern union tree_node *i386_pe_merge_decl_attributes ();
{ \
{ GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1 },\
{ GCC_INCLUDE_DIR, "GCC", 0, 0 },\
- { "/boot/common/non-packaged/develop/headers", 0, 0, 0 },\
- { "/boot/common/develop/headers", 0, 0, 0 },\
+ { "/boot/system/non-packaged/develop/headers", 0, 0, 0 },\
{ "/boot/system/develop/headers/os", 0, 0, 1 },\
{ "/boot/system/develop/headers/os/app", 0, 0, 1 },\
{ "/boot/system/develop/headers/os/device", 0, 0, 1 },\
@@ -404,8 +403,7 @@ extern union tree_node *i386_pe_merge_decl_attributes ();
{ \
{ GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1 },\
{ GCC_INCLUDE_DIR, "GCC", 0, 0 },\
- { "/boot/common/non-packaged/develop/headers/" HYBRID_SECONDARY, 0, 0, 0
},\
- { "/boot/common/develop/headers/" HYBRID_SECONDARY, 0, 0, 0 },\
+ { "/boot/system/non-packaged/develop/headers/" HYBRID_SECONDARY, 0, 0, 0
},\
{ "/boot/system/develop/headers/os", 0, 0, 1 },\
{ "/boot/system/develop/headers/os/app", 0, 0, 1 },\
{ "/boot/system/develop/headers/os/device", 0, 0, 1 },\
@@ -436,7 +434,25 @@ extern union tree_node *i386_pe_merge_decl_attributes ();
{ "/boot/system/develop/headers/glibc", 0, 0, 1 },\
{ "/boot/system/develop/headers/gnu", 0, 0, 1 },\
{ "/boot/system/develop/headers/posix", 0, 0, 1 },\
- { "/boot/system/develop/headers/" HYBRID_SECONDARY, 0, 0, 0 }, \
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY, 0, 0, 0 },\
+ /* Hybrid secondary folders for os kits not in base haiku package */\
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os", 0, 0, 1 },\
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/app", 0, 0, 1 },\
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/device", 0, 0, 1
},\
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/drivers", 0, 0, 1
},\
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/game", 0, 0, 1 },\
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/interface", 0, 0,
1 },\
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/kernel", 0, 0, 1
},\
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/locale", 0, 0, 1
},\
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/mail", 0, 0, 1 },\
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/media", 0, 0, 1 },\
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/midi", 0, 0, 1 },\
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/midi2", 0, 0, 1 },\
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/net", 0, 0, 1 },\
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/opengl", 0, 0, 1
},\
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/storage", 0, 0, 1
},\
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/support", 0, 0, 1
},\
+ { "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/translation", 0,
0, 1 },\
{ "/boot/system/develop/headers", 0, 0, 0 }, \
{ 0, 0, 0, 0 } \
};
Other related posts:
