Update capstone to 2.1.2.

This commit is contained in:
benoit 2014-04-04 09:57:39 +00:00
parent be825146a5
commit c64fd67571
4 changed files with 28 additions and 25 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.2 2014/03/16 09:45:32 benoit Exp $
# $OpenBSD: Makefile,v 1.3 2014/04/04 09:57:39 benoit Exp $
COMMENT = multi-platform, multi-architecture disassembly framework
DISTNAME = capstone-2.1.1
DISTNAME = capstone-2.1.2
CATEGORIES = devel
HOMEPAGE = http://www.capstone-engine.org/
@ -13,7 +13,7 @@ SHARED_LIBS = capstone 1.0
# BSD
PERMIT_PACKAGE_CDROM = Yes
MASTER_SITES = http://capstone-engine.org/download/2.1/
MASTER_SITES = http://capstone-engine.org/download/2.1.2/
USE_GMAKE = Yes
FAKE_FLAGS = PREFIX=${PREFIX}

View File

@ -1,2 +1,2 @@
SHA256 (capstone-2.1.1.tar.gz) = ivPAoPQ51RYnfzCJOJNQA9By80o0/PLo3PB91BWxymU=
SIZE (capstone-2.1.1.tar.gz) = 1353194
SHA256 (capstone-2.1.2.tar.gz) = SeQdZixe1NzTkexM/Odfsxykv9JF66no8Mtp1vbo18w=
SIZE (capstone-2.1.2.tar.gz) = 1353306

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-Makefile,v 1.2 2014/03/16 09:45:32 benoit Exp $
$OpenBSD: patch-Makefile,v 1.3 2014/04/04 09:57:39 benoit Exp $
1. Do not force some compilation flags.
2. Set library version, respecting OpenBSD policy.
3. Avoid duplication of defines, linked to (2).
4. Do not use $(INSTALL_*) at the build stage.
--- Makefile.orig Tue Mar 11 04:41:09 2014
+++ Makefile Fri Mar 14 07:52:13 2014
--- Makefile.orig Tue Apr 1 04:22:54 2014
+++ Makefile Fri Apr 4 08:10:20 2014
@@ -16,7 +16,7 @@
STRIP = $(CROSS)strip
endif
@ -16,8 +16,8 @@ $OpenBSD: patch-Makefile,v 1.2 2014/03/16 09:45:32 benoit Exp $
ifeq ($(USE_SYS_DYN_MEM),yes)
CFLAGS += -DUSE_SYS_DYN_MEM
@@ -44,6 +44,10 @@
INSTALL_LIBRARY ?= $(INSTALL_BIN) -m0755
@@ -59,6 +59,10 @@
INSTALL_LIB ?= $(INSTALL_BIN) -m0755
LIBNAME = capstone
+LIBVER ?= 0.0.0
@ -27,11 +27,11 @@ $OpenBSD: patch-Makefile,v 1.2 2014/03/16 09:45:32 benoit Exp $
DEP_ARM =
@@ -180,12 +184,16 @@
@@ -199,12 +203,16 @@
EXT = so
VERSION_EXT = $(EXT).$(API_MAJOR)
AR_EXT = a
API_MAJOR=$(shell echo `grep -e CS_API_MAJOR include/capstone.h | grep -v = | awk '{print $$3}'` | awk '{print $$1}')
-LDFLAGS += -Wl,-soname,lib$(LIBNAME)$(API_MAJOR)
-LDFLAGS += -Wl,-soname,lib$(LIBNAME).$(VERSION_EXT)
+LDFLAGS += -Wl,-soname,lib$(LIBNAME)
endif
endif
@ -45,7 +45,7 @@ $OpenBSD: patch-Makefile,v 1.2 2014/03/16 09:45:32 benoit Exp $
ARCHIVE = lib$(LIBNAME).$(AR_EXT)
PKGCFGF = $(LIBNAME).pc
@@ -193,7 +201,7 @@
@@ -212,7 +220,7 @@
all: $(LIBRARY) $(ARCHIVE) $(PKGCFGF)
$(MAKE) -C tests
@ -54,23 +54,27 @@ $OpenBSD: patch-Makefile,v 1.2 2014/03/16 09:45:32 benoit Exp $
$(LIBRARY): $(LIBOBJ)
$(CC) $(LDFLAGS) $(LIBOBJ) -o $(LIBRARY)
@@ -244,8 +252,8 @@
install: $(PKGCFGF) $(ARCHIVE) $(LIBRARY)
@@ -248,13 +256,8 @@
mkdir -p $(LIBDIR)
- $(INSTALL_LIBRARY) lib$(LIBNAME).$(EXT) $(LIBDIR)
# remove potential broken old libs
rm -f $(LIBDIR)/lib$(LIBNAME).*
- $(INSTALL_LIB) lib$(LIBNAME).$(EXT) $(LIBDIR)
-ifneq ($(VERSION_EXT),)
- cd $(LIBDIR) && \
- mv lib$(LIBNAME).$(EXT) lib$(LIBNAME).$(VERSION_EXT) && \
- ln -s lib$(LIBNAME).$(VERSION_EXT) lib$(LIBNAME).$(EXT)
-endif
- $(INSTALL_DATA) lib$(LIBNAME).$(AR_EXT) $(LIBDIR)
+ $(INSTALL_LIBRARY) $(LIBRARY) $(LIBDIR)
+ $(INSTALL_DATA) $(ARCHIVE) $(LIBDIR)
mkdir -p $(INCDIR)/$(LIBNAME)
$(INSTALL_DATA) include/*.h $(INCDIR)/$(LIBNAME)
mkdir -p $(PKGCFCGDIR)
@@ -253,12 +261,12 @@
@@ -262,11 +265,12 @@
uninstall:
rm -rf $(INCDIR)/$(LIBNAME)
- rm -f $(LIBDIR)/lib$(LIBNAME).$(EXT)
- rm -f $(LIBDIR)/lib$(LIBNAME).$(AR_EXT)
- rm -f $(LIBDIR)/lib$(LIBNAME).*
- rm -f $(PKGCFCGDIR)/$(LIBNAME).pc
+ rm -f $(LIBDIR)/$(LIBRARY)
+ rm -f $(LIBDIR)/$(ARCHIVE)
@ -80,5 +84,5 @@ $OpenBSD: patch-Makefile,v 1.2 2014/03/16 09:45:32 benoit Exp $
- rm -f $(LIBOBJ) lib$(LIBNAME).*
+ rm -f $(LIBOBJ) $(ARCHIVE) $(LIBRARY)
rm -f $(PKGCFGF)
rm -f include/diet.h
$(MAKE) -C bindings/python clean
$(MAKE) -C bindings/java clean

View File

@ -1,9 +1,8 @@
@comment $OpenBSD: PLIST,v 1.2 2014/03/16 09:45:32 benoit Exp $
@comment $OpenBSD: PLIST,v 1.3 2014/04/04 09:57:39 benoit Exp $
include/capstone/
include/capstone/arm.h
include/capstone/arm64.h
include/capstone/capstone.h
include/capstone/diet.h
include/capstone/mips.h
include/capstone/ppc.h
include/capstone/x86.h