revert pkgconfig.mk

11 years ago · 4011d7374d
parent 719e9da011 918f8fb523
commit 4011d7374d
11 changed files with 56 additions and 42 deletions
--- a/.gitignore
+++ b/.gitignore
@ -58,3 +58,6 @@ capstone.pc

 # local files
 _*
+
+# freebsd ports: generated file with "make makesum" command
+packages/freebsd/ports/devel/capstone/distinfo
--- a/16
+++ b/16
@ -1,5 +1,21 @@
 This file details the changelog of Capstone.

+---------------------------------
+Version 2.1.2:
+
+This is a stable release to fix some bugs deep in the core. There is no update
+to any architectures or bindings, so bindings version 2.1 can be used with this
+version 2.1.2 just fine.
+
+[ Core changes]
+
+- X86: do not print memory offset in negative form. Also do not use negative
+ form for immediate numbers.
+- Fix a bug in X86 when Capstone cannot handle short instruction.
+- Print negative number above -9 without prefix 0x (arm64, mips, arm).
+- Correct the SONAME setup for library versioning (Linux, *BSD, Solaris).
+- Set library versioning for dylib of OSX.
+
 ---------------------------------
 Version 2.1.1: March 13th, 2014

--- a/2
+++ b/2
@ -1,5 +1,5 @@
 # Capstone Disassembly Engine
-# By Nguyen Anh Quynh <aquynh@gmail.com>, 2013>
+# By Nguyen Anh Quynh <aquynh@gmail.com>, 2013-2014

 include config.mk
 include pkgconfig.mk	# package version
--- a/6
+++ b/6
@ -1,7 +1,7 @@
-Version 2.1.1 is a stable release that fixes some bugs deep in the core.
+Version 2.1.2 is a stable release that fixes some bugs deep in the core.
 There is no update to any architectures or bindings, so older bindings
-of release 2.1 can be used with this version 2.1.1 just fine.
+of release 2.1 can be used with this version 2.1.2 just fine.

-For this reason, after upgrading to 2.1.1, users do NOT need to upgrade
+For this reason, after upgrading to 2.1.2, users do NOT need to upgrade
 their bindings from release 2.1.

--- a/make.sh
+++ b/make.sh
@ -1,4 +1,4 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash

 # Capstone Disassembler Engine
 # By Nguyen Anh Quynh <aquynh@gmail.com>, 2013>
--- a/packages/freebsd/ports/devel/capstone/Makefile
+++ b/packages/freebsd/ports/devel/capstone/Makefile
@ -1,9 +1,9 @@
 # $FreeBSD$

 PORTNAME=	capstone
-PORTVERSION=	2.0
+PORTVERSION=	2.1.2
 CATEGORIES=	devel
-MASTER_SITES=	http://capstone-engine.org/download/2.0/
+MASTER_SITES=	http://capstone-engine.org/download/${PORTVERSION}/

 MAINTAINER=	oliver.pntr@gmail.com
 COMMENT=	Multi-platform, multi-architecture disassembly framework
@ -13,7 +13,8 @@ LICENSE=	BSD3CLAUSE
 USES=		gmake
 USE_LDCONFIG=	yes

-MAKE_ENV=	INSTALL_LIBRARY="${INSTALL_LIB}"
+MAKE_ENV+=	INSTALL_LIB="${INSTALL_LIB}" \
+		INSTALL_DATA="${INSTALL_DATA}"

 post-build:
 	# The pkgconfig file is generated and points to stagedir
--- a/packages/freebsd/ports/devel/capstone/distinfo
+++ b/packages/freebsd/ports/devel/capstone/distinfo
@ -1,2 +0,0 @@
-SHA256 (capstone-2.0.tar.gz) = 5d871b1e52047d1b2882bbcc6f049205ba6acc8d55d746937d22af5d0b33fa9e
-SIZE (capstone-2.0.tar.gz) = 1731759
--- a/packages/freebsd/ports/devel/capstone/files/patch-tests_Makefile
+++ b/packages/freebsd/ports/devel/capstone/files/patch-tests_Makefile
@ -1,6 +1,7 @@
--- tests/Makefile.orig	2014-01-25 19:14:03.000000000 +0100
-+++ tests/Makefile	2014-01-25 19:14:24.000000000 +0100
-@@ -11,7 +11,7 @@
+diff -ru work.orig/capstone-2.1.1/tests/Makefile work/capstone-2.1.1/tests/Makefile
+--- tests/Makefile	2014-03-14 17:24:44.000000000 +0100
+++ tests/Makefile	2014-03-14 17:52:47.000000000 +0100
+@@ -13,7 +13,7 @@
 endif
 
 
@ -9,7 +10,7 @@
 
 LIBNAME = capstone
 
-@@ -48,8 +48,8 @@
+@@ -66,8 +66,8 @@
 $(BINARY): $(OBJS)
 
 %$(BIN_EXT): %.o
--- a/packages/macports/devel/capstone/Portfile
+++ b/packages/macports/devel/capstone/Portfile
@ -1,11 +1,10 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
-# $Id: Portfile 117078 2014-02-15 00:49:41Z ryandesign@macports.org $
+# $Id: Portfile 117652 2014-03-07 05:09:28Z ryandesign@macports.org $

 PortSystem          1.0

 name                capstone
-version             2.1
-revision            1
+version             2.1.1
 categories          devel
 platforms           darwin
 maintainers         gmail.com:aquynh
@ -19,8 +18,8 @@ homepage            http://www.capstone-engine.org/
 master_sites        ${homepage}download/${version}/
 extract.suffix      .tgz

-checksums           sha256  5ebc168212a159218a4454c72d0c060b8a8af78605b93b214b3d6c5e2a124896 \
-                    rmd160  47b9a1949b7c82ec235dcb96a81d456f3b18eae6
+checksums           sha256  8af3c0a0f439d516277f308938935003d072f34a34fcf2e8dcf07dd415b1ca65 \
+                    rmd160  ae65771d182feef575fd4a19bc597170ba42ebcf

 patchfiles          patch-Makefile.diff

--- a/packages/macports/devel/capstone/files/patch-Makefile.diff
+++ b/packages/macports/devel/capstone/files/patch-Makefile.diff
@ -1,6 +1,6 @@
--- Makefile.org	2014-03-04 18:18:25.000000000 -0800
-+++ Makefile	2014-03-04 18:27:48.000000000 -0800
-@@ -21,20 +21,24 @@
+--- Makefile.org	2014-03-10 23:12:11.000000000 -0700
+++ Makefile	2014-03-10 23:33:10.000000000 -0700
+@@ -22,20 +22,24 @@
 CFLAGS += -DUSE_SYS_DYN_MEM
 endif
 
@ -22,10 +22,8 @@
 +
 +LIBDIR = $(PREFIX)/lib
 # on x86_64, we might have /usr/lib64 directory instead of /usr/lib
-MACHINE := $(shell uname -m)
-ifeq ($(MACHINE), x86_64)
-+UNAME_M := $(shell uname -m)
-+ifeq ($(UNAME_M),x86_64)
+ UNAME_M := $(shell uname -m)
+ ifeq ($(UNAME_M), x86_64)
 ifeq (,$(wildcard $(LIBDIR)))
 -LIBDIR = $(DESTDIR)$(PREFIX)/lib64
 -else
@ -34,18 +32,18 @@
 endif
 endif
 
-@@ -136,21 +140,10 @@
- LIBOBJ += $(LIBOBJ_ARM) $(LIBOBJ_ARM64) $(LIBOBJ_MIPS) $(LIBOBJ_PPC) $(LIBOBJ_X86)
+@@ -138,7 +142,6 @@
 LIBOBJ += MCInst.o
 
-
+ 
 -UNAME_S := $(shell uname -s)
-PKGCFCGDIR = $(LIBDIR)/pkgconfig
-
+ PKGCFCGDIR = $(LIBDIR)/pkgconfig
+ 
 # OSX?
- ifeq ($(UNAME_S),Darwin)
- EXT = dylib
- AR_EXT = a
+@@ -149,13 +152,6 @@
+ # remove string check because OSX kernel complains about missing symbols
+ CFLAGS += -D_FORTIFY_SOURCE=0
+ endif
 -# By default, suppose that Brew is installed & use Brew path for pkgconfig file
 -PKGCFCGDIR = /usr/local/lib/pkgconfig
 -# is Macport installed instead?
@ -56,9 +54,9 @@
 else
 # Cygwin?
 IS_CYGWIN := $(shell $(CC) -dumpmachine | grep -i cygwin | wc -l)
-@@ -228,25 +221,25 @@
- 	echo 'Description: Capstone disassembler engine' >> $(PKGCFGF)
- 	echo 'Version: $(VERSION)' >> $(PKGCFGF)
+@@ -237,25 +233,25 @@
+ 	echo 'Version: $(PKG_MAJOR).$(PKG_MINOR).$(PKG_EXTRA)' >> $(PKGCFGF)
+ endif
 	echo 'libdir=$(LIBDIR)' >> $(PKGCFGF)
 -	echo 'includedir=$(PREFIX)/include/capstone' >> $(PKGCFGF)
 +	echo 'includedir=$(INCDIR)/capstone' >> $(PKGCFGF)
@ -79,8 +77,8 @@
 +	$(INSTALL_DATA) lib$(LIBNAME).$(AR_EXT) $(DESTDIR)$(LIBDIR)
 +	mkdir -p $(DESTDIR)$(INCDIR)/$(LIBNAME)
 +	$(INSTALL_DATA) include/*.h $(DESTDIR)$(INCDIR)/$(LIBNAME)
-+	mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
-+	$(INSTALL_DATA) $(PKGCFGF) $(DESTDIR)$(LIBDIR)/pkgconfig/
+	mkdir -p $(DESTDIR)$(PKGCFCGDIR)
+	$(INSTALL_DATA) $(PKGCFGF) $(DESTDIR)$(PKGCFCGDIR)/
 
 uninstall:
 -	rm -rf $(INCDIR)/$(LIBNAME)
@ -90,7 +88,7 @@
 +	rm -rf $(DESTDIR)$(INCDIR)/$(LIBNAME)
 +	rm -f $(DESTDIR)$(LIBDIR)/lib$(LIBNAME).$(EXT)
 +	rm -f $(DESTDIR)$(LIBDIR)/lib$(LIBNAME).$(AR_EXT)
-+	rm -f $(DESTDIR)$(LIBDIR)/pkgconfig/$(LIBNAME).pc
+	rm -f $(DESTDIR)$(PKGCFCGDIR)/$(LIBNAME).pc
 
 clean:
 	rm -f $(LIBOBJ) lib$(LIBNAME).*
--- a/pkgconfig.mk
+++ b/pkgconfig.mk
@ -7,5 +7,3 @@ PKG_MINOR = 2

 # version bugfix level. Example: PKG_EXTRA = 1
 PKG_EXTRA =
-
-