Module: wine Branch: master Commit: f377591e98c490ca00e6479627832e41b2ad01b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f377591e98c490ca00e6479627...
Author: Ken Thomases ken@codeweavers.com Date: Fri Jan 11 03:25:07 2013 -0600
libwine: Use rpath-based install name and library references for libwine on Mac.
---
configure | 3 ++- configure.ac | 3 ++- libs/wine/Makefile.in | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/configure b/configure index 7a4b086..8394dea 100755 --- a/configure +++ b/configure @@ -6657,7 +6657,8 @@ fi LDDLLFLAGS="-bundle -multiply_defined suppress" LIBWINE_LDFLAGS="-multiply_defined suppress" LDSHARED="$(CC) -dynamiclib" - LDRPATH_LOCAL="&& install_name_tool -change @executable_path/`$(RELPATH) $(bindir) $(libdir)`/libwine.1.dylib @executable_path/$(top_builddir)/libs/wine/libwine.1.dylib $@ || $(RM) $@" + LDRPATH_INSTALL="-Wl,-rpath,@loader_path/`$(RELPATH) $(bindir) $(libdir)`" + LDRPATH_LOCAL="-Wl,-rpath,@loader_path/$(top_builddir)/libs/wine" COREFOUNDATIONLIB="-framework CoreFoundation"
IOKITLIB="-framework IOKit -framework CoreFoundation" diff --git a/configure.ac b/configure.ac index a9fa02d..78d4f4b 100644 --- a/configure.ac +++ b/configure.ac @@ -723,7 +723,8 @@ case $host_os in LDDLLFLAGS="-bundle -multiply_defined suppress" LIBWINE_LDFLAGS="-multiply_defined suppress" LDSHARED="$(CC) -dynamiclib" - LDRPATH_LOCAL="&& install_name_tool -change @executable_path/`$(RELPATH) $(bindir) $(libdir)`/libwine.1.dylib @executable_path/$(top_builddir)/libs/wine/libwine.1.dylib $@ || $(RM) $@" + LDRPATH_INSTALL="-Wl,-rpath,@loader_path/`$(RELPATH) $(bindir) $(libdir)`" + LDRPATH_LOCAL="-Wl,-rpath,@loader_path/$(top_builddir)/libs/wine" dnl declare needed frameworks AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation") AC_SUBST(IOKITLIB,"-framework IOKit -framework CoreFoundation") diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index a86e73b..b8c713a 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -128,13 +128,13 @@ libwine.a: wine.def libwine.dll: $(OBJS) wine.def Makefile.in $(DLLWRAP) --def $(srcdir)/wine.def -o $@ $(OBJS) $(EXTRALIBS)
-DYLIB_LDFLAGS = -compatibility_version $(SOVERSION) -current_version $(VERSION) -Wl,-headerpad_max_install_names +DYLIB_LDFLAGS = -compatibility_version $(SOVERSION) -current_version $(VERSION)
libwine.$(VERSION).dylib: $(OBJS) $(RELPATH) Makefile.in - $(LDSHARED) -install_name $(libdir)/$(DYNAME) $(DYLIB_LDFLAGS) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@ + $(LDSHARED) -install_name @rpath/$(DYNAME) $(DYLIB_LDFLAGS) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@
libwine.$(SOVERSION).dylib: libwine.$(VERSION).dylib - cp -p libwine.$(VERSION).dylib $@ && install_name_tool -id @executable_path/`$(RELPATH) $(bindir) $(libdir)`/$(DYNAME) $@ || $(RM) $@ + $(RM) $@ && $(LN_S) libwine.$(VERSION).dylib $@
libwine.dylib: libwine.$(SOVERSION).dylib $(RM) $@ && $(LN_S) libwine.$(SOVERSION).dylib $@