diff options
| author | Martin T. H. Sandsmark | 2021-01-04 15:48:09 +0100 |
|---|---|---|
| committer | Martin T. H. Sandsmark | 2021-01-04 15:50:14 +0100 |
| commit | b4a5adb4bb09cbed7912966dbc38dbf090378360 (patch) | |
| tree | 7c6b53e5af49ef63de101f637a6f87f0e620113a | |
| parent | 2c23c41f4e5588ec92297500c3d6a567483df354 (diff) | |
| download | aur-b4a5adb4bb09cbed7912966dbc38dbf090378360.tar.gz | |
fix install
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 37 | ||||
| -rw-r--r-- | plugin-path.patch | 13 |
3 files changed, 46 insertions, 8 deletions
@@ -7,7 +7,9 @@ pkgbase = redasm-git arch = x86_64 license = GPL3 makedepends = git + makedepends = patchelf depends = qt5-base + depends = tbb provides = redasm conflicts = redasm source = git+https://github.com/REDasmOrg/REDasm.git @@ -21,6 +23,8 @@ pkgbase = redasm-git source = git+https://github.com/taocpp/PEGTL.git source = git+https://github.com/zyantific/zydis.git source = git+https://github.com/zyantific/zycore-c.git + source = plugin-path.patch + md5sums = SKIP md5sums = SKIP md5sums = SKIP md5sums = SKIP @@ -7,8 +7,8 @@ url='https://github.com/REDasmOrg/REDasm' arch=('i686' 'x86_64') pkgdesc='The OpenSource Disassembler' license=('GPL3') -depends=('qt5-base') -makedepends=('git') +depends=('qt5-base' 'tbb') +makedepends=('git' 'patchelf') conflicts=(redasm) provides=(redasm) @@ -30,6 +30,8 @@ source=( 'git+https://github.com/zyantific/zydis.git' 'git+https://github.com/zyantific/zycore-c.git' + + "plugin-path.patch" ) md5sums=( @@ -49,6 +51,8 @@ md5sums=( 'SKIP' 'SKIP' + + 'SKIP' ) pkgver() { @@ -57,7 +61,12 @@ pkgver() { } prepare() { + # We use patchelf instead + #sed -i -e '/set\(CMAKE_SKIP_BUILD_RPATH TRUE\)/d' "$srcdir"/REDasm-Library/rdapi/FindREDasm.cmake + #sed -i -e 's/PRIVATE LibREDasm/PUBLIC LibREDasm/' "$srcdir"/REDasm-Library/rdapi/FindREDasm.cmake + cd REDasm + git apply "$srcdir"/plugin-path.patch git submodule init git config submodule.LibREDasm.url "$srcdir/REDasm-Library" git config submodule.QHexView.url "$srcdir/QHexView" @@ -91,17 +100,29 @@ prepare() { build() { mkdir -p build cd build - cmake ../REDasm -DCMAKE_INSTALL_PREFIX=/usr - make + cmake ../REDasm \ + -DCMAKE_INSTALL_PREFIX=/usr + + make VERBOSE=1 } package() { - pushd build + cd ${srcdir}/build + patchelf --set-rpath /usr/lib REDasm install -D -m755 REDasm ${pkgdir}/usr/bin/REDasm install -D -m755 LibREDasm.so ${pkgdir}/usr/lib/LibREDasm.so - popd - - cd REDasm + install -d -m755 ${pkgdir}/usr/lib/redasm/ + + install -m755 ./plugins/loaders/esp/esp.so ${pkgdir}/usr/lib/redasm/ + install -m755 ./plugins/loaders/chip8/chip8.so ${pkgdir}/usr/lib/redasm/ + install -m755 ./plugins/loaders/psx/psx.so ${pkgdir}/usr/lib/redasm/ + install -m755 ./plugins/loaders/elf/elf.so ${pkgdir}/usr/lib/redasm/ + install -m755 ./plugins/loaders/pe/pe.so ${pkgdir}/usr/lib/redasm/ + install -m755 ./plugins/assemblers/x86/x86.so ${pkgdir}/usr/lib/redasm/ + install -m755 ./plugins/assemblers/mips/mips.so ${pkgdir}/usr/lib/redasm/ + install -m755 ./plugins/plugins/compiler/compiler.so ${pkgdir}/usr/lib/redasm/ + + cd ${srcdir}/REDasm install -D -m644 README.md ${pkgdir}/usr/share/doc/${pkgname}/README install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } diff --git a/plugin-path.patch b/plugin-path.patch new file mode 100644 index 000000000000..b31f5d51ceb7 --- /dev/null +++ b/plugin-path.patch @@ -0,0 +1,13 @@ +diff --git a/mainwindow.cpp b/mainwindow.cpp +index b75f252..3a0488e 100644 +--- a/mainwindow.cpp ++++ b/mainwindow.cpp +@@ -11,7 +11,7 @@ + #include <QtGui> + #include <rdapi/rdapi.h> + +-#define PLUGINS_FOLDER_NAME "plugins" ++#define PLUGINS_FOLDER_NAME "/usr/lib/redasm/" + + MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) + { |