brltty-5.2-fix-ldflags.patch 2.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657
  1. --- a/configure.ac
  2. +++ b/configure.ac
  3. @@ -377,7 +377,7 @@
  4. case "${host_os}"
  5. in
  6. linux*|gnu*|openbsd*|freebsd*|kfreebsd*|netbsd*|*qnx*|cygwin*|mingw*|elf*)
  7. - brltty_mkmod_ld_make="-shared"
  8. + brltty_mkmod_ld_make="-shared ${LDFLAGS}"
  9. ;;
  10. solaris*)
  11. brltty_mkmod_ld_make="-G"
  12. @@ -404,7 +404,7 @@
  13. esac
  14. if test "${GCC}" = "yes"
  15. then
  16. - brltty_cv_prog_mkmod="\$(CC) ${brltty_mkmod_gcc_make=-shared} BRLTTY_OPTIONS_LD2CC([${brltty_mkmod_ld_options}]) -o"
  17. + brltty_cv_prog_mkmod="\$(CC) ${brltty_mkmod_gcc_make=-shared} ${LDFLAGS} BRLTTY_OPTIONS_LD2CC([${brltty_mkmod_ld_options}]) -o"
  18. else
  19. brltty_cv_prog_mkmod="\$(LD) ${brltty_mkmod_ld_make} ${brltty_mkmod_ld_options} -o"
  20. fi])
  21. @@ -414,7 +414,7 @@
  22. case "${host_os}"
  23. in
  24. linux*|gnu*|openbsd*|freebsd*|kfreebsd*|netbsd*|*qnx*|elf*)
  25. - brltty_mklib_ld_make="-shared"
  26. + brltty_mklib_ld_make="-shared ${LDFLAGS}"
  27. brltty_mklib_ld_options="-soname"
  28. ;;
  29. solaris*)
  30. @@ -449,7 +449,7 @@
  31. esac
  32. if test "${GCC}" = "yes"
  33. then
  34. - brltty_cv_prog_mklib="\$(CC) ${brltty_mklib_gcc_make=-shared} BRLTTY_OPTIONS_LD2CC([${brltty_mklib_ld_options+${brltty_mklib_ld_options} <name>}]) -o"
  35. + brltty_cv_prog_mklib="\$(CC) ${brltty_mklib_gcc_make=-shared} ${LDFLAGS} BRLTTY_OPTIONS_LD2CC([${brltty_mklib_ld_options+${brltty_mklib_ld_options} <name>}]) -o"
  36. else
  37. brltty_cv_prog_mklib="\$(LD) ${brltty_mklib_ld_make} ${brltty_mklib_ld_options+${brltty_mklib_ld_options} <name>} -o"
  38. fi])
  39. --- a/Bindings/OCaml/Makefile.in
  40. +++ b/Bindings/OCaml/Makefile.in
  41. @@ -55,13 +55,13 @@
  42. all : $(OCAML_FILES)
  43. $(OCAML_CLIBS) : brlapi_stubs.$O brlapi
  44. - $(OCAMLMKLIB) $(API_LDFLAGS) -oc $(OCAML_LIB)_stubs brlapi_stubs.$O
  45. + $(OCAMLMKLIB) -ldopt "$(LDFLAGS)" $(API_LDFLAGS) -oc $(OCAML_LIB)_stubs brlapi_stubs.$O
  46. $(OCAML_BCLIB) : $(OCAML_CLIBS) brlapi.cmo
  47. $(OCAMLC) -a $(OCAMLMKLIB_FLAGS) -o $(OCAML_LIB).cma brlapi.cmo
  48. $(OCAML_NCLIB) : $(OCAML_CLIBS) brlapi.cmx
  49. - $(OCAMLMKLIB) $(OCAMLMKLIBOPT_FLAGS) -o $(OCAML_LIB) brlapi.cmx
  50. + $(OCAMLMKLIB) -ldopt "$(LDFLAGS)" $(OCAMLMKLIBOPT_FLAGS) -o $(OCAML_LIB) brlapi.cmx
  51. brlapi.cmi: brlapi.mli
  52. $(OCAMLC) -o $@ -c brlapi.mli