Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/cgminer/files/
Date: Wed, 09 Aug 2017 12:19:00
Message-Id: 1502281108.99b4f590c3ec75b1b535671d7ddcffad329561a3.blueness@gentoo
1 commit: 99b4f590c3ec75b1b535671d7ddcffad329561a3
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Wed Aug 9 09:08:50 2017 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 9 12:18:28 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99b4f590
7
8 net-misc/cgminer: remove unused patch
9
10 .../files/cgminer-4.4.2-system-jansson.patch | 47 ----------------------
11 1 file changed, 47 deletions(-)
12
13 diff --git a/net-misc/cgminer/files/cgminer-4.4.2-system-jansson.patch b/net-misc/cgminer/files/cgminer-4.4.2-system-jansson.patch
14 deleted file mode 100644
15 index a54054cb630..00000000000
16 --- a/net-misc/cgminer/files/cgminer-4.4.2-system-jansson.patch
17 +++ /dev/null
18 @@ -1,47 +0,0 @@
19 -diff -Naur cgminer-4.4.2.orig/compat/Makefile.am cgminer-4.4.2/compat/Makefile.am
20 ---- cgminer-4.4.2.orig/compat/Makefile.am 2014-07-16 23:01:05.000000000 -0400
21 -+++ cgminer-4.4.2/compat/Makefile.am 2014-07-17 06:55:09.703029301 -0400
22 -@@ -1,8 +1,5 @@
23 --
24 --SUBDIRS = jansson-2.6
25 --
26 - if WANT_USBUTILS
27 - if WANT_STATIC_LIBUSB
28 --SUBDIRS += libusb-1.0
29 -+SUBDIRS = libusb-1.0
30 - endif
31 - endif
32 -diff -Naur cgminer-4.4.2.orig/configure.ac cgminer-4.4.2/configure.ac
33 ---- cgminer-4.4.2.orig/configure.ac 2014-07-17 00:35:21.000000000 -0400
34 -+++ cgminer-4.4.2/configure.ac 2014-07-17 06:55:44.964030906 -0400
35 -@@ -418,8 +418,7 @@
36 -
37 - AM_CONDITIONAL([WANT_STATIC_LIBUSB], [test x$dlibusb = xno])
38 -
39 --AC_CONFIG_SUBDIRS([compat/jansson-2.6])
40 --JANSSON_LIBS="compat/jansson-2.6/src/.libs/libjansson.a"
41 -+JANSSON_LIBS="-ljansson"
42 -
43 - PKG_PROG_PKG_CONFIG()
44 -
45 -diff -Naur cgminer-4.4.2.orig/Makefile.am cgminer-4.4.2/Makefile.am
46 ---- cgminer-4.4.2.orig/Makefile.am 2014-07-16 23:01:30.000000000 -0400
47 -+++ cgminer-4.4.2/Makefile.am 2014-07-17 06:56:01.140031642 -0400
48 -@@ -1,8 +1,6 @@
49 -
50 - ACLOCAL_AMFLAGS = -I m4
51 -
52 --JANSSON_CPPFLAGS= -I$(top_builddir)/compat/jansson-2.6/src -I$(top_srcdir)/compat/jansson-2.6/src
53 --
54 - if WANT_USBUTILS
55 - USBUTILS_CPPFLAGS = -I$(top_builddir)/compat/libusb-1.0/libusb -I$(top_srcdir)/compat/libusb-1.0/libusb
56 - else
57 -@@ -18,7 +16,7 @@
58 -
59 - SUBDIRS = lib compat ccan
60 -
61 --cgminer_CPPFLAGS = $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_CPPFLAGS) $(USBUTILS_CPPFLAGS)
62 -+cgminer_CPPFLAGS = $(PTHREAD_FLAGS) -fno-strict-aliasing $(USBUTILS_CPPFLAGS)
63 -
64 - bin_PROGRAMS = cgminer
65 -