diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
| commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
| tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-misc/cgminer/files | |
| download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip | |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-misc/cgminer/files')
| -rw-r--r-- | net-misc/cgminer/files/cgminer-4.3.5-system-jansson.patch | 47 | ||||
| -rw-r--r-- | net-misc/cgminer/files/cgminer-4.4.2-system-jansson.patch | 47 |
2 files changed, 94 insertions, 0 deletions
diff --git a/net-misc/cgminer/files/cgminer-4.3.5-system-jansson.patch b/net-misc/cgminer/files/cgminer-4.3.5-system-jansson.patch new file mode 100644 index 000000000000..bfe14311740e --- /dev/null +++ b/net-misc/cgminer/files/cgminer-4.3.5-system-jansson.patch @@ -0,0 +1,47 @@ +diff -Naur cgminer-4.3.5.orig/compat/Makefile.am cgminer-4.3.5/compat/Makefile.am +--- cgminer-4.3.5.orig/compat/Makefile.am 2013-11-30 16:24:45.000000000 -0500 ++++ cgminer-4.3.5/compat/Makefile.am 2014-06-10 09:50:07.363965296 -0400 +@@ -1,8 +1,5 @@ +- +-SUBDIRS = jansson-2.5 +- + if WANT_USBUTILS + if WANT_STATIC_LIBUSB +-SUBDIRS += libusb-1.0 ++SUBDIRS = libusb-1.0 + endif + endif +diff -Naur cgminer-4.3.5.orig/configure.ac cgminer-4.3.5/configure.ac +--- cgminer-4.3.5.orig/configure.ac 2014-06-09 21:40:35.000000000 -0400 ++++ cgminer-4.3.5/configure.ac 2014-06-10 09:49:42.306964156 -0400 +@@ -405,8 +405,7 @@ + + AM_CONDITIONAL([WANT_STATIC_LIBUSB], [test x$dlibusb = xno]) + +-AC_CONFIG_SUBDIRS([compat/jansson-2.5]) +-JANSSON_LIBS="compat/jansson-2.5/src/.libs/libjansson.a" ++JANSSON_LIBS="-ljansson" + + PKG_PROG_PKG_CONFIG() + +diff -Naur cgminer-4.3.5.orig/Makefile.am cgminer-4.3.5/Makefile.am +--- cgminer-4.3.5.orig/Makefile.am 2014-06-09 20:29:40.000000000 -0400 ++++ cgminer-4.3.5/Makefile.am 2014-06-10 09:49:56.153964786 -0400 +@@ -1,8 +1,6 @@ + + ACLOCAL_AMFLAGS = -I m4 + +-JANSSON_CPPFLAGS= -I$(top_builddir)/compat/jansson-2.5/src -I$(top_srcdir)/compat/jansson-2.5/src +- + if WANT_USBUTILS + USBUTILS_CPPFLAGS = -I$(top_builddir)/compat/libusb-1.0/libusb -I$(top_srcdir)/compat/libusb-1.0/libusb + else +@@ -18,7 +16,7 @@ + + SUBDIRS = lib compat ccan + +-cgminer_CPPFLAGS = $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_CPPFLAGS) $(USBUTILS_CPPFLAGS) ++cgminer_CPPFLAGS = $(PTHREAD_FLAGS) -fno-strict-aliasing $(USBUTILS_CPPFLAGS) + + bin_PROGRAMS = cgminer + 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 new file mode 100644 index 000000000000..a54054cb630f --- /dev/null +++ b/net-misc/cgminer/files/cgminer-4.4.2-system-jansson.patch @@ -0,0 +1,47 @@ +diff -Naur cgminer-4.4.2.orig/compat/Makefile.am cgminer-4.4.2/compat/Makefile.am +--- cgminer-4.4.2.orig/compat/Makefile.am 2014-07-16 23:01:05.000000000 -0400 ++++ cgminer-4.4.2/compat/Makefile.am 2014-07-17 06:55:09.703029301 -0400 +@@ -1,8 +1,5 @@ +- +-SUBDIRS = jansson-2.6 +- + if WANT_USBUTILS + if WANT_STATIC_LIBUSB +-SUBDIRS += libusb-1.0 ++SUBDIRS = libusb-1.0 + endif + endif +diff -Naur cgminer-4.4.2.orig/configure.ac cgminer-4.4.2/configure.ac +--- cgminer-4.4.2.orig/configure.ac 2014-07-17 00:35:21.000000000 -0400 ++++ cgminer-4.4.2/configure.ac 2014-07-17 06:55:44.964030906 -0400 +@@ -418,8 +418,7 @@ + + AM_CONDITIONAL([WANT_STATIC_LIBUSB], [test x$dlibusb = xno]) + +-AC_CONFIG_SUBDIRS([compat/jansson-2.6]) +-JANSSON_LIBS="compat/jansson-2.6/src/.libs/libjansson.a" ++JANSSON_LIBS="-ljansson" + + PKG_PROG_PKG_CONFIG() + +diff -Naur cgminer-4.4.2.orig/Makefile.am cgminer-4.4.2/Makefile.am +--- cgminer-4.4.2.orig/Makefile.am 2014-07-16 23:01:30.000000000 -0400 ++++ cgminer-4.4.2/Makefile.am 2014-07-17 06:56:01.140031642 -0400 +@@ -1,8 +1,6 @@ + + ACLOCAL_AMFLAGS = -I m4 + +-JANSSON_CPPFLAGS= -I$(top_builddir)/compat/jansson-2.6/src -I$(top_srcdir)/compat/jansson-2.6/src +- + if WANT_USBUTILS + USBUTILS_CPPFLAGS = -I$(top_builddir)/compat/libusb-1.0/libusb -I$(top_srcdir)/compat/libusb-1.0/libusb + else +@@ -18,7 +16,7 @@ + + SUBDIRS = lib compat ccan + +-cgminer_CPPFLAGS = $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_CPPFLAGS) $(USBUTILS_CPPFLAGS) ++cgminer_CPPFLAGS = $(PTHREAD_FLAGS) -fno-strict-aliasing $(USBUTILS_CPPFLAGS) + + bin_PROGRAMS = cgminer + |