On BSD systems, base sed is different than GNU's and does not work

with those flags thus allowing to choose the package version.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9e6a7b6cda7cbe603a22e16bd0631195160c6168..d2b9cdcee1e806f80a3cd930fb1968850f80b669 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,6 @@
 before_script:
   - ln -s $PWD data/xonotic-data.pk3dir
+  - export SED=sed
 
   - git clone --depth=1 --branch=master https://gitlab.com/xonotic/gmqcc.git gmqcc
   - cd gmqcc && make -j $(nproc) && export QCC="$PWD/gmqcc"

diff --git a/cmake/qcc.sh b/cmake/qcc.sh
index b7c77fd563a35a24ca2b4c1c1b5a4319861b5d52..6dc96302934f3bf62151aa3e1ca33aff18d971bb 100755 (executable)
--- a/cmake/qcc.sh
+++ b/cmake/qcc.sh
@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
 CPP=${CPP:-cpp}
 QCC=${QCC:-$PWD/../../gmqcc/gmqcc${CMAKE_EXECUTABLE_SUFFIX}}
+SED=${SED}
 case $1 in
     compile)
-        ${CPP} ${@:3} | sed 's/^#\(line\)\? \([[:digit:]]\+\) "\(.*\)".*/\n#pragma file(\3)\n#pragma line(\2)/g' > $2
+        ${CPP} ${@:3} | ${SED} 's/^#\(line\)\? \([[:digit:]]\+\) "\(.*\)".*/\n#pragma file(\3)\n#pragma line(\2)/g' > $2
     ;;
     link)
         ${QCC} \

diff --git a/qcsrc/tools/qcc.sh b/qcsrc/tools/qcc.sh
index 15cbfc4aab5a222f8a06da9091884057c5f84fe3..0ea54cddf53f00473573fb30f228c4246d2c1552 100755 (executable)
--- a/qcsrc/tools/qcc.sh
+++ b/qcsrc/tools/qcc.sh
@@ -8,6 +8,7 @@ QCC=${QCC}
 QCCIDENT="-DGMQCC"
 QCCDEFS=${QCCDEFS}
 QCCFLAGS=${QCCFLAGS}
+SED=${SED}
 
 function qpp() {
     IN=$1
@@ -32,7 +33,7 @@ function qpp() {
     err=$?
     set -e
     if [ ${err} -ne 0 ]; then return ${err}; fi
-    sed 's/^#\(line\)\? \([[:digit:]]\+\) "\(.*\)".*/\n#pragma file(\3)\n#pragma line(\2)/g' "${WORKDIR}/${MODE}.txt"
+    ${SED} 's/^#\(line\)\? \([[:digit:]]\+\) "\(.*\)".*/\n#pragma file(\3)\n#pragma line(\2)/g' "${WORKDIR}/${MODE}.txt"
 }
 
 function qcc() {