pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Rename and improve the patch for NetBSD support.



Module Name:	pkgsrc-wip
Committed By:	Pierre Pronchery <khorben%defora.org@localhost>
Pushed By:	khorben
Date:		Mon Feb 26 02:10:34 2018 +0100
Changeset:	7ab6e11f13abc699d7f169058fb8bd4aff192b2d

Modified Files:
	py-pyvex/distinfo
Added Files:
	py-pyvex/patches/patch-pyvex__c_Makefile
Removed Files:
	py-pyvex/patches/patch-aa

Log Message:
Rename and improve the patch for NetBSD support.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7ab6e11f13abc699d7f169058fb8bd4aff192b2d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 py-pyvex/distinfo                        |  2 +-
 py-pyvex/patches/patch-aa                | 18 ------------------
 py-pyvex/patches/patch-pyvex__c_Makefile | 28 ++++++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 19 deletions(-)

diffs:
diff --git a/py-pyvex/distinfo b/py-pyvex/distinfo
index 3cc0ce6225..822dd9e087 100644
--- a/py-pyvex/distinfo
+++ b/py-pyvex/distinfo
@@ -8,4 +8,4 @@ SHA1 (vex-0.0.0-7394e917fc86c8f042d8ce51a609810a97c20fd7.tar.gz) = 2dda4be121c95
 RMD160 (vex-0.0.0-7394e917fc86c8f042d8ce51a609810a97c20fd7.tar.gz) = 9aa06510c61b2ea33206519b5eef04fa30142152
 SHA512 (vex-0.0.0-7394e917fc86c8f042d8ce51a609810a97c20fd7.tar.gz) = a74607a0c8aa6a547c65e3fe97a9c28c787c0f14be20c8c6a9f67c8f1b05fd23b2acdc4b041a2db6d5204c64f830f6a165d539e325ac016b2c408f18a01468ea
 Size (vex-0.0.0-7394e917fc86c8f042d8ce51a609810a97c20fd7.tar.gz) = 3539578 bytes
-SHA1 (patch-aa) = eec7d485b61cdbf22c740cdf2a8ed140a7aba9f3
+SHA1 (patch-pyvex__c_Makefile) = f5ba4c1b7e288ea9c0513b6bf08aee9833cffc12
diff --git a/py-pyvex/patches/patch-aa b/py-pyvex/patches/patch-aa
deleted file mode 100644
index e77d2c3b4d..0000000000
--- a/py-pyvex/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-Add support for NetBSD.
-
---- /home/khorben/Projects/EdgeBSD/pkgsrc/work/devel/py-pyvex/work/pyvex-29e88cbd20d628421a903e3dfec0027dd01be233/pyvex_c/Makefile.orig	2018-02-26 00:34:40.853208566 +0000
-+++ /home/khorben/Projects/EdgeBSD/pkgsrc/work/devel/py-pyvex/work/pyvex-29e88cbd20d628421a903e3dfec0027dd01be233/pyvex_c/Makefile
-@@ -9,6 +9,11 @@ ifeq ($(UNAME), Linux)
- 	STATIC_LIBRARY_FILE=libpyvex.a
- 	LDFLAGS=-Wl,-soname,$(LIBRARY_FILE)
- endif
-+ifeq ($(UNAME), NetBSD)
-+	LIBRARY_FILE=libpyvex.so
-+	STATIC_LIBRARY_FILE=libpyvex.a
-+	LDFLAGS=-Wl,-soname,$(LIBRARY_FILE)
-+endif
- ifeq ($(findstring MINGW,$(UNAME)), MINGW)
- 	LIBRARY_FILE=pyvex.dll
- 	STATIC_LIBRARY_FILE=libpyvex.a
diff --git a/py-pyvex/patches/patch-pyvex__c_Makefile b/py-pyvex/patches/patch-pyvex__c_Makefile
new file mode 100644
index 0000000000..0ccbc70ca9
--- /dev/null
+++ b/py-pyvex/patches/patch-pyvex__c_Makefile
@@ -0,0 +1,28 @@
+$NetBSD$
+
+Add support for NetBSD.
+Correct the syntax for GCC in C99 mode.
+
+--- pyvex_c/Makefile.orig	2018-02-21 22:03:16.000000000 +0000
++++ pyvex_c/Makefile
+@@ -9,6 +9,11 @@ ifeq ($(UNAME), Linux)
+ 	STATIC_LIBRARY_FILE=libpyvex.a
+ 	LDFLAGS=-Wl,-soname,$(LIBRARY_FILE)
+ endif
++ifeq ($(UNAME), NetBSD)
++	LIBRARY_FILE=libpyvex.so
++	STATIC_LIBRARY_FILE=libpyvex.a
++	LDFLAGS=-Wl,-soname,$(LIBRARY_FILE)
++endif
+ ifeq ($(findstring MINGW,$(UNAME)), MINGW)
+ 	LIBRARY_FILE=pyvex.dll
+ 	STATIC_LIBRARY_FILE=libpyvex.a
+@@ -18,7 +23,7 @@ endif
+ CC=gcc
+ AR=ar
+ INCFLAGS=-I $(VEX_INCLUDE_PATH)
+-CFLAGS=-g -O2 -shared -fPIC --std=c99 $(INCFLAGS)
++CFLAGS=-g -O2 -shared -fPIC -std=c99 $(INCFLAGS)
+ 
+ OBJECTS=pyvex.o logging.o
+ 


Home | Main Index | Thread Index | Old Index