capstone: a proper upstream patch ported

This commit is contained in:
Anton Bolshakov 2014-01-01 14:07:56 +00:00
parent 516896f70f
commit 13393648ec
3 changed files with 23 additions and 2 deletions

View file

@ -1,3 +1,4 @@
AUX capstone-coname.patch 602 SHA256 88bc05269ee6e2e6bfd0159ebcd469ba2606079638967aeac7e85c9075621c26 SHA512 8928e1d6f1a00cf4ba7401270e029c687d14b6c23deedb945c5c87a97887973ba66cdfec3b8bee87d2a66af9fa4181881c108fd117c03ac17d7b9198412795db WHIRLPOOL 22dd9f955803cf697d74538f7d2a93e3fda5124755e3c0a5c03d7fbcb1b1fbe61c66c0e83c1fb44388c6951aa64c5b72c362e8f19816e2a235f0d88de0270f8c
AUX capstone-libdir.patch 549 SHA256 1d6a9d55eae4fb916c133208924c6a0480054b18d4845c3dd3d371485e134f8d SHA512 1045371ea2b674f7135eba85b78b4a46333b1f8ef1bb1599b591fa58a93b23ef23980d157bee1c151de60d92e93eb2ab38382c4d999f176e06405914427e94bd WHIRLPOOL 9238c8b11fb2e59f4bf78d8f46c1f7e6d1bdff08b293517ecbd73e08d35c26eb1036c457250c3a7e0dbb987d4243e70c14bd73b34051dc6e4140f17490709a6d
DIST capstone-1.0.tgz 1635062 SHA256 3fb3512b0476d03dcd1b347b0ff6b966216bf6d0158f79374aec4aa67cd30eca SHA512 bdcc0a40f5c212c4fa280cd94af1580b49a0b64ef87db744c37856056a80987a06b2932c48ba0a88e221dead23913c83818efcd3a611debb728b565711022b13 WHIRLPOOL b39ff8e934af33fea957fbbe4ee3f697af4ef35b9065879754d1432c8eb4c27960ff50946e55d541323ba41cf10c05b50d62d5eaef8e47e52f4961eeb66e29e7
EBUILD capstone-1.0.ebuild 918 SHA256 7838ff266c40697215673c3b43be1e6bbe821ce02d1dde43242ba40b0578c0b2 SHA512 94ee4ad5b5b3730f7586c38991c18dc6d2dc79a19aa5c518eeada23bc26696855c6b719239d6cb1d148b9306fd094b712d57ac60376f942c9491ff85d7d91d9e WHIRLPOOL db01cfd3a34dafc0bea86450750b1cbd9228af4cf026f34930f5d956e7e09091154ca01172de36a612c78793dcc807bd6bebfce0c9e9664869a244814008b347
EBUILD capstone-1.0.ebuild 892 SHA256 b34e5539df1a04533ceb1b0bb69def479c5fa613cb7197630f99a343361f45f1 SHA512 00b97e689998012f1d56f708c00b452616dcf0ba054f83ba4d76831f6d80cff7fd424534e4ffaf873a7b1b0eefb7a4bf309ba7c18ac8d607b1ff83a26ebe00c6 WHIRLPOOL 73212dcc4a7f21611bd308c76fd39de576faa0f9195e70c2c01df1e49837c4023d21d8d5eee3e4904d51011ea68bfd7b70dcd460253c5d71fc900bd6fa2e5cf5

View file

@ -22,7 +22,7 @@ src_prepare() {
#https://github.com/aquynh/capstone/issues/57
sed -e 's|${CC} $(CFLAGS)|$(CC) $(LDFLAGS) $(CFLAGS)|g' -i tests/Makefile || die "sed failed"
#https://github.com/aquynh/capstone/issues/51
sed -e 's:$(PREFIX)/lib:$(PREFIX)/'"$(get_libdir)"':' -i Makefile
epatch "${FILESDIR}/${PN}-libdir.patch"
}
src_install() {

View file

@ -0,0 +1,20 @@
--- Makefile 2014-01-01 22:04:20.761645521 +0800
+++ Makefile.new 2014-01-01 22:01:12.409647638 +0800
@@ -12,7 +12,17 @@
PREFIX ?= /usr
DESTDIR ?=
INCDIR = $(DESTDIR)$(PREFIX)/include
+
+LIBDIR = $(DESTDIR)$(PREFIX)/lib
+# on x86_64, we might have /usr/lib64 directory instead of /usr/lib
+MACHINE := $(shell uname -m)
+ifeq ($(MACHINE), x86_64)
+ifeq (,$(wildcard $(LIBDIR)))
+LIBDIR = $(DESTDIR)$(PREFIX)/lib64
+else
LIBDIR = $(DESTDIR)$(PREFIX)/lib
+endif
+endif
INSTALL_DATA ?= install -m0644
INSTALL_LIBRARY ?= install -m0755