From: Jeffrey Walton <noloader@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: sed: command garbled: rGIT-PERL-HEADER
Date: Wed, 18 Jul 2018 15:12:25 -0400 [thread overview]
Message-ID: <CAH8yC8=SfFAUhvqPp0f6wgr7yfAKpmNfT3Z61V4QfUVqUUnBYw@mail.gmail.com> (raw)
In-Reply-To: <CAH8yC8nRE7+faKbmvM2bHWPE4hzvhL4RF4i5Gxt4mhseDEzdnQ@mail.gmail.com>
On Wed, Jul 18, 2018 at 2:47 PM, Jeffrey Walton <noloader@gmail.com> wrote:
> On Wed, Jul 18, 2018 at 1:49 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> Jeffrey Walton <noloader@gmail.com> writes:
>> ...
>> diff --git a/Makefile b/Makefile
>> index 2ba24035f5..50138e85eb 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -2086,7 +2086,7 @@ $(SCRIPT_PERL_GEN): % : %.perl GIT-PERL-DEFINES GIT-PERL-HEADER GIT-VERSION-FILE
>> $(QUIET_GEN)$(RM) $@ $@+ && \
>> sed -e '1{' \
>> -e ' s|#!.*perl|#!$(PERL_PATH_SQ)|' \
>> - -e ' rGIT-PERL-HEADER' \
>> + -e ' r GIT-PERL-HEADER' \
>> -e ' G' \
>> -e '}' \
>> -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
>
> Thanks, that tested good.
>
> Here's another one for FreeBSD 11 x86_64. LDLIBS includes -pthread.
>
> $ cat ~/git-freebsd.txt
> LINK git-credential-store
> /usr/local/bin/ld: libgit.a(name-hash.o): undefined reference to
> symbol 'pthread_create@@FBSD_1.0'
> //lib/libthr.so.3: error adding symbols: DSO missing from command line
> collect2: error: ld returned 1 exit status
> gmake: *** [Makefile:2329: git-credential-store] Error 1
I was able to clear this one with sed (trailing space is important):
sed -e 's|$(LIB_FILE) |$(LIB_FILE) -lpthread |g' "$file.orig"
But I don't know how to fix the missing recipe:
$ gmake
gmake: *** No rule to make target 'git-daemon', needed by 'all'. Stop.
Jeff
prev parent reply other threads:[~2018-07-18 19:12 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-18 11:53 sed: command garbled: rGIT-PERL-HEADER Jeffrey Walton
2018-07-18 17:49 ` Junio C Hamano
2018-07-18 18:47 ` Jeffrey Walton
2018-07-18 19:12 ` Jeffrey Walton [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAH8yC8=SfFAUhvqPp0f6wgr7yfAKpmNfT3Z61V4QfUVqUUnBYw@mail.gmail.com' \
--to=noloader@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).