brltty/brltty-5.6-libs-add-ldflags.patch

109 lines
3.5 KiB
Diff
Raw Normal View History

From bc609b45ee5b44247d528e9462cb28792753a267 Mon Sep 17 00:00:00 2001
From: Dave Mielke <dave@mielke.cc>
Date: Tue, 24 Apr 2018 17:41:28 -0400
Subject: [PATCH] The distribution-supplied LDFLAGS should also be used when
making shared objects. (dm)
---
configure.ac | 73 +++++++++++++++++++++++++++++++-----------------------------
1 file changed, 38 insertions(+), 35 deletions(-)
diff --git a/configure.ac b/configure.ac
index 906a8f632..4e8b0ccb7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -377,7 +377,7 @@ in
solaris* ) LDFLAGS_DYNAMIC="";;
*) AC_MSG_ERROR([dynamic linkage not supported for ${host_os}]);;
esac
-LDFLAGS_DYNAMIC="${LDFLAGS} BRLTTY_OPTIONS_LD2CC([${LDFLAGS_DYNAMIC}])"
+LDFLAGS_DYNAMIC="BRLTTY_OPTIONS_LD2CC([${LDFLAGS_DYNAMIC}])"
if test "${GCC}" = "yes"
then
@@ -404,6 +404,7 @@ else
fi
pkgconfig_flags_libs="--libs"
+
BRLTTY_ARG_ENABLE(
[standalone-programs],
[statically linked executables],
@@ -429,40 +430,42 @@ test "${DOXYGEN}" = "false" && can_make_BrlAPIref=no || can_make_BrlAPIref=yes
AC_SUBST([can_make_BrlAPIref])
AC_CACHE_CHECK([for shared object creation command], [brltty_cv_prog_make_object_shared], [dnl
-case "${host_os}"
-in
- linux*|gnu*|openbsd*|freebsd*|kfreebsd*|netbsd*|*qnx*|cygwin*|mingw*|elf*)
- brltty_mkshr_ld_make="-shared"
- ;;
- solaris*)
- brltty_mkshr_ld_make="-G"
- ;;
- hpux*)
- brltty_mkshr_ld_make="-b"
- ;;
- osf*)
- brltty_mkshr_ld_make="-shared"
- ;;
- darwin*)
- brltty_mkshr_ld_make="-bundle"
- brltty_mkshr_ld_options="-flat_namespace -undefined suppress"
- brltty_mkshr_gcc_make="-bundle"
- ;;
- msdos*)
- brltty_mkshr_ld_make="not_supported_on_msdos"
- brltty_mkshr_ld_options="not_supported_on_msdos"
- brltty_mkshr_gcc_make="not_supported_on_msdos"
- ;;
- *)
- AC_MSG_ERROR([loadable module creation command not configured for ${host_os}])
- ;;
-esac
-if test "${GCC}" = "yes"
-then
- brltty_cv_prog_make_object_shared="\$(CC) ${brltty_mkshr_gcc_make=-shared} BRLTTY_OPTIONS_LD2CC([${brltty_mkshr_ld_options}]) -o"
-else
- brltty_cv_prog_make_object_shared="\$(LD) ${brltty_mkshr_ld_make} ${brltty_mkshr_ld_options} -o"
-fi])
+ case "${host_os}"
+ in
+ linux*|gnu*|openbsd*|freebsd*|kfreebsd*|netbsd*|*qnx*|cygwin*|mingw*|elf*)
+ brltty_mkshr_ld_make="-shared"
+ ;;
+ solaris*)
+ brltty_mkshr_ld_make="-G"
+ ;;
+ hpux*)
+ brltty_mkshr_ld_make="-b"
+ ;;
+ osf*)
+ brltty_mkshr_ld_make="-shared"
+ ;;
+ darwin*)
+ brltty_mkshr_ld_make="-bundle"
+ brltty_mkshr_ld_options="-flat_namespace -undefined suppress"
+ brltty_mkshr_gcc_make="-bundle"
+ ;;
+ *)
+ AC_MSG_ERROR([loadable module creation command not configured for ${host_os}])
+ brltty_mkshr_ld_make="NOT_SUPPORTED"
+ brltty_mkshr_ld_options="NOT_SUPPORTED"
+ brltty_mkshr_gcc_make="NOT_SUPPORTED"
+ ;;
+ esac
+
+ if test "${GCC}" = "yes"
+ then
+ brltty_cv_prog_make_object_shared="\$(CC) ${brltty_mkshr_gcc_make=-shared} BRLTTY_OPTIONS_LD2CC([${brltty_mkshr_ld_options}])"
+ else
+ brltty_cv_prog_make_object_shared="\$(LD) ${brltty_mkshr_ld_make} ${brltty_mkshr_ld_options}"
+ fi
+
+ brltty_cv_prog_make_object_shared="${brltty_cv_prog_make_object_shared} ${LDFLAGS} -o"
+])
AC_SUBST([MKSHR], ["${brltty_cv_prog_make_object_shared}"])
AC_CACHE_CHECK([for make relocatable object command], [brltty_cv_prog_make_object_relocatable], [dnl