[haiku-commits] haiku: hrev47456 - 3rdparty/pulkomandy src/apps/webpositive
- From: pulkomandy@xxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 2 Jul 2014 08:17:31 +0200 (CEST)
hrev47456 adds 2 changesets to branch 'master'
old head: 7670cd86b4ea41a6d44ec6247d54aee19a7146d4
new head: c1986edd36c20ac0ede82b8b359de70f0edce05d
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=c1986ed+%5E7670cd8
----------------------------------------------------------------------------
9522c1e: Add unbootstrap, a script to remove _bootstrap from packages.
This needs to be run under haiku as it uses the package tool. It can be
used to remove the _bootstrap tagging from bootstrap packages and then
upload them to the repos as normal packages. The goal is to make
non-bootstrap builds work even for archs where the bootstrap isn't
working yet.
Packages built that way should be replaced as soon as better ones are
obtained by the proper bootstrapping process.
c1986ed: Make Web+ use C++11.
* This is now required by HaikuWebKit headers.
* Should fix the x86_64 build.
[ Adrien Destugues <pulkomandy@xxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 26 insertions(+), 1 deletion(-)
3rdparty/pulkomandy/unbootstrap.sh | 25 +++++++++++++++++++++++++
src/apps/webpositive/Jamfile | 2 +-
############################################################################
Commit: 9522c1e4f21b0292084467c927e4169770db1329
URL: http://cgit.haiku-os.org/haiku/commit/?id=9522c1e
Author: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date: Tue Jul 1 15:49:31 2014 UTC
Add unbootstrap, a script to remove _bootstrap from packages.
This needs to be run under haiku as it uses the package tool. It can be
used to remove the _bootstrap tagging from bootstrap packages and then
upload them to the repos as normal packages. The goal is to make
non-bootstrap builds work even for archs where the bootstrap isn't
working yet.
Packages built that way should be replaced as soon as better ones are
obtained by the proper bootstrapping process.
----------------------------------------------------------------------------
diff --git a/3rdparty/pulkomandy/unbootstrap.sh
b/3rdparty/pulkomandy/unbootstrap.sh
new file mode 100644
index 0000000..ff85172
--- /dev/null
+++ b/3rdparty/pulkomandy/unbootstrap.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+# Convert _bootstrap packages to non-bootstrap version.
+# THIS IS A HACK. The _bootstrap packages are cross-compiled on a pseudo-haiku
+# environment running on a different host system. Expect binary
+# incompatibilities when trying to use them. However, the development files
+# should still be valid, allowing us to build a non-bootstrap Haiku against
+# these package before we can get the bootstrap image to run reliably enough
+# to actually bootstrap the packages.
+
+mkdir -p work
+cd work
+
+for package in ../packages/*.hpkg
+do
+ echo --- Processing $package ---
+ echo Cleaning work directory...
+ rm -r *
+ echo Extracting package...
+ package extract $package
+ echo Converting .PackageInfo...
+ sed -i .PackageInfo -e s/_bootstrap//g
+ name=`basename $package|sed -e s/_bootstrap//g`
+ echo Regenerating package...
+ package create ../$name
+done
############################################################################
Revision: hrev47456
Commit: c1986edd36c20ac0ede82b8b359de70f0edce05d
URL: http://cgit.haiku-os.org/haiku/commit/?id=c1986ed
Author: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date: Wed Jul 2 06:14:18 2014 UTC
Make Web+ use C++11.
* This is now required by HaikuWebKit headers.
* Should fix the x86_64 build.
----------------------------------------------------------------------------
diff --git a/src/apps/webpositive/Jamfile b/src/apps/webpositive/Jamfile
index 65fa471..b0a6ee0 100644
--- a/src/apps/webpositive/Jamfile
+++ b/src/apps/webpositive/Jamfile
@@ -1,6 +1,6 @@
SubDir HAIKU_TOP src apps webpositive ;
-SubDirC++Flags $(defines) -Wno-error=sequence-point ;
+SubDirC++Flags $(defines) -Wno-error=sequence-point --std=c++11 ;
SubDirCcFlags $(defines) -Wno-error=sequence-point ;
# source directories
Other related posts:
- » [haiku-commits] haiku: hrev47456 - 3rdparty/pulkomandy src/apps/webpositive - pulkomandy
