summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlastair Poole <netstar@gmail.com>2019-05-26 23:59:56 +0000
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-05-28 12:02:48 +0200
commit7024b19ab140700d6e9f23b2773d24f6673e5e06 (patch)
tree326397fbd383f858131fd9451e513821d1e53eaa
parent48c53841a43e35b19e3808712f46a1ca89593363 (diff)
build: Fix on OpenBSD.
This adds support for OpenBSD with meson build system. Also use better paths. This resolves further issues when building EFL.` Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de> Differential Revision: https://phab.enlightenment.org/D9028
-rw-r--r--meson.build2
-rwxr-xr-xsrc/lib/elementary/config_embed2
-rwxr-xr-xsrc/tests/elementary/spec/generator.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/meson.build b/meson.build
index bfe54aa274..05eb78bcfe 100644
--- a/meson.build
+++ b/meson.build
@@ -46,7 +46,7 @@ endif
46 46
47windows = ['windows', 'cygwin'] 47windows = ['windows', 'cygwin']
48#bsd for meson 0.46 and 0.47 48#bsd for meson 0.46 and 0.47
49bsd = ['bsd', 'freebsd', 'dragonfly', 'netbsd'] 49bsd = ['bsd', 'freebsd', 'dragonfly', 'netbsd', 'openbsd']
50linux = ['linux'] 50linux = ['linux']
51osx = ['darwin'] 51osx = ['darwin']
52 52
diff --git a/src/lib/elementary/config_embed b/src/lib/elementary/config_embed
index 2382e0e33f..e515ca35f8 100755
--- a/src/lib/elementary/config_embed
+++ b/src/lib/elementary/config_embed
@@ -1,4 +1,4 @@
1#!/bin/bash 1#!/bin/sh
2echo "static const char *embedded_config = \"\"" > $2 2echo "static const char *embedded_config = \"\"" > $2
3sed -e 's/"/\\"/g; s/$/\"/; s/^/\"/' $1 >> $2 3sed -e 's/"/\\"/g; s/$/\"/; s/^/\"/' $1 >> $2
4echo "\"\";" >> $2 4echo "\"\";" >> $2
diff --git a/src/tests/elementary/spec/generator.py b/src/tests/elementary/spec/generator.py
index 734c1ccca3..15042d3afd 100755
--- a/src/tests/elementary/spec/generator.py
+++ b/src/tests/elementary/spec/generator.py
@@ -1,4 +1,4 @@
1#!/usr/bin/python 1#!/usr/bin/env python
2 2
3fixture_gen_template = """ 3fixture_gen_template = """
4static void 4static void