* [PATCH] configure.ac: Add missing comma to CC_LD_DYNPATH @ 2012-10-09 14:26 Øyvind A. Holm 0 siblings, 0 replies; 5+ messages in thread From: Øyvind A. Holm @ 2012-10-09 14:26 UTC (permalink / raw) To: git; +Cc: stefano.lattarini, gitster, Øyvind A. Holm From: "Øyvind A. Holm" <sunny@sunbase.org> 40bfbde ("build: don't duplicate substitution of make variables", 2012-09-11) breaks make by removing a necessary comma at the end of "CC_LD_DYNPATH=-rpath" in line 414. When executing "./configure --with-zlib=PATH", this resulted in [...] CC xdiff/xhistogram.o AR xdiff/lib.a LINK git-credential-store /usr/bin/ld: bad -rpath option collect2: ld returned 1 exit status make: *** [git-credential-store] Error 1 $ during make. Signed-off-by: Øyvind A. Holm <sunny@sunbase.org> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index da1f41f..c85888c 100644 --- a/configure.ac +++ b/configure.ac @@ -411,7 +411,7 @@ else LDFLAGS="${SAVE_LDFLAGS}" ]) if test "$git_cv_ld_wl_rpath" = "yes"; then - CC_LD_DYNPATH=-Wl,-rpath + CC_LD_DYNPATH=-Wl,-rpath, else AC_CACHE_CHECK([if linker supports -rpath], git_cv_ld_rpath, [ SAVE_LDFLAGS="${LDFLAGS}" -- 1.8.0.rc0.18.gf84667d ^ permalink raw reply related [flat|nested] 5+ messages in thread
[parent not found: <1349800026-10717-1-git-send-email-sunny@sunbase.org>]
* [PATCH] configure.ac: Add missing comma to CC_LD_DYNPATH [not found] <1349800026-10717-1-git-send-email-sunny@sunbase.org> @ 2012-10-09 16:36 ` Øyvind A. Holm 2012-10-09 16:40 ` Øyvind A. Holm ` (2 more replies) 0 siblings, 3 replies; 5+ messages in thread From: Øyvind A. Holm @ 2012-10-09 16:36 UTC (permalink / raw) To: git; +Cc: stefano.lattarini, gitster, Øyvind A. Holm From: "Øyvind A. Holm" <sunny@sunbase.org> 40bfbde ("build: don't duplicate substitution of make variables", 2012-09-11) breaks make by removing a necessary comma at the end of "CC_LD_DYNPATH=-rpath" in line 414 and 423. When executing "./configure --with-zlib=PATH", this resulted in [...] CC xdiff/xhistogram.o AR xdiff/lib.a LINK git-credential-store /usr/bin/ld: bad -rpath option collect2: ld returned 1 exit status make: *** [git-credential-store] Error 1 $ during make. Signed-off-by: Øyvind A. Holm <sunny@sunbase.org> --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index da1f41f..ea79ea2 100644 --- a/configure.ac +++ b/configure.ac @@ -411,7 +411,7 @@ else LDFLAGS="${SAVE_LDFLAGS}" ]) if test "$git_cv_ld_wl_rpath" = "yes"; then - CC_LD_DYNPATH=-Wl,-rpath + CC_LD_DYNPATH=-Wl,-rpath, else AC_CACHE_CHECK([if linker supports -rpath], git_cv_ld_rpath, [ SAVE_LDFLAGS="${LDFLAGS}" @@ -420,7 +420,7 @@ else LDFLAGS="${SAVE_LDFLAGS}" ]) if test "$git_cv_ld_rpath" = "yes"; then - CC_LD_DYNPATH=-rpath + CC_LD_DYNPATH=-rpath, else CC_LD_DYNPATH= AC_MSG_WARN([linker does not support runtime path to dynamic libraries]) -- 1.8.0.rc1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] configure.ac: Add missing comma to CC_LD_DYNPATH 2012-10-09 16:36 ` Øyvind A. Holm @ 2012-10-09 16:40 ` Øyvind A. Holm [not found] ` <7v4nm3h8yr.fsf@alter.siamese.dyndns.org> 2012-10-09 21:10 ` Stefano Lattarini 2 siblings, 0 replies; 5+ messages in thread From: Øyvind A. Holm @ 2012-10-09 16:40 UTC (permalink / raw) To: git; +Cc: stefano.lattarini, gitster Please discard the first patch, I reckon line 423 also should be changed. Sorry about the noise, Øyvind ^ permalink raw reply [flat|nested] 5+ messages in thread
[parent not found: <7v4nm3h8yr.fsf@alter.siamese.dyndns.org>]
* Re: [PATCH] configure.ac: Add missing comma to CC_LD_DYNPATH [not found] ` <7v4nm3h8yr.fsf@alter.siamese.dyndns.org> @ 2012-10-09 17:23 ` Øyvind A. Holm 0 siblings, 0 replies; 5+ messages in thread From: Øyvind A. Holm @ 2012-10-09 17:23 UTC (permalink / raw) To: Junio C Hamano; +Cc: git, stefano.lattarini On 9 October 2012 19:05, Junio C Hamano <gitster@pobox.com> wrote: > Øyvind A. Holm <sunny@sunbase.org> writes: > > 40bfbde ("build: don't duplicate substitution of make variables", > > 2012-09-11) breaks make by removing a necessary comma at the end of > > "CC_LD_DYNPATH=-rpath" in line 414 and 423. > > The earlier one is a cut-and-paste-error regression. > > Isn't the one at line 423 from before 40bfbde, though? If that is the > case, I'm a bit hesitant to take that part of this patch without a > second opinion. It looks like it is, yes. More accurately, from 798a945 way back in 2008. If it hasn't caused any trouble since then, it probably won't. :) The line was changed in 40bfbde, though, but AC_SUBST doesn't contain a comma, so to be on the safe side, the first patch should be used. But I made a minor copy+paste error in the commit message of that patch: "CC_LD_DYNPATH=-rpath" in line 414. should be "CC_LD_DYNPATH=-Wl,-rpath" in line 414. Just a minor, but slightly annoying detail. Regards, Øyvind ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] configure.ac: Add missing comma to CC_LD_DYNPATH 2012-10-09 16:36 ` Øyvind A. Holm 2012-10-09 16:40 ` Øyvind A. Holm [not found] ` <7v4nm3h8yr.fsf@alter.siamese.dyndns.org> @ 2012-10-09 21:10 ` Stefano Lattarini 2 siblings, 0 replies; 5+ messages in thread From: Stefano Lattarini @ 2012-10-09 21:10 UTC (permalink / raw) To: "Øyvind A. Holm"; +Cc: git, gitster [Re-sending because I forgot to CC: the list, sorry] On 10/09/2012 06:36 PM, Øyvind A. Holm wrote: > From: "Øyvind A. Holm" <sunny@sunbase.org> > > 40bfbde ("build: don't duplicate substitution of make variables", > 2012-09-11) > Oops, stupid copy and paste error on my part. Sorry. > breaks make by removing a necessary comma at the end of > "CC_LD_DYNPATH=-rpath" in line 414 and 423. > Here, s/-rpath/-Wl,-rpath/, as you've noted yourself in a follow-up message. And the reference to "line 423" should be removed. Also, as a very minor nit, I'd write "might break make" rather then "breaks make", because the breakage depends on which code path is taken at configure time (and that's why I hadn't noticed the error until now -- I never ran configure with the '--with-zlib' option). > When executing "./configure --with-zlib=PATH", this resulted in > > [...] > CC xdiff/xhistogram.o > AR xdiff/lib.a > LINK git-credential-store > /usr/bin/ld: bad -rpath option > collect2: ld returned 1 exit status > make: *** [git-credential-store] Error 1 > $ > > during make. > Indeed, I can reproduce and confirm this error :-( > Signed-off-by: Øyvind A. Holm <sunny@sunbase.org> > --- > configure.ac | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/configure.ac b/configure.ac > index da1f41f..ea79ea2 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -411,7 +411,7 @@ else > LDFLAGS="${SAVE_LDFLAGS}" > ]) > if test "$git_cv_ld_wl_rpath" = "yes"; then > - CC_LD_DYNPATH=-Wl,-rpath > + CC_LD_DYNPATH=-Wl,-rpath, > else > AC_CACHE_CHECK([if linker supports -rpath], git_cv_ld_rpath, [ > SAVE_LDFLAGS="${LDFLAGS}" > @@ -420,7 +420,7 @@ else > LDFLAGS="${SAVE_LDFLAGS}" > ]) > if test "$git_cv_ld_rpath" = "yes"; then > - CC_LD_DYNPATH=-rpath > + CC_LD_DYNPATH=-rpath, > And as Junio noted, this second hunk is unneeded, and in fact wrong. Just remove it please. With that done, Acked-by: Stefano Lattarini <stefano.lattarini@gmail.com> > else > CC_LD_DYNPATH= > AC_MSG_WARN([linker does not support runtime path to dynamic libraries]) Thanks, Stefano ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-10-09 21:11 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2012-10-09 14:26 [PATCH] configure.ac: Add missing comma to CC_LD_DYNPATH Øyvind A. Holm [not found] <1349800026-10717-1-git-send-email-sunny@sunbase.org> 2012-10-09 16:36 ` Øyvind A. Holm 2012-10-09 16:40 ` Øyvind A. Holm [not found] ` <7v4nm3h8yr.fsf@alter.siamese.dyndns.org> 2012-10-09 17:23 ` Øyvind A. Holm 2012-10-09 21:10 ` Stefano Lattarini
Code repositories for project(s) associated with this public inbox https://80x24.org/mirrors/git.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).