[vlc-commits] contrib: qt: Fix AddStaticLink.sh script for macOS

Marvin Scholz git at videolan.org
Fri Jul 26 22:32:39 CEST 2019


vlc | branch: master | Marvin Scholz <epirat07 at gmail.com> | Fri Jul 26 19:13:21 2019 +0200| [685e5482669b21804e78b6064426a93803e62994] | committer: Marvin Scholz

contrib: qt: Fix AddStaticLink.sh script for macOS

The macOS sed does not support -i without an argument,
additionally it does not support the spaces in the
command string so multiple uses of -e are needed.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=685e5482669b21804e78b6064426a93803e62994
---

 contrib/src/qt/AddStaticLink.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/contrib/src/qt/AddStaticLink.sh b/contrib/src/qt/AddStaticLink.sh
index 8ad823577c..2ba65707cd 100755
--- a/contrib/src/qt/AddStaticLink.sh
+++ b/contrib/src/qt/AddStaticLink.sh
@@ -6,7 +6,7 @@
 #
 # This could also be done in configure.ac to detect what plugins are available and where to add them
 
-PREFIX=$(realpath "$1")
+PREFIX=$(python -c "import os; print(os.path.realpath('$1'))")
 PLUGIN_PATH="$3"
 PLUGIN_NAME="$4"
 
@@ -31,10 +31,10 @@ fi
 LIBS=$(sed -e "/QMAKE_PRL_LIBS/ { \
              s/QMAKE_PRL_LIBS =//; \
              s@$PREFIX/lib@\${libdir}@g; \
-             s@\$\$\[QT_INSTALL_LIBS\]@\${libdir}@g; p \
-         }; d"  $PRL_SOURCE )
+             s@\$\$\[QT_INSTALL_LIBS\]@\${libdir}@g;" -e "p" \
+         -e "};" -e "d"  $PRL_SOURCE )
 
 # prepend the plugin that uses the module
-sed -i -e "s# -l${2}# -l${PLUGIN_NAME} -l${2}#" $PC_DEST
+sed -i.bak -e "s# -l${2}# -l${PLUGIN_NAME} -l${2}#" $PC_DEST
 # add the plugin static dependencies to the ones of the module
-sed -i -e "s#Libs.private: #Libs.private: $LIBS -L\${prefix}/${PLUGIN_PATH} #" $PC_DEST
+sed -i.bak -e "s#Libs.private: #Libs.private: $LIBS -L\${prefix}/${PLUGIN_PATH} #" $PC_DEST



More information about the vlc-commits mailing list