Commit 9fa3745b authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* add ugly hack to configure.ac because the asm parts of libx264.a don't seem to be pic safe ??????

If someone has a better idea, please tell me. This only occurs when doing SDK contrib compilation, so it's a bit weird.

solves the /usr/bin/ld: ./extras/contrib/lib/libx264.a(encoder.o) has local relocation entries in non-writable section (__TEXT,__text)
collect2: ld returned 1 exit status
parent b80918ce
...@@ -3371,6 +3371,9 @@ if test "${enable_x264}" != "no"; then ...@@ -3371,6 +3371,9 @@ if test "${enable_x264}" != "no"; then
AC_CHECK_LIB(x264, x264_encoder_open, [ AC_CHECK_LIB(x264, x264_encoder_open, [
VLC_ADD_BUILTINS([x264]) VLC_ADD_BUILTINS([x264])
VLC_ADD_LDFLAGS([x264],[-lx264]) VLC_ADD_LDFLAGS([x264],[-lx264])
if test "${SYS}" = "darwin"; then
VLC_ADD_LDFLAGS([x264],[-read_only_relocs warning])
fi
],[ ],[
AC_MSG_ERROR([the specified tree hasn't been compiled]) AC_MSG_ERROR([the specified tree hasn't been compiled])
]) ])
...@@ -3385,6 +3388,9 @@ if test "${enable_x264}" != "no"; then ...@@ -3385,6 +3388,9 @@ if test "${enable_x264}" != "no"; then
AC_CHECK_LIB(x264, x264_encoder_open, [ AC_CHECK_LIB(x264, x264_encoder_open, [
VLC_ADD_PLUGINS([x264]) VLC_ADD_PLUGINS([x264])
VLC_ADD_LDFLAGS([x264],[-lx264]) VLC_ADD_LDFLAGS([x264],[-lx264])
if test "${SYS}" = "darwin"; then
VLC_ADD_LDFLAGS([x264],[-read_only_relocs warning])
fi
],[ ],[
if test "${enable_x264}" = "yes"; then if test "${enable_x264}" = "yes"; then
AC_MSG_ERROR([Could not find libx264 on your system: you may get it from http://www.videolan.org/x264.html]) AC_MSG_ERROR([Could not find libx264 on your system: you may get it from http://www.videolan.org/x264.html])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment