summarylogtreecommitdiffstats
path: root/use-static-llvm40.patch
diff options
context:
space:
mode:
authorTeteros2018-10-24 21:38:07 +0100
committerTeteros2018-10-24 21:38:07 +0100
commit40c5a54dee8cbdd31302c62ee5b9952210c4e893 (patch)
tree291fb5496ad7930b802d6516c88b7cddceea4e3a /use-static-llvm40.patch
parent61450a1403a32b90f295212b662e58994500db88 (diff)
downloadaur-40c5a54dee8cbdd31302c62ee5b9952210c4e893.tar.gz
5.9.9-1: Hotfix
Diffstat (limited to 'use-static-llvm40.patch')
-rw-r--r--use-static-llvm40.patch20
1 files changed, 11 insertions, 9 deletions
diff --git a/use-static-llvm40.patch b/use-static-llvm40.patch
index 00c734171fa..cd2d92c00b8 100644
--- a/use-static-llvm40.patch
+++ b/use-static-llvm40.patch
@@ -1,6 +1,6 @@
-diff -aur --no-dereference radium-5.8.9.pristine/bin/packages/faust2/compiler/Makefile.unix radium-5.8.9.new/bin/packages/faust2/compiler/Makefile.unix
---- radium-5.8.9.pristine/bin/packages/faust2/compiler/Makefile.unix 2018-09-12 17:40:04.000000000 +0100
-+++ radium-5.8.9.new/bin/packages/faust2/compiler/Makefile.unix 2018-09-15 08:12:35.291841616 +0100
+diff -aur --no-dereference radium-5.9.9.pristine/bin/packages/faust2/compiler/Makefile.unix radium-5.9.9.new/bin/packages/faust2/compiler/Makefile.unix
+--- radium-5.9.9.pristine/bin/packages/faust2/compiler/Makefile.unix 2018-10-24 19:47:31.000000000 +0100
++++ radium-5.9.9.new/bin/packages/faust2/compiler/Makefile.unix 2018-10-24 21:01:11.425278974 +0100
@@ -26,7 +26,7 @@
# link a suitable llvm-config to a location somewhere on your PATH, or just
# set LLVM_CONFIG manually.
@@ -28,10 +28,10 @@ diff -aur --no-dereference radium-5.8.9.pristine/bin/packages/faust2/compiler/Ma
endif
ifeq ($(system), Darwin)
-diff -aur --no-dereference radium-5.8.9.pristine/build_linux_common.sh radium-5.8.9.new/build_linux_common.sh
---- radium-5.8.9.pristine/build_linux_common.sh 2018-09-12 17:40:04.000000000 +0100
-+++ radium-5.8.9.new/build_linux_common.sh 2018-09-15 08:12:35.291841616 +0100
-@@ -106,17 +106,11 @@
+diff -aur --no-dereference radium-5.9.9.pristine/build_linux_common.sh radium-5.9.9.new/build_linux_common.sh
+--- radium-5.9.9.pristine/build_linux_common.sh 2018-10-24 19:47:31.000000000 +0100
++++ radium-5.9.9.new/build_linux_common.sh 2018-10-24 21:10:37.075259725 +0100
+@@ -106,19 +106,13 @@
PYTHONLIBPATH=`$PYTHONEXE -c "import sys;print '-L'+sys.prefix+'/lib'"`
PYTHONLIBNAME=`$PYTHONEXE -c "import sys;print '-lpython'+sys.version[:3]"`
@@ -46,9 +46,11 @@ diff -aur --no-dereference radium-5.8.9.pristine/build_linux_common.sh radium-5.
+LLVM_OPTS=`llvm-config-4.0 --cppflags`
+LLVMLIBS=`llvm-config-4.0 --link-static --libfiles`
+ export QSCINTILLA_PATH=`pwd`/bin/packages/QScintilla_gpl-2.10.1
+
if env |grep INCLUDE_FAUSTDEV ; then
-- FAUSTLDFLAGS="bin/packages/QScintilla_gpl-2.10.1/Qt4Qt5/libqscintilla2_qt5.a bin/packages/faust2/compiler/libfaust.a `$PKG --libs uuid` `llvm-config --ldflags` $LLVMLIBS -lcrypto -lncurses"
-+ FAUSTLDFLAGS="bin/packages/QScintilla_gpl-2.10.1/Qt4Qt5/libqscintilla2_qt5.a bin/packages/faust2/compiler/libfaust.a `$PKG --libs uuid` $LLVMLIBS -lcrypto -lncurses"
+- FAUSTLDFLAGS="$QSCINTILLA_PATH/Qt4Qt5/libqscintilla2_qt5.a bin/packages/faust2/compiler/libfaust.a `$PKG --libs uuid` `llvm-config --ldflags` $LLVMLIBS -lcrypto -lncurses"
++ FAUSTLDFLAGS="$QSCINTILLA_PATH/Qt4Qt5/libqscintilla2_qt5.a bin/packages/faust2/compiler/libfaust.a `$PKG --libs uuid` $LLVMLIBS -lcrypto -lncurses"
else
FAUSTLDFLAGS=""
fi