rpms/brltty
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Switched to upstream patch adding LDFLAGS to more libraries

Browse Source 
Related: rhbz#1543490
This commit is contained in:
Jaroslav Škarvada 2018-05-22 17:39:57 +02:00
parent e338b007cb
commit 1b08bec412
3 changed files with 44 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
brltty-5.6-libs-add-ldflags-more.patch
View File

@ -1,59 +0,0 @@
diff --git a/Bindings/Java/Makefile.in b/Bindings/Java/Makefile.in
index b0a6e1c..5982742 100644
--- a/Bindings/Java/Makefile.in
+++ b/Bindings/Java/Makefile.in
@@ -52,7 +52,7 @@ JAVA_JNI_FILE = $(LIB_PFX)$(API_NAME)_java.$(LIB_EXT)
jni: $(JAVA_JNI_FILE)
$(JAVA_JNI_FILE): bindings.$O $(API_NAME)
- $(MKLIB:<name>=$(API_NAME)) $@ bindings.$O $(API_LDFLAGS)
+ $(MKLIB:<name>=$(API_NAME)) $@ bindings.$O $(API_LDFLAGS) $(LDFLAGS)
bindings.$O:
$(CC) $(LIBCFLAGS) $(JAVA_JNI_FLAGS) -o $@ -c $(SRC_DIR)/bindings.c
diff --git a/Bindings/OCaml/Makefile.in b/Bindings/OCaml/Makefile.in
index 47f7201..469f41e 100644
--- a/Bindings/OCaml/Makefile.in
+++ b/Bindings/OCaml/Makefile.in
@@ -55,13 +55,13 @@ OCAML_FILES = $(OCAML_MISC) $(OCAML_CLIBS) $(OCAML_BCLIB) $(OCAML_NCLIB)
all : $(OCAML_FILES)
$(OCAML_CLIBS) : brlapi_stubs.$O brlapi
- $(OCAMLMKLIB) $(API_LDFLAGS) -oc $(OCAML_LIB)_stubs brlapi_stubs.$O
+ $(OCAMLMKLIB) -ldopt "$(LDFLAGS)" $(API_LDFLAGS) -oc $(OCAML_LIB)_stubs brlapi_stubs.$O
$(OCAML_BCLIB) : $(OCAML_CLIBS) brlapi.cmo
$(OCAMLC) -a $(OCAMLMKLIB_FLAGS) -o $(OCAML_LIB).cma brlapi.cmo
$(OCAML_NCLIB) : $(OCAML_CLIBS) brlapi.cmx
- $(OCAMLMKLIB) $(OCAMLMKLIBOPT_FLAGS) -o $(OCAML_LIB) brlapi.cmx
+ $(OCAMLMKLIB) -ldopt "$(LDFLAGS)" $(OCAMLMKLIBOPT_FLAGS) -o $(OCAML_LIB) brlapi.cmx
brlapi.cmi: brlapi.mli
$(OCAMLC) -o $@ -c brlapi.mli
diff --git a/Bindings/Tcl/Makefile.in b/Bindings/Tcl/Makefile.in
index 683e74e..ceae16f 100644
--- a/Bindings/Tcl/Makefile.in
+++ b/Bindings/Tcl/Makefile.in
@@ -30,7 +30,7 @@ TCL_API = $(LIB_PFX)$(API_NAME)_tcl.$(LIB_EXT)
all: $(TCL_API)
$(TCL_API): bindings.$O $(API_NAME)
- $(MKLIB:<name>=$(API_NAME)) $@ bindings.$O $(TCL_LIBS) $(API_LDFLAGS)
+ $(MKLIB:<name>=$(API_NAME)) $@ bindings.$O $(TCL_LIBS) $(API_LDFLAGS) $(LDFLAGS)
bindings.$O:
$(CC) $(TCL_CPPFLAGS) $(LIBCFLAGS) -o $@ -c $(SRC_DIR)/bindings.c
diff --git a/Programs/Makefile.in b/Programs/Makefile.in
index 0016035..5297a8b 100644
--- a/Programs/Makefile.in
+++ b/Programs/Makefile.in
@@ -613,7 +613,7 @@ $(API_LIB_VERSIONED): $(API_LIB)
api-dynamic-library: $(API_LIB)
$(API_LIB): $(API_CLIENT_OBJECTS)
- $(MKLIB:<name>=${API_LIB_VERSIONED}) $@ $(API_CLIENT_OBJECTS) $(API_LIBRARIES)
+ $(MKLIB:<name>=${API_LIB_VERSIONED}) $@ $(API_CLIENT_OBJECTS) $(API_LIBRARIES) $(LDFLAGS)
api-dynamic-library-windows: $(API_DLL)
$(API_DLL): $(API_CLIENT_OBJECTS)

36
brltty-5.6-libs-add-ldflags2.patch Normal file
View File

@ -0,0 +1,36 @@
diff --git a/Bindings/OCaml/Makefile.in b/Bindings/OCaml/Makefile.in
index 47f7201..469f41e 100644
--- a/Bindings/OCaml/Makefile.in
+++ b/Bindings/OCaml/Makefile.in
@@ -55,13 +55,13 @@ OCAML_FILES = $(OCAML_MISC) $(OCAML_CLIBS) $(OCAML_BCLIB) $(OCAML_NCLIB)
all : $(OCAML_FILES)
$(OCAML_CLIBS) : brlapi_stubs.$O brlapi
- $(OCAMLMKLIB) $(API_LDFLAGS) -oc $(OCAML_LIB)_stubs brlapi_stubs.$O
+ $(OCAMLMKLIB) -ldopt "$(LDFLAGS)" $(API_LDFLAGS) -oc $(OCAML_LIB)_stubs brlapi_stubs.$O
$(OCAML_BCLIB) : $(OCAML_CLIBS) brlapi.cmo
$(OCAMLC) -a $(OCAMLMKLIB_FLAGS) -o $(OCAML_LIB).cma brlapi.cmo
$(OCAML_NCLIB) : $(OCAML_CLIBS) brlapi.cmx
- $(OCAMLMKLIB) $(OCAMLMKLIBOPT_FLAGS) -o $(OCAML_LIB) brlapi.cmx
+ $(OCAMLMKLIB) -ldopt "$(LDFLAGS)" $(OCAMLMKLIBOPT_FLAGS) -o $(OCAML_LIB) brlapi.cmx
brlapi.cmi: brlapi.mli
$(OCAMLC) -o $@ -c brlapi.mli
diff --git a/configure.ac b/configure.ac
index daed454..8938c6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -544,9 +544,9 @@ in
esac
if test "${GCC}" = "yes"
then
- brltty_cv_prog_mklib="\$(CC) ${brltty_mklib_gcc_make=-shared} BRLTTY_OPTIONS_LD2CC([${brltty_mklib_ld_options+${brltty_mklib_ld_options} <name>}]) -o"
+ brltty_cv_prog_mklib="\$(CC) \$(LDFLAGS) ${brltty_mklib_gcc_make=-shared} BRLTTY_OPTIONS_LD2CC([${brltty_mklib_ld_options+${brltty_mklib_ld_options} <name>}]) -o"
else
- brltty_cv_prog_mklib="\$(LD) ${brltty_mklib_ld_make} ${brltty_mklib_ld_options+${brltty_mklib_ld_options} <name>} -o"
+ brltty_cv_prog_mklib="\$(LD) \$(LDFLAGS) ${brltty_mklib_ld_make} ${brltty_mklib_ld_options+${brltty_mklib_ld_options} <name>} -o"
fi])
AC_SUBST([MKLIB], ["${brltty_cv_prog_mklib}"])

11
brltty.spec
View File

@ -33,7 +33,7 @@
Name: brltty
Version: %{pkg_version}
Release: 11%{?dist}
Release: 12%{?dist}
License: LGPLv2+
URL: http://mielke.cc/brltty/
Source0: http://mielke.cc/brltty/archive/%{name}-%{version}.tar.xz
@ -45,7 +45,8 @@ Patch2: brltty-5.0-libspeechd.patch
Patch3: 0001-Add-support-for-eSpeak-NG.patch
# https://github.com/brltty/brltty/commit/bc609b45ee5b44247d528e9462cb28792753a267
Patch4: brltty-5.6-libs-add-ldflags.patch
Patch5: brltty-5.6-libs-add-ldflags-more.patch
# https://github.com/brltty/brltty/commit/03110db3ca9110d6fb2f7056d62fc07418c4024e
Patch5: brltty-5.6-libs-add-ldflags2.patch
Summary: Braille display driver for Linux/Unix
BuildRequires: byacc, glibc-kernheaders, bluez-libs-devel, systemd
BuildRequires: gettext, at-spi2-core-devel
@ -230,7 +231,7 @@ pushd python2
%patch2 -p1 -b .libspeechd
%patch3 -p1 -b .espeak-ng
%patch4 -p1 -b .libs-add-ldflags
%patch5 -p1 -b .5.6-libs-add-ldflags-more
%patch5 -p1 -b .libs-add-ldflags2
# remove packaged binary file
rm -f Programs/brltty-ktb
@ -513,6 +514,10 @@ fi
%endif
%changelog
* Tue May 22 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 5.6-12
- Switched to upstream patch adding LDFLAGS to more libraries
Related: rhbz#1543490
* Mon May 21 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 5.6-11
- Added LDFLAGS to more libraries
Related: rhbz#1543490