[haiku-commits] BRANCH HaikuPM-github.package-management [7ea6bb1] in build: scripts jam/packages
- From: HaikuPM-github.package-management <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 30 May 2013 00:30:39 +0200 (CEST)
added 2 changesets to branch 'refs/remotes/HaikuPM-github/package-management'
old head: e63bdfec7505fe241e7845a487c6ba029d44fc81
new head: 7ea6bb13059c8754fcd6a7594a826e09d0510bd9
overview: https://github.com/haiku/HaikuPM/compare/e63bdfe...7ea6bb1
----------------------------------------------------------------------------
30c2352: Adjust buildscript for gcc4 to configure with a sysroot.
7ea6bb1: Add c++-libs to haiku_cross_devel.hpkg
[ Oliver Tappe <zooey@xxxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 12 insertions(+), 8 deletions(-)
build/jam/packages/HaikuCrossDevel | 9 +++++----
build/scripts/build_cross_tools_gcc4 | 11 +++++++----
############################################################################
Commit: 30c2352188a17adfe1698a094b25c9ada9a687c9
Author: Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
Date: Wed May 29 22:19:40 2013 UTC
Adjust buildscript for gcc4 to configure with a sysroot.
----------------------------------------------------------------------------
diff --git a/build/scripts/build_cross_tools_gcc4
b/build/scripts/build_cross_tools_gcc4
index 07c68ea..9837feb 100755
--- a/build/scripts/build_cross_tools_gcc4
+++ b/build/scripts/build_cross_tools_gcc4
@@ -103,8 +103,9 @@ objDir=$haikuOutputDir/cross-tools-build
binutilsObjDir=$objDir/binutils
gccObjDir=$objDir/gcc
stdcxxObjDir=$objDir/stdcxx
-tmpIncludeDir=$objDir/sysincludes
-tmpLibDir=$objDir/syslibs
+sysrootDir=$objDir/sysroot
+tmpIncludeDir=$sysrootDir/boot/system/develop/headers
+tmpLibDir=$sysrootDir/boot/system/develop/lib
rm -rf $installDir $objDir
@@ -135,7 +136,9 @@ export LC_ALL=POSIX
cd $binutilsObjDir
CFLAGS="-O2" CXXFLAGS="-O2" $binutilsSourceDir/configure \
--prefix=$installDir --target=$haikuMachine --disable-nls \
- --disable-shared --disable-werror $binutilsConfigureArgs || exit 1
+ --disable-shared --disable-werror \
+ --with-sysroot=$sysrootDir \
+ $binutilsConfigureArgs || exit 1
$MAKE $additionalMakeArgs || exit 1
$MAKE $additionalMakeArgs install || exit 1
@@ -194,7 +197,7 @@ cd $gccObjDir
CFLAGS="-O2" CXXFLAGS="-O2" $gccSourceDir/configure --prefix=$installDir \
--target=$haikuMachine --disable-nls --disable-shared
--with-system-zlib \
--enable-languages=c,c++ --enable-lto --enable-frame-pointer \
- --with-headers=$tmpIncludeDir --with-libs=$tmpLibDir \
+ --with-sysroot=$sysrootDir \
$gccConfigureArgs || exit 1
# make gcc
############################################################################
Commit: 7ea6bb13059c8754fcd6a7594a826e09d0510bd9
Author: Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
Date: Wed May 29 22:21:25 2013 UTC
Add c++-libs to haiku_cross_devel.hpkg
----------------------------------------------------------------------------
diff --git a/build/jam/packages/HaikuCrossDevel
b/build/jam/packages/HaikuCrossDevel
index 0c2e03a..8473edd 100644
--- a/build/jam/packages/HaikuCrossDevel
+++ b/build/jam/packages/HaikuCrossDevel
@@ -30,6 +30,7 @@ AddFilesToPackage $(developCrossLibDirTokens) : kernel.so :
_KERNEL_ ;
# libraries
AddLibrariesToPackage $(developCrossLibDirTokens) :
<revisioned>libroot.so
+ $(HAIKU_SHARED_LIBSTDC++) $(HAIKU_SHARED_LIBSUPC++)
;
# static libraries
@@ -47,10 +48,10 @@ for headerDir in config glibc os posix {
}
# BSD and GNU compatibility headers
-#for headerDib in bsd gnu {
-# CopyDirectoryToPackage $(developCrossHeadersDirTokens)
-# : [ FDirName $(HAIKU_TOP) headers compatibility $(headerDir) ] ;
-#}
+for headerDir in bsd gnu {
+ CopyDirectoryToPackage $(developCrossHeadersDirTokens)
+ : [ FDirName $(HAIKU_TOP) headers compatibility $(headerDir) ] ;
+}
# cpp headers
if $(HAIKU_GCC_VERSION[1]) = 2 {
Other related posts:
- » [haiku-commits] BRANCH HaikuPM-github.package-management [7ea6bb1] in build: scripts jam/packages - HaikuPM-github . package-management
