Skip to contentSkip to conversation

package/rtmpdump: Remove optional dependency to PolarSSL

PATCH New Bernd Kuhls 2 participants 3 messages Oct 17, 2015

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/2 package/rtmpdump: Remove optional dependency to PolarSSL

The makefile of rtmpdump has no support for PolarSSL, so lets remove support for it, as supposed by Gustavo:
http://article.gmane.org/gmane.comp.lib.uclibc.buildroot/129531

Fixes
http://autobuild.buildroot.net/results/45d/45dd9adbac449ce0ed66af5b4655b4d9b37faa62/
http://autobuild.buildroot.net/results/ae0/ae0c4bab7975ed2ad77a9f9fd6a300d1327d56b9/
http://autobuild.buildroot.net/results/029/029695a022ba12ff177521ebc3334d7ac2373ddc/

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/rtmpdump/rtmpdump.mk | 3 ---
 1 file changed, 3 deletions(-)
package/rtmpdump/rtmpdump.mk +0 -3
index 613f1cd..6e0685e 100644
@@ -16,9 +16,6 @@ RTMPDUMP_DEPENDENCIES = zlib
 ifeq ($(BR2_PACKAGE_GNUTLS),y)
 RTMPDUMP_DEPENDENCIES += gnutls
 RTMPDUMP_CRYPTO = GNUTLS
-else ifeq ($(BR2_PACKAGE_POLARSSL),y)
-RTMPDUMP_DEPENDENCIES += polarssl
-RTMPDUMP_CRYPTO = POLARSSL
 else ifeq ($(BR2_PACKAGE_OPENSSL),y)
 RTMPDUMP_DEPENDENCIES += openssl
 RTMPDUMP_CRYPTO = OPENSSL
Signature · 1 line
2.6.1
author
#1 lore raw

PATCH 2/2 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 Bernd Kuhls <[email protected]>
---
 package/rtmpdump/rtmpdump.mk | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
package/rtmpdump/rtmpdump.mk +8 -5
index 6e0685e..ad4308c 100644
@@ -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))
Signature · 1 line
2.6.1
#2 lore raw

PATCH 1/2 package/rtmpdump: Remove optional dependency to PolarSSL

In reply to Bernd Kuhls

Dear Bernd Kuhls,

Quoted 9 lines · Bernd Kuhls

The makefile of rtmpdump has no support for PolarSSL, so lets remove support for it, as supposed by Gustavo:
http://article.gmane.org/gmane.comp.lib.uclibc.buildroot/129531

Fixes
http://autobuild.buildroot.net/results/45d/45dd9adbac449ce0ed66af5b4655b4d9b37faa62/
http://autobuild.buildroot.net/results/ae0/ae0c4bab7975ed2ad77a9f9fd6a300d1327d56b9/
http://autobuild.buildroot.net/results/029/029695a022ba12ff177521ebc3334d7ac2373ddc/

Quoted 4 lines
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/rtmpdump/rtmpdump.mk | 3 ---
 1 file changed, 3 deletions(-)

Both applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com