Module: wine Branch: master Commit: 4e8cb6170f6582dc18e5df88c480aea55abf20fa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4e8cb6170f6582dc18e5df88...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Aug 16 13:25:08 2006 +0200
configure: Setting rpath should no longer be needed for dlls.
---
configure | 6 +----- configure.ac | 1 - dlls/Makedll.rules.in | 3 +-- programs/Makeprog.rules.in | 3 +-- 4 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/configure b/configure index c2e0a9c..92e8a71 100755 --- a/configure +++ b/configure @@ -745,7 +745,6 @@ IOKITLIB LDEXECFLAGS COREAUDIO LDEXERPATH -LDDLLRPATH CROSSTEST CROSSCC CROSSWINDRES @@ -15894,8 +15893,6 @@ echo "${ECHO_T}$ac_cv_ld_rpath" >&6; } then LDEXERPATH="-Wl,--rpath,\$$ORIGIN/`$(RELPATH) $(bindir) $(libdir)`"
- LDDLLRPATH="-Wl,--rpath,\$$ORIGIN/`$(RELPATH) $(dlldir) $(libdir)`" - fi
case $host_cpu in @@ -25028,7 +25025,6 @@ IOKITLIB!$IOKITLIB$ac_delim LDEXECFLAGS!$LDEXECFLAGS$ac_delim COREAUDIO!$COREAUDIO$ac_delim LDEXERPATH!$LDEXERPATH$ac_delim -LDDLLRPATH!$LDDLLRPATH$ac_delim CROSSTEST!$CROSSTEST$ac_delim CROSSCC!$CROSSCC$ac_delim CROSSWINDRES!$CROSSWINDRES$ac_delim @@ -25044,7 +25040,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF
- if test `sed -n "s/.*$ac_delim$/X/p" conf$$subs.sed | grep -c X` = 77; then + if test `sed -n "s/.*$ac_delim$/X/p" conf$$subs.sed | grep -c X` = 76; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.ac b/configure.ac index 9c67844..45fe3e0 100644 --- a/configure.ac +++ b/configure.ac @@ -1122,7 +1122,6 @@ case $host_os in if test "$ac_cv_ld_rpath" = "yes" then AC_SUBST(LDEXERPATH,["-Wl,--rpath,\$$ORIGIN/`$(RELPATH) $(bindir) $(libdir)`"]) - AC_SUBST(LDDLLRPATH,["-Wl,--rpath,\$$ORIGIN/`$(RELPATH) $(dlldir) $(libdir)`"]) fi
case $host_cpu in diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 416c63c..5b4f62c 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -12,7 +12,6 @@ # DLLFLAGS = @DLLFLAGS@ DLLEXT = @DLLEXT@ IMPLIBEXT = @IMPLIBEXT@ -LDRPATH = @LDDLLRPATH@ DEFS = -D__WINESRC__ $(EXTRADEFS) BASEMODULE = $(MODULE:%.dll=%) MAINSPEC = $(BASEMODULE).spec @@ -33,7 +32,7 @@ all: $(MODULE)$(DLLEXT) $(SUBDIRS) # Rules for .so files
$(MODULE).so: $(MAINSPEC) $(ALL_OBJS) Makefile.in - $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -shared $(SRCDIR)/$(MAINSPEC) $(ALL_OBJS) $(SUBSYSTEM:%=-Wb,--subsystem,%) $(BASEADDRESS:%=-Wl,--image-base,%) $(LDRPATH) -o $@ $(ALL_IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS) + $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -shared $(SRCDIR)/$(MAINSPEC) $(ALL_OBJS) $(SUBSYSTEM:%=-Wb,--subsystem,%) $(BASEADDRESS:%=-Wl,--image-base,%) -o $@ $(ALL_IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS)
# Rules for .dll files
diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in index 154f6bb..84cdd12 100644 --- a/programs/Makeprog.rules.in +++ b/programs/Makeprog.rules.in @@ -10,7 +10,6 @@ # plus all variables required by the glo #
DLLFLAGS = @DLLFLAGS@ -LDRPATH = @LDDLLRPATH@ DEFS = $(EXTRADEFS) ALL_IMPORTS = $(DELAYIMPORTS) $(IMPORTS) ALL_LIBS = $(ALL_IMPORTS:%=-l%) $(EXTRALIBS) $(LIBPORT) $(LDFLAGS) $(LIBS) @@ -25,7 +24,7 @@ all: $(MODULE)$(DLLEXT) $(BASEMODULE)$(E # Rules for .so main module
$(MODULE).so: $(OBJS) $(RC_SRCS:.rc=.res) Makefile.in - $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(LDRPATH) $(ALL_LIBS) $(DELAYIMPORTS:%=-Wb,-d%) + $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(ALL_LIBS) $(DELAYIMPORTS:%=-Wb,-d%)
$(BASEMODULE): $(WINEWRAPPER) $(RM) $@ && $(LN_S) $(WINEWRAPPER) $@