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

Fixes for building Haiku x86_64 from itself.

Browse Source
This commit is contained in:
Alex Smith
2012-08-18 19:57:46 +01:00
parent aecb9567e3
commit 4591ebc99a
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalPackages
+1 -1
View File
@@ -778,7 +778,7 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ] {
: $(baseURL)/m4-1.4.16-x86_64-2012-08-12.zip ; : $(baseURL)/m4-1.4.16-x86_64-2012-08-12.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
flex-2.5.35-x86_64-2012-08-18.zip flex-2.5.35-x86_64-2012-08-18.zip
: $(baseURL)/flex-2.5.35-x86_64-2012-08-12.zip ; : $(baseURL)/flex-2.5.35-x86_64-2012-08-18.zip ;
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
jam-2.5-x86_64-2012-08-12.zip jam-2.5-x86_64-2012-08-12.zip
: $(baseURL)/jam-2.5-x86_64-2012-08-12.zip ; : $(baseURL)/jam-2.5-x86_64-2012-08-12.zip ;
configure
Vendored
+11 -8
View File
@@ -257,14 +257,17 @@ standard_gcc_settings()
;; ;;
esac esac
if [ "$targetArch" = "x86_64" ]; then case $HAIKU_GCC_MACHINE in
# Boot loader is 32-bit, need the 32-bit libs. x86_64-*)
HAIKU_BOOT_LIBGCC=`$HAIKU_CC -m32 -print-libgcc-file-name` # Boot loader is 32-bit, need the 32-bit libs.
HAIKU_BOOT_LIBSUPCXX=`$HAIKU_CC -m32 -print-file-name=libsupc++.a` HAIKU_BOOT_LIBGCC=`$HAIKU_CC -m32 -print-libgcc-file-name`
else HAIKU_BOOT_LIBSUPCXX=`$HAIKU_CC -m32 -print-file-name=libsupc++.a`
HAIKU_BOOT_LIBGCC=$HAIKU_GCC_LIBGCC ;;
HAIKU_BOOT_LIBSUPCXX=$HAIKU_STATIC_LIBSUPCXX *)
fi HAIKU_BOOT_LIBGCC=$HAIKU_GCC_LIBGCC
HAIKU_BOOT_LIBSUPCXX=$HAIKU_STATIC_LIBSUPCXX
;;
esac
} }
# set_default_value # set_default_value
src/bin/keymap/Keymap.cpp
+1 -1
View File
@@ -569,7 +569,7 @@ Keymap::SaveAsSource(const char* name)
_SaveSourceText(file, &textRuns); _SaveSourceText(file, &textRuns);
if (textRuns != NULL) { if (textRuns != NULL) {
ssize_t dataSize; int32 dataSize;
void* data = BTextView::FlattenRunArray(textRuns, &dataSize); void* data = BTextView::FlattenRunArray(textRuns, &dataSize);
if (data != NULL) { if (data != NULL) {
BNode node(name); BNode node(name);