On Sat, Jun 27, 2015 at 9:49 AM, Ganesh Ajjanagadde <gajja...@mit.edu> wrote:
> On Sat, Jun 27, 2015 at 2:22 AM, Hendrik Leppkes <h.lepp...@gmail.com> wrote:
>> On Sat, Jun 27, 2015 at 3:09 AM, Ganesh Ajjanagadde
>> <gajjanaga...@gmail.com> wrote:
>>> Fixes Ticket4673
>>>
>>> Signed-off-by: Ganesh Ajjanagadde <gajjanaga...@gmail.com>
>>> ---
>>> library.mak | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/library.mak b/library.mak
>>> index 29460b8..401da7c 100644
>>> --- a/library.mak
>>> +++ b/library.mak
>>> @@ -58,7 +58,7 @@ $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
>>>
>>> $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SLIBOBJS)
>>> $(SUBDIR)lib$(NAME).ver
>>> $(SLIB_CREATE_DEF_CMD)
>>> - $$(LD) $(SHFLAGS) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^)
>>> $(FFEXTRALIBS)
>>> + $$(LD) $(SHFLAGS) $(LDFLAGS) $(LDEXEFLAGS) $$(LD_O) $$(filter
>>> %.o,$$^) $(FFEXTRALIBS)
>>> $(SLIB_EXTRA_CMD)
>>
>> LDEXEFLAGS is clearly not the appropriate way to go about this. These
>> flags are for executables, not for shared libraries.
>>
>> - Hendrik
>
> Ok, so is it fine if this gets added to LDFLAGS instead? Or should a
> separate e.g LDLIBFLAGS be used?
Attached is new patch that creates a LDLIBFLAGS.
>
>> _______________________________________________
>> ffmpeg-devel mailing list
>> ffmpeg-devel@ffmpeg.org
>> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
From 284017181c3a6f313c34d503f9e220c5f81fe192 Mon Sep 17 00:00:00 2001
From: Ganesh Ajjanagadde <gajjanaga...@gmail.com>
Date: Sat, 27 Jun 2015 12:27:59 -0400
Subject: [PATCH] build: add LDLIBFLAGS
Fixes Ticket4673
Signed-off-by: Ganesh Ajjanagadde <gajjanaga...@gmail.com>
---
configure | 10 ++++++++++
library.mak | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index 27522fe..28522bf 100755
--- a/configure
+++ b/configure
@@ -322,6 +322,7 @@ Toolchain options:
--extra-cxxflags=ECFLAGS add ECFLAGS to CXXFLAGS [$CXXFLAGS]
--extra-ldflags=ELDFLAGS add ELDFLAGS to LDFLAGS [$LDFLAGS]
--extra-ldexeflags=ELDFLAGS add ELDFLAGS to LDEXEFLAGS [$LDEXEFLAGS]
+ --extra-ldlibflags=ELDFLAGS add ELDFLAGS to LDLIBFLAGS [$LDLIBFLAGS]
--extra-libs=ELIBS add ELIBS [$ELIBS]
--extra-version=STRING version string suffix []
--optflags=OPTFLAGS override optimization-related compiler flags
@@ -792,6 +793,10 @@ add_ldexeflags(){
append LDEXEFLAGS $($ldflags_filter "$@")
}
+add_ldlibflags(){
+ append LDLIBFLAGS $($ldflags_filter "$@")
+}
+
add_stripflags(){
append ASMSTRIPFLAGS "$@"
}
@@ -3007,6 +3012,9 @@ for opt do
--extra-ldexeflags=*)
add_ldexeflags $optval
;;
+ --extra-ldlibflags=*)
+ add_ldlibflags $optval
+ ;;
--extra-libs=*)
add_extralibs $optval
;;
@@ -5429,6 +5437,7 @@ check_disable_warning -Wno-pointer-sign
check_ldflags -Wl,--warn-common
check_ldflags -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
enabled rpath && add_ldexeflags -Wl,-rpath,$libdir
+enabled rpath && add_ldlibflags -Wl,-rpath,$libdir
test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic
# add some strip flags
@@ -5897,6 +5906,7 @@ DEPWINDRES=$dep_cc
DOXYGEN=$doxygen
LDFLAGS=$LDFLAGS
LDEXEFLAGS=$LDEXEFLAGS
+LDLIBFLAGS=$LDLIBFLAGS
SHFLAGS=$(echo $($ldflags_filter $SHFLAGS))
ASMSTRIPFLAGS=$ASMSTRIPFLAGS
YASMFLAGS=$YASMFLAGS
diff --git a/library.mak b/library.mak
index 29460b8..6f95f63 100644
--- a/library.mak
+++ b/library.mak
@@ -58,7 +58,7 @@ $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SLIBOBJS) $(SUBDIR)lib$(NAME).ver
$(SLIB_CREATE_DEF_CMD)
- $$(LD) $(SHFLAGS) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $(FFEXTRALIBS)
+ $$(LD) $(SHFLAGS) $(LDFLAGS) $(LDLIBFLAGS) $$(LD_O) $$(filter %.o,$$^) $(FFEXTRALIBS)
$(SLIB_EXTRA_CMD)
ifdef SUBDIR
--
2.4.4
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
