anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add -headerpad_max_install_names option to linker calls and make run path configuration consistent.

Browse Source 
This avoids failures when running install_name_tool on Mac when creating relocatable binaries using the bundled private frameworks.

(cherry picked from commit d9c0807227)
This commit is contained in:
Stephan Witt 2018-09-21 21:46:47 +02:00
parent ebd4e25588
commit b090327dec
5 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile.am
View File

@ -48,7 +48,8 @@ endif
if INSTALL_MACOSX
lyx_LDFLAGS = -framework AppKit -framework ApplicationServices \
-Wl,-rpath,@loader_path/../Frameworks \
-Wl,-rpath,@executable_path/../Frameworks
-Wl,-rpath,@executable_path/../Frameworks \
-Wl,-headerpad_max_install_names
endif
if INSTALL_MACOSX

5
src/client/Makefile.am
View File

@ -17,7 +17,10 @@ lyxclient_LDADD = \
$(QT_LIB) $(QT_LDFLAGS) $(LIBSHLWAPI) $(LIBPSAPI)
if INSTALL_MACOSX
lyxclient_LDFLAGS = -framework AppKit
lyxclient_LDFLAGS = -framework AppKit \
-Wl,-rpath,@loader_path/../Frameworks \
-Wl,-rpath,@executable_path/../Frameworks \
-Wl,-headerpad_max_install_names
endif
SOURCEFILES = \

3
src/convert/Makefile.am
View File

@ -23,7 +23,8 @@ lyxconvert_LDADD = \
lyxconvert_LDFLAGS = -framework AppKit \
-Wl,-rpath,@loader_path/../Frameworks \
-Wl,-rpath,@executable_path/../Frameworks
-Wl,-rpath,@executable_path/../Frameworks \
-Wl,-headerpad_max_install_names
else

6
src/support/Makefile.am
View File

@ -163,7 +163,11 @@ check_PROGRAMS = \
check_trivstring
if INSTALL_MACOSX
ADD_FRAMEWORKS = -framework QtCore -framework AppKit -framework ApplicationServices
ADD_FRAMEWORKS = \
-framework QtCore -framework AppKit -framework ApplicationServices \
-Wl,-rpath,@loader_path/../Frameworks \
-Wl,-rpath,@executable_path/../Frameworks \
-Wl,-headerpad_max_install_names
endif
check_convert_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@

3
src/tex2lyx/Makefile.am
View File

@ -135,7 +135,8 @@ tex2lyx_LDADD = \
if INSTALL_MACOSX
tex2lyx_LDFLAGS = -framework AppKit \
-Wl,-rpath,@loader_path/../Frameworks \
-Wl,-rpath,@executable_path/../Frameworks
-Wl,-rpath,@executable_path/../Frameworks \
-Wl,-headerpad_max_install_names
endif
.PHONY: alltests alltests-recursive updatetests