[Orxonox-commit 7423] r154 - in linux/flatpak: . res

[bucyril at orxonox.net]

Author: bucyril
Date: 2018-10-12 08:50:52 +0200 (Fri, 12 Oct 2018)
New Revision: 154

Removed:
   linux/flatpak/res/boost-configure
Modified:
   linux/flatpak/
   linux/flatpak/net.orxonox.Orxonox.json
Log:
optimized boost build

Index: linux/flatpak
===================================================================
--- linux/flatpak	2018-10-12 05:53:42 UTC (rev 153)
+++ linux/flatpak	2018-10-12 06:50:52 UTC (rev 154)

Property changes on: linux/flatpak
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Modified: linux/flatpak/net.orxonox.Orxonox.json
===================================================================
--- linux/flatpak/net.orxonox.Orxonox.json	2018-10-12 05:53:42 UTC (rev 153)
+++ linux/flatpak/net.orxonox.Orxonox.json	2018-10-12 06:50:52 UTC (rev 154)
@@ -30,16 +30,16 @@
         },
         {
             "name": "boost",
+            "buildsystem": "simple",
+            "build-commands": [
+                "./bootstrap.sh --prefix=/app --with-libraries=date_time,filesystem,thread",
+                "./b2 --with-date_time --with-filesystem --with-thread link=static threading=multi variant=release install"
+            ],
             "sources": [
                 {
                     "type": "archive",
                     "path": "deps/boost_1_68_0.tar.bz2",
                     "sha256": "7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7"
-                },
-                {
-                    "type": "file",
-                    "path": "res/boost-configure",
-                    "dest-filename": "configure"
                 }
             ]
         },

Deleted: linux/flatpak/res/boost-configure
===================================================================
--- linux/flatpak/res/boost-configure	2018-10-12 05:53:42 UTC (rev 153)
+++ linux/flatpak/res/boost-configure	2018-10-12 06:50:52 UTC (rev 154)
@@ -1,10 +0,0 @@
-./bootstrap.sh "$@"
-
-
-cat <<EOF >Makefile
-all:
-	./b2 -j `nproc` -mt --with-date_time --with-filesystem --with-thread
-
-install:
-	./b2 install
-EOF