Support custom APP_DIR via patch-script to fix QWT_INSTALL_PREFIX

ktemkin · May 4, 2017 · e1c2b81 · e1c2b81
1 parent a8cf1c5
commit e1c2b81
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 deletions.
diff --git a/build.sh b/build.sh
@@ -204,10 +204,18 @@ function unpack() {
     fi
 
     for PP in $PATCHES; do
-      I "applying patch ${PP}"
-      cd ${TMP_DIR}/${T} \
-        && git apply ${PP} \
-        || E "git apply ${PP} failed"
+      if [ "${PP%".sh.patch"}" != "${PP}" ]; then
+        # This ends with .sh.patch, so source it:
+        I "applying script ${PP}"
+        cd ${TMP_DIR}/${T} \
+          && . ${PP} \
+          || E "sh ${PP} failed"
+      else
+        I "applying patch ${PP}"
+        cd ${TMP_DIR}/${T} \
+          && git apply ${PP} \
+          || E "git apply ${PP} failed"
+      fi
     done
   fi
 }

diff --git a/patches/qwt-6.1.3-00-use-gnuradio-app-prefix.patch b/patches/qwt-6.1.3-00-use-gnuradio-app-prefix.patch
diff --git a/patches/qwt-6.1.3-00-use-gnuradio-app-prefix.sh.patch b/patches/qwt-6.1.3-00-use-gnuradio-app-prefix.sh.patch
@@ -0,0 +1 @@
+sed -i orig -e 's,^\([[:space:]]*QWT_INSTALL_PREFIX[[:space:]]*=[[:space:]]*\)\([^[:space:]].*\)$,\1'"${INSTALL_DIR}"'/usr,' qwtconfig.pri