From patchwork Mon May 14 06:25:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 912707 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=t-online.de Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40krKv04Yxz9s0W for ; Mon, 14 May 2018 16:25:38 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D1A7689D2F; Mon, 14 May 2018 06:25:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Fa5GcF7C0Jat; Mon, 14 May 2018 06:25:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 2D93C89D29; Mon, 14 May 2018 06:25:32 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 80D6B1C0AEA for ; Mon, 14 May 2018 06:25:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7E0CC88E7F for ; Mon, 14 May 2018 06:25:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pbPdhdii-CH1 for ; Mon, 14 May 2018 06:25:29 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout07.t-online.de (mailout07.t-online.de [194.25.134.83]) by whitealder.osuosl.org (Postfix) with ESMTPS id 6FAE488CEA for ; Mon, 14 May 2018 06:25:29 +0000 (UTC) Received: from fwd02.aul.t-online.de (fwd02.aul.t-online.de [172.20.26.148]) by mailout07.t-online.de (Postfix) with SMTP id 972E4427E008; Mon, 14 May 2018 08:25:26 +0200 (CEST) Received: from fli4l.lan.fli4l (ZBz4vwZAYhQww7zyLiVyAS03e1FjADFv2hBszDoxw5rQxQsyFheDLRAxn9Zhpicgg-@[84.161.189.206]) by fwd02.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1fI6vA-4cW8Su0; Mon, 14 May 2018 08:25:20 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:47260 helo=kuhls.lan.fli4l) by fli4l.lan.fli4l with esmtp (Exim 4.91) (envelope-from ) id 1fI6v9-0004l9-KW; Mon, 14 May 2018 08:25:20 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Mon, 14 May 2018 08:25:19 +0200 Message-Id: <20180514062519.655-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.14.2 X-ID: ZBz4vwZAYhQww7zyLiVyAS03e1FjADFv2hBszDoxw5rQxQsyFheDLRAxn9Zhpicgg- X-TOI-MSGID: 30acd931-ba2f-4ad4-9884-376e8aceaba2 Subject: [Buildroot] [PATCH 1/1] package/asterisk: Fix issues building without SSL X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Yann E . MORIN" MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes http://autobuild.buildroot.net/results/7d0/7d069dd5629e406cecd17bacfa818e7c8e6b2064/ Signed-off-by: Bernd Kuhls --- ...006-build-fix-issues-building-without-ssl.patch | 57 ++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 package/asterisk/0006-build-fix-issues-building-without-ssl.patch diff --git a/package/asterisk/0006-build-fix-issues-building-without-ssl.patch b/package/asterisk/0006-build-fix-issues-building-without-ssl.patch new file mode 100644 index 0000000000..b02031e5ab --- /dev/null +++ b/package/asterisk/0006-build-fix-issues-building-without-ssl.patch @@ -0,0 +1,57 @@ +From 999e0c17d7e4139d36730752a34fbfde18a4f9f1 Mon Sep 17 00:00:00 2001 +From: Corey Farrell +Date: Sun, 19 Nov 2017 14:52:59 -0500 +Subject: [PATCH] Build: Fix issues building without SSL. + +* Fix conditional in libasteriskssl. +* Use variables produced by configure to link the SSL and uuid libraries + into libasteriskpj.so instead of hard-coding them. + +ASTERISK-27431 + +Change-Id: I3977931fd3ef8c4e4376349ccddb354eb839b58d + +Downloaded from upstream master branch +https://github.com/asterisk/asterisk/commit/999e0c17d7e4139d36730752a34fbfde18a4f9f1 + +Signed-off-by: Bernd Kuhls +--- + main/Makefile | 4 ++-- + main/libasteriskssl.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/main/Makefile b/main/Makefile +index 08d1f65580e..c724e2012b0 100644 +--- a/main/Makefile ++++ b/main/Makefile +@@ -273,7 +273,7 @@ endif + + $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): _ASTLDFLAGS+=-Wl,-soname=$(ASTPJ_LIB).$(ASTPJ_SO_VERSION) $(PJ_LDFLAGS) + $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): _ASTCFLAGS+=-fPIC -DAST_MODULE=\"asteriskpj\" -DAST_NOT_MODULE $(PJ_CFLAGS) +-$(ASTPJ_LIB).$(ASTPJ_SO_VERSION): LIBS+=$(PJPROJECT_LDLIBS) -lssl -lcrypto -luuid -lm -lpthread $(RT_LIB) ++$(ASTPJ_LIB).$(ASTPJ_SO_VERSION): LIBS+=$(PJPROJECT_LDLIBS) $(OPENSSL_LIB) $(UUID_LIB) -lm -lpthread $(RT_LIB) + ifeq ($(GNU_LD),1) + $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): SO_SUPPRESS_SYMBOLS=-Wl,--version-script,libasteriskpj.exports,--warn-common + endif +@@ -298,7 +298,7 @@ ASTPJ_LIB:=libasteriskpj.dylib + # /lib or /usr/lib + $(ASTPJ_LIB): _ASTLDFLAGS+=-dynamiclib -install_name $(ASTLIBDIR)/$(ASTPJ_LIB) $(PJ_LDFLAGS) + $(ASTPJ_LIB): _ASTCFLAGS+=-fPIC -DAST_MODULE=\"asteriskpj\" $(PJ_CFLAGS) -DAST_NOT_MODULE +-$(ASTPJ_LIB): LIBS+=$(PJPROJECT_LIBS) -lssl -lcrypto -luuid -lm -lpthread $(RT_LIB) ++$(ASTPJ_LIB): LIBS+=$(PJPROJECT_LIBS) $(OPENSSL_LIB) $(UUID_LIB) -lm -lpthread $(RT_LIB) + $(ASTPJ_LIB): SOLINK=$(DYLINK) + + # Special rules for building a shared library (not a dynamically loadable module) +diff --git a/main/libasteriskssl.c b/main/libasteriskssl.c +index 8b19e247da9..e2e256f8ffe 100644 +--- a/main/libasteriskssl.c ++++ b/main/libasteriskssl.c +@@ -37,7 +37,7 @@ + #endif + + #if defined(HAVE_OPENSSL) && \ +- !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++ (!defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) + + #include +