diff options
| author | Rodeo <[email protected]> | 2014-01-07 11:42:39 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2014-01-07 11:42:39 +0000 |
| commit | 7f46a78ce98fe1e1bf69cc431c3303eedc1f7f66 (patch) | |
| tree | 5f2912aa05d9600d3655b9ed83a695e43725f659 /contrib/ffmpeg/P02-darwin-pic.patch | |
| parent | 5bf5ef4f102648396941e4a1d1ce4af36638d16b (diff) | |
Revert previous borked commit. Sorry!
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5958 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/ffmpeg/P02-darwin-pic.patch')
| -rw-r--r-- | contrib/ffmpeg/P02-darwin-pic.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/contrib/ffmpeg/P02-darwin-pic.patch b/contrib/ffmpeg/P02-darwin-pic.patch index fc43504bc..f512416a1 100644 --- a/contrib/ffmpeg/P02-darwin-pic.patch +++ b/contrib/ffmpeg/P02-darwin-pic.patch @@ -1,21 +1,21 @@ diff --git a/configure b/configure -index e9fc08c..72bff03 100755 +index 6ab04ae..fa9f980 100755 --- a/configure +++ b/configure -@@ -3263,6 +3263,7 @@ case $target_os in - SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME).$(LIBMAJOR)$(SLIBSUF)' +@@ -2893,6 +2893,7 @@ case $target_os in + AVSERVERLDFLAGS=-Wl,-bind_at_load objformat="macho" enabled x86_64 && objformat="macho64" + enabled x86_64 && enable pic enabled_any pic shared || { check_cflags -mdynamic-no-pic && add_asflags -mdynamic-no-pic; } ;; -@@ -3502,7 +3503,7 @@ esc(){ +@@ -3095,7 +3096,7 @@ esc(){ echo "config:$arch:$subarch:$cpu:$target_os:$(esc $cc_ident):$(esc $LIBAV_CONFIGURATION)" >config.fate --check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable_weak pic -+#check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable_weak pic +-check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable pic ++#check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable pic set_default $PATHS_LIST set_default nm |