mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-25 20:25:28 +03:00
e16abe5408
Disabled ssl support, since according with http://www.live555.com/liveMedia/ RTSP-over-TLS is sill in to-do list: * support for SRTP ('secure' RTP), and perhaps also RTSP-over-TLS.
49 lines
1.8 KiB
Diff
49 lines
1.8 KiB
Diff
From: Benjamin Drung <bdrung@debian.org>
|
|
Date: Sat, 16 Sep 2017 11:22:04 +0200
|
|
Subject: Link shared libraries with g++ instead of gcc to fix build failure
|
|
|
|
---
|
|
config.linux | 6 +++---
|
|
config.linux-with-shared-libraries | 6 +++---
|
|
2 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/config.linux b/config.linux
|
|
index b4021ef..efff3a9 100644
|
|
--- a/config.linux
|
|
+++ b/config.linux
|
|
@@ -1,12 +1,12 @@
|
|
COMPILE_OPTS = $(INCLUDES) -I/usr/local/include -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
|
|
C = c
|
|
-C_COMPILER = cc
|
|
+C_COMPILER = $(CC)
|
|
C_FLAGS = $(COMPILE_OPTS) $(CPPFLAGS) $(CFLAGS)
|
|
CPP = cpp
|
|
-CPLUSPLUS_COMPILER = c++
|
|
+CPLUSPLUS_COMPILER = $(CXX)
|
|
CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall -DBSD=1 $(CPPFLAGS) $(CXXFLAGS)
|
|
OBJ = o
|
|
-LINK = c++ -o
|
|
+LINK = $(CXX) -o
|
|
LINK_OPTS = -L. $(LDFLAGS)
|
|
CONSOLE_LINK_OPTS = $(LINK_OPTS)
|
|
LIBRARY_LINK = ar cr
|
|
diff --git a/config.linux-with-shared-libraries b/config.linux-with-shared-libraries
|
|
index 04d0ea0..2ae04ef 100644
|
|
--- a/config.linux-with-shared-libraries
|
|
+++ b/config.linux-with-shared-libraries
|
|
@@ -33,12 +33,12 @@ CPLUSPLUS_COMPILER = $(CXX)
|
|
CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall -DBSD=1 $(CPPFLAGS) $(CXXFLAGS)
|
|
OBJ = o
|
|
LINK = $(CXX) -o
|
|
-LINK_OPTS = -L. $(LDFLAGS)
|
|
+LINK_OPTS = -L. $(CPPFLAGS) $(LDFLAGS)
|
|
CONSOLE_LINK_OPTS = $(LINK_OPTS)
|
|
-LIBRARY_LINK = $(CC) -o
|
|
+LIBRARY_LINK = $(CXX) -o
|
|
SHORT_LIB_SUFFIX = so.$(shell expr $($(NAME)_VERSION_CURRENT) - $($(NAME)_VERSION_AGE))
|
|
LIB_SUFFIX = $(SHORT_LIB_SUFFIX).$($(NAME)_VERSION_AGE).$($(NAME)_VERSION_REVISION)
|
|
-LIBRARY_LINK_OPTS = -shared -Wl,-soname,$(NAME).$(SHORT_LIB_SUFFIX) $(LDFLAGS)
|
|
+LIBRARY_LINK_OPTS = -shared -Wl,-soname,$(NAME).$(SHORT_LIB_SUFFIX) $(CPPFLAGS) $(LDFLAGS)
|
|
LIBS_FOR_CONSOLE_APPLICATION = -lssl -lcrypto
|
|
LIBS_FOR_GUI_APPLICATION =
|
|
EXE =
|