diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-23 13:22:09 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-23 13:22:09 -0300 |
| commit | 2906c522e750f7e013d7af606f01ad849a7d3876 (patch) | |
| tree | d62491c93d6534817db7f9b7d07adf64b9670b48 /multilib | |
| parent | 193046ad8ed67a836ffe11e235296e6201e56ce8 (diff) | |
| parent | bd614ac21d2754d778a796cd5e92d1568ec8baec (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/mesa/PKGBUILD
extra/nmap/PKGBUILD
extra/openmpi/PKGBUILD
extra/rasqal/PKGBUILD
extra/sqlite/PKGBUILD
extra/totem/PKGBUILD
extra/xorg-server/PKGBUILD
multilib/lib32-e2fsprogs/PKGBUILD
multilib/lib32-libcups/PKGBUILD
multilib/lib32-mesa/PKGBUILD
staging/libreoffice/PKGBUILD
testing/udev/PKGBUILD
testing/udev/initcpio-hooks-udev
testing/udev/initcpio-install-udev
Diffstat (limited to 'multilib')
| -rw-r--r-- | multilib/lib32-libcups/fix-libusb-configure.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/multilib/lib32-libcups/fix-libusb-configure.patch b/multilib/lib32-libcups/fix-libusb-configure.patch new file mode 100644 index 000000000..02476c0b8 --- /dev/null +++ b/multilib/lib32-libcups/fix-libusb-configure.patch @@ -0,0 +1,12 @@ +diff -ur cups-1.5_2012-05-20_223115.3/config-scripts/cups-common.m4 cups-1.5.3/config-scripts/cups-common.m4 +--- cups-1.5_2012-05-20_223115.3/config-scripts/cups-common.m4 2012-05-20 22:31:15.702071734 +0200 ++++ cups-1.5.3/config-scripts/cups-common.m4 2012-05-20 22:31:29.395622693 +0200 +@@ -216,7 +216,7 @@ + AC_SUBST(LIBUSB) + + if test "x$PKGCONFIG" != x; then +- if test x$enable_libusb = xyes -o $uname != Darwin; then ++ if test x$enable_libusb = xyes -a $uname != Darwin; then + AC_MSG_CHECKING(for libusb-1.0) + if $PKGCONFIG --exists libusb-1.0; then + AC_MSG_RESULT(yes) |