diff options
author | Jakub Jirutka <jakub@jirutka.cz> | 2018-05-07 22:13:54 +0200 |
---|---|---|
committer | Jakub Jirutka <jakub@jirutka.cz> | 2018-05-07 22:15:00 +0200 |
commit | 96633b2dc8314e77cfbab889df437d5c8699fadf (patch) | |
tree | e99d24f58437e5e0ceec3e205a400760ed2024eb | |
parent | eab200a153b116760e101054091baf23e7093057 (diff) | |
download | aports-96633b2dc8314e77cfbab889df437d5c8699fadf.tar.bz2 aports-96633b2dc8314e77cfbab889df437d5c8699fadf.tar.xz |
testing/lldb: move custom readline.so into correct location
-rw-r--r-- | testing/lldb/APKBUILD | 8 | ||||
-rw-r--r-- | testing/lldb/fix-embedded_interpreter.patch | 14 |
2 files changed, 21 insertions, 1 deletions
diff --git a/testing/lldb/APKBUILD b/testing/lldb/APKBUILD index 5f3264a6ca..87d8a8483c 100644 --- a/testing/lldb/APKBUILD +++ b/testing/lldb/APKBUILD @@ -29,6 +29,7 @@ subpackages="$pkgname-dev py2-$pkgname:py2" source="http://llvm.org/releases/$pkgver/$pkgname-$pkgver.src.tar.xz musl-include-ptrace.aarch64.patch cmake-include-ClangConfig.patch + fix-embedded_interpreter.patch " builddir="$srcdir/$pkgname-$pkgver.src" @@ -71,6 +72,10 @@ py2() { cd "$subpkgdir" mv "$pkgdir"/$sitedir ${sitedir%/*}/ + rmdir "$pkgdir"/${sitedir%/*} + + # Move binary lib to the module's directory. + mv $sitedir/readline.so $sitedir/lldb/ # Remove bundled module. rm $sitedir/six.py @@ -80,4 +85,5 @@ py2() { sha512sums="ebb3c3251098cfce28ccb6a5bbc50491a16b88d1adf3c71fd38efc95482d702e1bd9e7fb11c29597304d97cc0fd88241c70ec11276426aad901e5d23f05ca53a lldb-5.0.1.src.tar.xz 1613a1cb042edd430aba6b86e4971ebb01f7d2bc3f13a5a1264cb94da7612188897e9dcaaa9233be8af5c8f4bad013dd0cfb821e323cd73dfe07fe125869ccef musl-include-ptrace.aarch64.patch -18ea4cd3ef357299833e243613031ad67ff82f7c93c1f3fbe2cbce8876ffeec2d8ff2f94c8242ea540c2604ffbc023fb2678643fc9d3b64231f096054d186aef cmake-include-ClangConfig.patch" +18ea4cd3ef357299833e243613031ad67ff82f7c93c1f3fbe2cbce8876ffeec2d8ff2f94c8242ea540c2604ffbc023fb2678643fc9d3b64231f096054d186aef cmake-include-ClangConfig.patch +3c611fa5d45b6cb3f2925a31deeb8a34c295277aedcd55c22851d373897acd376fa92f4ef953c96a25c8dae4c93b6a88de0918550672141d324a3813d8283d48 fix-embedded_interpreter.patch" diff --git a/testing/lldb/fix-embedded_interpreter.patch b/testing/lldb/fix-embedded_interpreter.patch new file mode 100644 index 0000000000..599e30a440 --- /dev/null +++ b/testing/lldb/fix-embedded_interpreter.patch @@ -0,0 +1,14 @@ +Hack so that lldb can find its custom readline.so, because we move it +after install. + +This is based on Fedora package. + +--- a/source/Interpreter/embedded_interpreter.py ++++ b/source/Interpreter/embedded_interpreter.py +@@ -1,4 +1,6 @@ + import sys ++sys.path.insert(1, '%{python_sitearch}/lldb') ++ + if sys.version_info[0] < 3: + import __builtin__ as builtins + else: |