|
Lines 1-6
Link Here
|
| 1 |
--- configure.orig 2018-04-20 10:02:55 UTC |
1 |
--- configure.orig 2019-08-05 21:11:40 UTC |
| 2 |
+++ configure |
2 |
+++ configure |
| 3 |
@@ -3516,13 +3516,7 @@ target_os_default=$(tolower $(uname -s)) |
3 |
@@ -3667,13 +3667,7 @@ target_os_default=$(tolower $(uname -s)) |
| 4 |
host_os=$target_os_default |
4 |
host_os=$target_os_default |
| 5 |
|
5 |
|
| 6 |
# machine |
6 |
# machine |
|
Lines 15-21
Link Here
|
| 15 |
cpu="generic" |
15 |
cpu="generic" |
| 16 |
intrinsics="none" |
16 |
intrinsics="none" |
| 17 |
|
17 |
|
| 18 |
@@ -6122,6 +6117,7 @@ |
18 |
@@ -6204,6 +6198,10 @@ enabled libfdk_aac && { check_pkg_config libfdk |
|
|
19 |
{ require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac && |
| 20 |
warn "using libfdk without pkg-config"; } } |
| 21 |
flite_extralibs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite" |
| 22 |
+if test_ldflags -Wl,--no-as-needed && test_ldflags -Wl,--as-needed ; then |
| 23 |
+log FreeBSD bug 239567 |
| 24 |
+flite_extralibs="-Wl,--no-as-needed ${flite_extralibs} -Wl,--as-needed" |
| 25 |
+fi |
| 26 |
enabled libflite && require libflite "flite/flite.h" flite_init $flite_extralibs |
| 27 |
enabled fontconfig && enable libfontconfig |
| 28 |
enabled libfontconfig && require_pkg_config libfontconfig fontconfig "fontconfig/fontconfig.h" FcInit |
| 29 |
@@ -6355,6 +6353,7 @@ enabled omx_rpi && { check_headers OMX_Core. |
| 19 |
die "ERROR: OpenMAX IL headers not found"; } && enable omx |
30 |
die "ERROR: OpenMAX IL headers not found"; } && enable omx |
| 20 |
enabled openssl && { check_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl || |
31 |
enabled openssl && { check_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl || |
| 21 |
check_pkg_config openssl openssl openssl/ssl.h SSL_library_init || |
32 |
check_pkg_config openssl openssl openssl/ssl.h SSL_library_init || |
|
Lines 23-29
Link Here
|
| 23 |
check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto || |
34 |
check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto || |
| 24 |
check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 || |
35 |
check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 || |
| 25 |
check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 || |
36 |
check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 || |
| 26 |
@@ -6234,8 +6229,10 @@ else |
37 |
@@ -6470,8 +6469,10 @@ else |
| 27 |
EOF |
38 |
EOF |
| 28 |
fi |
39 |
fi |
| 29 |
|
40 |
|