[arch-commits] Commit in distorm/trunk (PKGBUILD build.patch python3.patch)

[Levente Polyak via arch-commits]

Date: Thursday, November 15, 2018 @ 01:30:23
  Author: anthraxx
Revision: 407614

upgpkg: distorm 3.3.8-1

Modified:
  distorm/trunk/PKGBUILD
Deleted:
  distorm/trunk/build.patch
  distorm/trunk/python3.patch

---+
 PKGBUILD  |   35 
 build.patch   |   61 
 python3.patch |   40 
 3 files changed, 14 insertions(+), 122 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-15 01:09:23 UTC (rev 407613)
+++ PKGBUILD2018-11-15 01:30:23 UTC (rev 407614)
@@ -4,8 +4,8 @@
 
 pkgbase=distorm
 pkgname=('distorm' 'python-distorm' 'python2-distorm')
-pkgver=3.3.4
-pkgrel=3
+pkgver=3.3.8
+pkgrel=1
 pkgdesc='Powerful disassembler library for x86/AMD64'
 url='https://github.com/gdabah/distorm'
 arch=('x86_64')
@@ -12,26 +12,18 @@
 license=('BSD')
 makedepends=('python' 'python2' 'glibc')
 options=('staticlibs')
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/gdabah/distorm/archive/v${pkgver}.tar.gz
-python3.patch
-build.patch)
-sha512sums=('172bb1a9a3f92089daf140fd019c94cf3b63f646b78e7aa527640819f418b1e3df2e2d727a76863a7800e6e3735c404054aeb48fceeec7a94f95480b89883b90'
-
'91bfa096e8de1c494a84e781aa27c48a1063239c4d1e1c746d32fde9273e79769af37240559341edf6547055fbf80698339474ad77c3581c01d4057ba5cef0ea'
-
'f7ec10c577715b3c8907dc999652de377f21b33acb78954544f920bc65be7e19d13368cf9915be10a5162c149cb9b48816f52f0258d219a3ea1cf26bb63ed8c2')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/gdabah/distorm/archive/v${pkgver}.tar.gz)
+sha512sums=('bf65fe500089b4aa38d6430eb985f1dc3494b43c829379c56f91b5b4b25d19504fa3781a2fb2b03946f541962f6e564e46d6ec464c469ee21ecb773303b8494e')
 
 prepare() {
-  (cd ${pkgbase}-${pkgver}
-patch -p1 < "${srcdir}/build.patch"
-patch -p1 < "${srcdir}/python3.patch"
-  )
   cp -ra ${pkgbase}-${pkgver}{,-py2}
-  sed -e '1i#!/usr/bin/env python' -i 
${pkgbase}-${pkgver}/python/distorm3/sample.py
-  sed -e '1i#!/usr/bin/env python2' -i 
${pkgbase}-${pkgver}-py2/python/distorm3/sample.py
+  sed -e '1i#!/usr/bin/env python' -i 
${pkgbase}-${pkgver}/examples/python/sample.py
+  sed -e '1i#!/usr/bin/env python2' -i 
${pkgbase}-${pkgver}-py2/examples/python/sample.py
 }
 
 build() {
   (cd ${pkgbase}-${pkgver}
-make -C make/linux
+make -C make/linux CFLAGS="${CFLAGS} ${CPPFLAGS} -fPIC"
 python setup.py build
   )
   (cd ${pkgbase}-${pkgver}-py2
@@ -41,10 +33,12 @@
 
 package_distorm() {
   depends=('glibc')
+  provides=('libdistorm3.so')
   cd ${pkgbase}-${pkgver}
   make -C make/linux PREFIX=/usr DESTDIR="${pkgdir}" install
   install -Dm 644 include/*.h -t "${pkgdir}/usr/include"
-  install -Dm 644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm 644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  ln -s /usr/lib/libdistorm3.so "${pkgdir}/usr/lib/libdistorm3.so".$(grep 
'LIB_S_VERSION =' make/linux/Makefile|cut -d' ' -f3)
 }
 
 package_python-distorm() {
@@ -51,8 +45,8 @@
   depends=('python')
   cd ${pkgbase}-${pkgver}
   python setup.py install --root="${pkgdir}" -O1 --skip-build
-  install -Dm 755 python/distorm3/sample.py "${pkgdir}/usr/bin/disasm"
-  install -Dm 644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm 755 examples/python/sample.py -t 
"${pkgdir}/usr/share/doc/${pkgname}"
+  install -Dm 644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
 
 package_python2-distorm() {
@@ -59,9 +53,8 @@
   depends=('python2')
   cd ${pkgbase}-${pkgver}-py2
   python2 setup.py install --root="${pkgdir}" -O1 --skip-build
-  install -Dm 755 python/distorm3/sample.py "${pkgdir}/usr/bin/disasm"
-  install -Dm 644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  mv "${pkgdir}/usr/bin/disasm"{,-py2}
+  install -Dm 755 examples/python/sample.py -t 
"${pkgdir}/usr/share/doc/${pkgname}"
+  install -Dm 644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
 
 # vim: ts=2 sw=2 et:

Deleted: build.patch
===
--- build.patch 2018-11-15 01:09:23 UTC (rev 407613)
+++ build.patch 2018-11-15 01:30:23 UTC (rev 407614)
@@ -1,61 +0,0 @@
-From 26d3959ac90cfbecd36458fee2fbb67807457d54 Mon Sep 17 00:00:00 2001
-From: anthraxx 
-Date: Mon, 6 Jun 2016 00:03:20 +0200
-Subject: [PATCH] more distribution friendly Makefile improvements
-
-- append CFLAGS instead of force-set it, this was distributions
-  can also add their own CFLAGS in addition (this is very common).
-- introduce LDFLAGS so distributions can set their own additional
-  flags for the linker and append instead of set (this is very common)
-- replace static /usr/local/lib with a PREFIX variable with default
-  value of /usr/local so a distribution can easily use PREFIX=/usr
-  (this is also common)
-- introduce DESTDIR for distribution wide packaging 

[arch-commits] Commit in distorm/trunk (PKGBUILD build.patch python3.patch)

[Levente Polyak]

Date: Sunday, June 12, 2016 @ 20:46:08
  Author: anthraxx
Revision: 179724

upgpkg: distorm 3.3.4-1

Added:
  distorm/trunk/build.patch
  distorm/trunk/python3.patch
Modified:
  distorm/trunk/PKGBUILD

---+
 PKGBUILD  |   63 
 build.patch   |   61 ++
 python3.patch |   40 +++
 3 files changed, 146 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-06-12 15:47:48 UTC (rev 179723)
+++ PKGBUILD2016-06-12 18:46:08 UTC (rev 179724)
@@ -2,39 +2,66 @@
 # Contributor: Mike Sampson 
 # Contributor: Dmitry A. Ilyashevich 
 
-pkgname=distorm
-pkgver=3.3.3
+pkgbase=distorm
+pkgname=('distorm' 'python-distorm' 'python2-distorm')
+pkgver=3.3.4
 pkgrel=1
-pkgdesc="Powerful disassembler library for x86/AMD64"
+pkgdesc='Powerful disassembler library for x86/AMD64'
 url='https://github.com/gdabah/distorm'
 arch=('i686' 'x86_64')
 license=('BSD')
-depends=('python2')
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/gdabah/distorm/archive/v${pkgver}.tar.gz)
-sha512sums=('abc37d050efcb7fd7c6e0f1ef055537f06059528fb48a07d159621adca8d905ee3a44b394d75e10aa69f2429fb1023e9282b349281acb3a9474148f195306fbf')
+makedepends=('python' 'python2' 'glibc')
+options=('staticlibs')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/gdabah/distorm/archive/v${pkgver}.tar.gz
+python3.patch
+build.patch)
+sha512sums=('172bb1a9a3f92089daf140fd019c94cf3b63f646b78e7aa527640819f418b1e3df2e2d727a76863a7800e6e3735c404054aeb48fceeec7a94f95480b89883b90'
+
'91bfa096e8de1c494a84e781aa27c48a1063239c4d1e1c746d32fde9273e79769af37240559341edf6547055fbf80698339474ad77c3581c01d4057ba5cef0ea'
+
'f7ec10c577715b3c8907dc999652de377f21b33acb78954544f920bc65be7e19d13368cf9915be10a5162c149cb9b48816f52f0258d219a3ea1cf26bb63ed8c2')
 
 prepare() {
-  cd ${pkgname}-${pkgver}
-  sed -r 's|(install)|\1 -D|g' -i make/linux/Makefile
-  sed -r 's|/usr/local/lib|${DESTDIR}/usr/lib/${TARGET}|g' -i 
make/linux/Makefile
-  sed -r 's|(CFLAGS)=|\1+=|g' -i make/linux/Makefile
-  sed -e '1i#!/usr/bin/env python2' -i python/distorm3/sample.py
+  (cd ${pkgbase}-${pkgver}
+patch -p1 < "${srcdir}/build.patch"
+patch -p1 < "${srcdir}/python3.patch"
+  )
+  cp -ra ${pkgbase}-${pkgver}{,-py2}
+  sed -e '1i#!/usr/bin/env python' -i 
${pkgbase}-${pkgver}/python/distorm3/sample.py
+  sed -e '1i#!/usr/bin/env python2' -i 
${pkgbase}-${pkgver}-py2/python/distorm3/sample.py
 }
 
 build() {
-  cd ${pkgname}-${pkgver}
-  make -C make/linux
+  (cd ${pkgbase}-${pkgver}
+make -C make/linux
+python setup.py build
+  )
+  (cd ${pkgbase}-${pkgver}-py2
+python2 setup.py build
+  )
 }
 
-package() {
-  cd ${pkgname}-${pkgver}
+package_distorm() {
+  depends=('glibc')
+  cd ${pkgbase}-${pkgver}
+  make -C make/linux PREFIX=/usr DESTDIR="${pkgdir}" install
+  install -Dm 644 include/*.h -t "${pkgdir}/usr/include"
+  install -Dm 644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
 
-  make -C make/linux DESTDIR="${pkgdir}" install
-  python2 setup.py install --root="${pkgdir}" -O1
+package_python-distorm() {
+  depends=('python')
+  cd ${pkgbase}-${pkgver}
+  python setup.py install --root="${pkgdir}" -O1 --skip-build
+  install -Dm 755 python/distorm3/sample.py "${pkgdir}/usr/bin/disasm"
+  install -Dm 644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
 
+package_python2-distorm() {
+  depends=('python2')
+  cd ${pkgbase}-${pkgver}-py2
+  python2 setup.py install --root="${pkgdir}" -O1 --skip-build
   install -Dm 755 python/distorm3/sample.py "${pkgdir}/usr/bin/disasm"
-  install -Dm 644 include/*.h -t "${pkgdir}/usr/include"
   install -Dm 644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  mv "${pkgdir}/usr/bin/disasm"{,-py2}
 }
 
 # vim: ts=2 sw=2 et:

Added: build.patch
===
--- build.patch (rev 0)
+++ build.patch 2016-06-12 18:46:08 UTC (rev 179724)
@@ -0,0 +1,61 @@
+From 26d3959ac90cfbecd36458fee2fbb67807457d54 Mon Sep 17 00:00:00 2001
+From: anthraxx 
+Date: Mon, 6 Jun 2016 00:03:20 +0200
+Subject: [PATCH] more distribution friendly Makefile improvements
+
+- append CFLAGS instead of force-set it, this was distributions
+  can also add their own CFLAGS in addition (this is very common).
+- introduce LDFLAGS so distributions can set their own additional
+  flags for the linker and append instead of set (this is very common)
+- replace static /usr/local/lib with a PREFIX variable with default
+  value of /usr/local so a distribution can easily use PREFIX=/usr
+  (this is also common)
+- introduce DESTDIR for distribution wide packaging as they build in
+  chroots and deploy into a special directory