Commit c71a7264 authored by Bernd Kuhls's avatar Bernd Kuhls Committed by Thomas Petazzoni
Browse files

package/rtmpdump: Fix makefile when GnuTLS is used 

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: default avatarBernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent e26b6c6b

package/rtmpdump/rtmpdump.mk

+8 −5
Original line number Diff line number Diff line
@@ -32,22 +32,25 @@ else 
RTMPDUMP_SHARED = "SHARED="

endif



define RTMPDUMP_BUILD_CMDS

	$(MAKE) CRYPTO=$(RTMPDUMP_CRYPTO) \

RTMPDUMP_MAKE_FLAGS = \

	CRYPTO=$(RTMPDUMP_CRYPTO) \

	prefix=/usr \

	$(RTMPDUMP_SHARED)



define RTMPDUMP_BUILD_CMDS

	$(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))