Merge pull request #4598 from OpenELEC/pkg-config-script-fixes

fix build after $PKG_NAME-config changes
This commit is contained in:
Christian Hewitt 2016-01-10 14:57:16 +04:00
commit 706ea34fd7
4 changed files with 20 additions and 1 deletions

View File

@ -35,6 +35,8 @@ PKG_AUTORECONF="yes"
PKG_CONFIGURE_OPTS_TARGET="--disable-werror \
--disable-extra-warnings \
--disable-optimizations \
--with-libgcrypt-prefix=$SYSROOT_PREFIX/usr \
--with-libgpg-error-prefix=$SYSROOT_PREFIX/usr \
--with-gnu-ld"
post_makeinstall_target() {

View File

@ -35,6 +35,8 @@ PKG_AUTORECONF="yes"
PKG_CONFIGURE_OPTS_TARGET="--disable-werror \
--disable-extra-warnings \
--disable-optimizations \
--with-libgcrypt-prefix=$SYSROOT_PREFIX/usr \
--with-gpg-error-prefix=$SYSROOT_PREFIX/usr \
--with-gnu-ld"
if [ "$BLURAY_AACS_SUPPORT" = "yes" ]; then

View File

@ -0,0 +1,14 @@
diff -Naur libhid-0.2.16/m4/md_check_libusb018b.m4 libhid-0.2.16.patch/m4/md_check_libusb018b.m4
--- libhid-0.2.16/m4/md_check_libusb018b.m4 2004-05-26 02:37:41.000000000 +0200
+++ libhid-0.2.16.patch/m4/md_check_libusb018b.m4 2016-01-10 00:07:24.000000000 +0100
@@ -2,8 +2,8 @@
[
AC_CHECK_HEADERS([usb.h])
- LIBUSB_CFLAGS="`libusb-config --cflags`"
- LIBUSB_LIBS="`libusb-config --libs`"
+ LIBUSB_CFLAGS="`pkg-config --cflags libusb`"
+ LIBUSB_LIBS="`pkg-config --libs libusb`"
AC_SUBST(LIBUSB_CFLAGS)
AC_SUBST(LIBUSB_LIBS)

View File

@ -35,7 +35,8 @@ PKG_AUTORECONF="yes"
PKG_CONFIGURE_OPTS_TARGET="--disable-shared \
--enable-static \
--disable-curl \
--disable-https"
--disable-https \
--with-libgcrypt-prefix=$SYSROOT_PREFIX/usr"
post_makeinstall_target() {
rm -rf $INSTALL/usr/bin