NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/rtmpdump: Fix makefile when GnuTLS is used

Browse Source 
In librtmp/Makefile the variable CRYPTO defaults to OpenSSL. When
building with GnuTLS support instead, librtmp.pc includes wrong
libraries:

$ grep Req output/staging/usr/lib/pkgconfig/librtmp.pc
Requires: libssl,libcrypto

using this defconfig

BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
BR2_PACKAGE_GNUTLS=y
BR2_PACKAGE_RTMPDUMP=y

Pass RTMPDUMP_CRYPTO also to INSTALL_*_CMDS to fix this problem.
Patch supposed by Thomas:
http://article.gmane.org/gmane.comp.lib.uclibc.buildroot/129525

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Bernd Kuhls 2015-10-17 11:45:58 +02:00 committed by Thomas Petazzoni
parent e26b6c6bf9
commit c71a72646c
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
package/rtmpdump/rtmpdump.mk
View File

@ -32,22 +32,25 @@ else
RTMPDUMP_SHARED = "SHARED="
endif
RTMPDUMP_MAKE_FLAGS = \
CRYPTO=$(RTMPDUMP_CRYPTO) \
prefix=/usr \
$(RTMPDUMP_SHARED)
define RTMPDUMP_BUILD_CMDS
$(MAKE) CRYPTO=$(RTMPDUMP_CRYPTO) \
prefix=/usr \
$(MAKE) $(RTMPDUMP_MAKE_FLAGS) \
XCFLAGS="$(RTMPDUMP_CFLAGS)" \
XLDFLAGS="$(TARGET_LDFLAGS)" \
CROSS_COMPILE="$(TARGET_CROSS)" \
$(RTMPDUMP_SHARED) \
-C $(@D)/librtmp
endef
define RTMPDUMP_INSTALL_STAGING_CMDS
$(MAKE) prefix=/usr -C $(@D)/librtmp install DESTDIR=$(STAGING_DIR) $(RTMPDUMP_SHARED)
$(MAKE) -C $(@D)/librtmp install DESTDIR=$(STAGING_DIR) $(RTMPDUMP_MAKE_FLAGS)
endef
define RTMPDUMP_INSTALL_TARGET_CMDS
$(MAKE) prefix=/usr -C $(@D)/librtmp install DESTDIR=$(TARGET_DIR) $(RTMPDUMP_SHARED)
$(MAKE) -C $(@D)/librtmp install DESTDIR=$(TARGET_DIR) $(RTMPDUMP_MAKE_FLAGS)
endef
$(eval $(generic-package))