jer 14/08/13 11:08:26
Added: libhid-0.2.16-libusb.patch libhid-0.2.16-swig.patch
libhid-0.2.16-gentoo.patch
Log:
EAPI bump. Migrate to python-*-r1.eclass. Use configure flag instead of sed
script for disabling -Werror / "debug" flags. Add USE=static-libs (bug
#446748). Disable buggy swig version detection (bug #427010).
(Portage version: 2.2.11-r1/cvs/Linux x86_64, signed Manifest commit with key
A792A613)
Revision Changes Path
1.1 dev-libs/libhid/files/libhid-0.2.16-libusb.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libhid/files/libhid-0.2.16-libusb.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libhid/files/libhid-0.2.16-libusb.patch?rev=1.1&content-type=text/plain
Index: libhid-0.2.16-libusb.patch
===================================================================
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,8 @@
MD_CHECK_OS
MD_CHECK_LIBUSB018B
+LIBS="$LIBS $LIBUSB_LIBS"
+INCLUDES="$INCLUDES $LIBUSB_CFLAGS"
AC_PROG_CC
MD_CHECK_GCC3
@@ -97,13 +99,6 @@
MD_CHECK_DOXYGEN
-MD_CONF_FLAGS(
- [],
- [$OS_CFLAGS $LIBUSB_CFLAGS],
- [],
- [$OS_LDFLAGS $LIBUSB_LIBS]
-)
-
MD_CONF_DB2MAN
##### OUTPUT #################################################################
1.1 dev-libs/libhid/files/libhid-0.2.16-swig.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libhid/files/libhid-0.2.16-swig.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libhid/files/libhid-0.2.16-swig.patch?rev=1.1&content-type=text/plain
Index: libhid-0.2.16-swig.patch
===================================================================
--- a/configure.ac
+++ b/configure.ac
@@ -88,8 +87,8 @@
if test "${ac_cv_enable_swig}" = "no" ; then
AM_CONDITIONAL(HAVE_SWIG, false)
else
- AC_PROG_SWIG(1.3)
- AM_CONDITIONAL(HAVE_SWIG, "$SWIG" -version)
+ AC_CHECK_PROG(SWIG,swig,swig,false)
+ AM_CONDITIONAL(HAVE_SWIG, "$ac_cv_prog_SWIG" -version)
if test -z "${HAVE_SWIG_TRUE}" ; then
AM_PATH_PYTHON
SWIG_PYTHON
1.1 dev-libs/libhid/files/libhid-0.2.16-gentoo.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libhid/files/libhid-0.2.16-gentoo.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libhid/files/libhid-0.2.16-gentoo.patch?rev=1.1&content-type=text/plain
Index: libhid-0.2.16-gentoo.patch
===================================================================
--- a/configure.ac
+++ b/configure.ac
@@ -78,7 +78,6 @@
AC_C_BIGENDIAN
AC_C_STRINGIZE
-MD_CONF_DEBUGGING
MD_CONF_COMPILER
AM_CONDITIONAL(OS_LINUX, test "$MD_OS" = "linux")
AM_CONDITIONAL(OS_BSD, test "$MD_OS" = "bsd")
--- a/m4/md_check_gcc3.m4
+++ b/m4/md_check_gcc3.m4
@@ -1,7 +1,7 @@
AC_DEFUN([MD_CHECK_GCC3],
[
if [[ "$GCC" = "yes" ]]; then
- ver=$(gcc -dD -E - < /dev/null | sed -ne 's,.*__GNUC__ ,,p')
+ ver=$(${CC} -dD -E - < /dev/null | sed -ne 's,.*__GNUC__ ,,p')
case $ver in
*[[^[:digit:]]]*)
AC_MSG_WARN([Could not determine compiler version. Trying our
luck...])
