summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /sci-libs/libsigrokdecode/files
downloadgentoo-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 'sci-libs/libsigrokdecode/files')
-rw-r--r--sci-libs/libsigrokdecode/files/libsigrokdecode-0.3.0-configure-test.patch28
-rw-r--r--sci-libs/libsigrokdecode/files/libsigrokdecode-0.3.0-no-check-linkage.patch30
2 files changed, 58 insertions, 0 deletions
diff --git a/sci-libs/libsigrokdecode/files/libsigrokdecode-0.3.0-configure-test.patch b/sci-libs/libsigrokdecode/files/libsigrokdecode-0.3.0-configure-test.patch
new file mode 100644
index 000000000000..921bb9a3d3ca
--- /dev/null
+++ b/sci-libs/libsigrokdecode/files/libsigrokdecode-0.3.0-configure-test.patch
@@ -0,0 +1,28 @@
+http://sourceforge.net/p/sigrok/mailman/message/32459769/
+
+From dc83770847c39934f5cbc63c8652124fafcb8d0b Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 14 Jun 2014 01:37:12 -0400
+Subject: [PATCH 1/2] fix test operator
+
+The == operator is not in POSIX.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9527379..3f661ec 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -125,7 +125,7 @@ AC_SUBST(MODNAME_PYTHON)
+ # We also need to find the name of the python3 executable (for 'make install').
+ # Some OSes call this python3, some call it python3.2, etc. etc.
+ AC_CHECK_PROGS([PYTHON3], [python3.4 python3.3 python3.2 python3])
+-if test "x$PYTHON3" == "x"; then
++if test "x$PYTHON3" = "x"; then
+ AC_MSG_ERROR([cannot find python3 executable.])
+ fi
+
+--
+2.0.0
+
diff --git a/sci-libs/libsigrokdecode/files/libsigrokdecode-0.3.0-no-check-linkage.patch b/sci-libs/libsigrokdecode/files/libsigrokdecode-0.3.0-no-check-linkage.patch
new file mode 100644
index 000000000000..6cbc4666b69b
--- /dev/null
+++ b/sci-libs/libsigrokdecode/files/libsigrokdecode-0.3.0-no-check-linkage.patch
@@ -0,0 +1,30 @@
+http://sourceforge.net/p/sigrok/mailman/message/32459770/
+
+From 27ecf0c85482786f7617571c690797ab3f07f795 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 14 Jun 2014 01:38:58 -0400
+Subject: [PATCH 2/2] do not add check to common cflags/libs
+
+Only the unittests use these flags, so don't go linking them in for
+the main library too.
+---
+ configure.ac | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3f661ec..10213a7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -134,8 +134,7 @@ AC_SEARCH_LIBS([pow], [m])
+
+ # The Check unit testing framework is optional. Disable if not found.
+ PKG_CHECK_MODULES([check], [check >= 0.9.4],
+- [have_check="yes"; CFLAGS="$CFLAGS $check_CFLAGS";
+- LIBS="$LIBS $check_LIBS"], [have_check="no"])
++ [have_check="yes"], [have_check="no"])
+ AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
+
+ # libsigrok is optional (only used for the protocol decoder test framework).
+--
+2.0.0
+