View | Details | Raw Unified | Return to bug 206942 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-1 / +4 lines)
Lines 12-19 Link Here
12
LICENSE=	GPLv3
12
LICENSE=	GPLv3
13
LICENSE_FILE=	${WRKSRC}/COPYING
13
LICENSE_FILE=	${WRKSRC}/COPYING
14
14
15
CONFLICTS_BUILD=capstone-*
15
BUILD_DEPENDS+=		pkg-config:${PORTSDIR}/devel/pkgconf
16
LIB_DEPENDS+=		libcapstone.so:${PORTSDIR}/devel/capstone4
16
17
18
CONFIGURE_ARGS+=	--with-syscapstone
19
17
USES=		gmake pkgconfig tar:xz
20
USES=		gmake pkgconfig tar:xz
18
GNU_CONFIGURE=	yes
21
GNU_CONFIGURE=	yes
19
USE_LDCONFIG=	yes
22
USE_LDCONFIG=	yes
(-)files/patch-shlr_Makefile (-60 lines)
Lines 1-60 Link Here
1
--- shlr/Makefile.orig	2016-01-30 16:12:17 UTC
2
+++ shlr/Makefile
3
@@ -186,52 +186,8 @@ uninstall deinstall:
4
 	#rm -f ${DESTDIR}${LIBDIR}/libr_tcc*
5
 	#rm -f ${DESTDIR}${LIBDIR}/libr_z*
6
 
7
-ifeq ($(USE_CAPSTONE),1)
8
-# Do nothing here
9
-capstone:
10
-
11
-capstone-sync:
12
-
13
-capstone-build:
14
-
15
-else
16
-
17
-ifeq ($(CS_TAR),)
18
-capstone: capstone-sync
19
-
20
-capstone-sync:
21
-	"$(SHELL)" capstone.sh "${CS_URL}" "${CS_BRA}" "${CS_TIP}" "${CS_REV}"
22
-ifeq ($(CS_PATCHES),1)
23
-	cd capstone ; git reset --hard
24
-	cd capstone ; for PATCH in ../capstone-patches/* ; do patch -p1 < $$PATCH ; done
25
-endif
26
-
27
-.PHONY: capstone
28
-else
29
-
30
-capstone-sync: capstone
31
-
32
-capstone-clean:
33
-	cd capstone ; $(MAKE) clean
34
-
35
-capstone: capstone-$(CS_VER).tar.gz
36
-	tar xzvf capstone-$(CS_VER).tar.gz
37
-	rm -rf capstone
38
-	mv capstone-$(CS_VER) capstone
39
-	cd capstone ; for PATCH in ../capstone-patches/* ; do patch -p1 < $$PATCH ; done
40
-
41
-capstone-$(CS_VER).tar.gz:
42
-	$(WGET) --no-check-certificate -O capstone-$(CS_VER).tar.gz -c $(CS_TAR)
43
-endif
44
-
45
 CAPSTONE_CFLAGS=-g
46
 
47
-ifeq (${EXT_AR},)
48
-all:
49
-	echo EXT_AR is not defined
50
-	exit 1
51
-endif
52
-
53
 capstone-build: capstone
54
 	cd capstone && CFLAGS="-Dmips=mips ${CAPSTONE_CFLAGS} $(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
55
 		$(MAKE) CC="$(CC)" AR_EXT=a IS_CYGWIN=0 CAPSTONE_STATIC=yes CAPSTONE_SHARED=no \
56
@@ -239,4 +195,3 @@ capstone-build: capstone
57
 ifneq (${EXT_AR},a)
58
 	-cp -f capstone/libcapstone.a capstone/libcapstone.${EXT_AR}
59
 endif
60
-endif

Return to bug 206942