On 21/04/2017 15:18, Daniel Stenberg wrote:
> On Fri, 21 Apr 2017, Michael Felt wrote:
>
>> p.s. - Once upon a time I cloned curl (at least I think I did) - what
>> is the correct way to update that, ideally via the command line
>> (question may also be ignored as it is a git thing, not curl).
>
> You can find many guides for this on the web, and the github version
> is here: https://help.github.com/articles/syncing-a-fork/
>
> I'll however offer you a simplified version, especially if you don't
> have any local changes of your own in the cloned master branch (which
> I think is a good habit anyway, do your changes in new branches instead):
>
> $ cd root/of/clone/directory
> $ git pull --rebase
>
> (in my case I have an alias for pull --rebase called "up" so I just
> run "git up" to get my local master in sync with the remote master)
>
> It actually even works *with* local changes but will then rebase them
> for you, which you might want to be a bit careful with.
>
Thanks - I have heard of rebase. And I had not (yet) made a fork, so I
could use the web interface to let it make a fork for me.

What follows is: about 'after that'

++++++

Forked curl

cloned to curl-master

cp -rp curl-master curl-1432

cd curl-1432

./buildconf

mkdir ../oot
cd ../oot
../curl-1432/configure
...
configure: Configured to build curl/libcurl:

   curl version: 7.54.1-DEV
   Host setup: powerpc-ibm-aix6.1.9.0
   Install prefix: /usr/local
   Compiler: cc -qlanglvl=extc89
   SSL support: enabled (OpenSSL)
   SSH support: no (--with-libssh2)
   zlib support: enabled
   GSS-API support: no (--with-gssapi)
   TLS-SRP support: enabled
   resolver: default (--enable-ares / --enable-threaded-resolver)
   IPv6 support: enabled
   Unix sockets support: enabled
   IDN support: no (--with-{libidn2,winidn})
   Build libcurl: Shared=yes, Static=no
   Built-in manual: enabled
   --libcurl option: enabled (--disable-libcurl-option)
   Verbose errors: enabled (--disable-verbose)
   SSPI support: no (--enable-sspi)
   ca cert bundle: no
   ca cert path: no
   ca fallback: no
   LDAP support: no (--enable-ldap / --with-ldap-lib /
--with-lber-lib)
   LDAPS support: no (--enable-ldaps)
   RTSP support: enabled
   RTMP support: no (--with-librtmp)
   metalink support: no (--with-libmetalink)
   PSL support: no (libpsl not found)
   HTTP2 support: disabled (--with-nghttp2)
   Protocols: DICT FILE FTP FTPS GOPHER HTTP HTTPS IMAP IMAPS
POP3 POP3S RTSP SMB SMBS SMTP SMTPS TELNET TFTP

michael_at_x071.home.local:[/data/prj/aixtools/github/oot]find .. -name curl.1
michael_at_x071.home.local:[/data/prj/aixtools/github/oot]

reminder: curl-master - is the fork, curl-1432 is a copy of curl-master,
oot == out of tree

michael_at_x071.home.local:[/data/prj/aixtools/github/oot]ls ..
curl-1432 curl-master oot

I tried "make dist" - this 'stopped' at:

make[2]: Entering directory `/data/prj/aixtools/github/oot/tests'
roffit ../../curl-1432/tests/testcurl.1 >testcurl.html
/bin/sh: roffit: not found.
make[2]: *** [testcurl.html] Error 127
make[2]: Leaving directory `/data/prj/aixtools/github/oot/tests'
make[1]: *** [distdir] Error 1
make[1]: Leaving directory `/data/prj/aixtools/github/oot'
make: *** [dist] Error 2
michael_at_x071.home.local:[/data/prj/aixtools/github/oot]

However, I now have curl.1

michael_at_x071.home.local:[/data/prj/aixtools/github/oot]find .. -name curl.1
../oot/curl--/docs/curl.1
../oot/docs/curl.1

remove all, and try again cleanly in oot

michael_at_x071.home.local:[/data/prj/aixtools/github/oot]rm -rf *

and run configure again...

michael_at_x071.home.local:[/data/prj/aixtools/github/oot]../curl-1432/configure

same as above

make ...

completes normally.

And curl.1 is in the build aka oot directory-tree.

michael_at_x071.home.local:[/data/prj/aixtools/github/oot]find .. -name curl.1
../oot/docs/curl.1

Just to be sure:

I tried running "make dist" again, and again it stops at 'roffit not found'

make[2]: Leaving directory `/data/prj/aixtools/github/oot/include'
  (cd tests && make top_distdir=../curl-- distdir=../curl--/tests \
      am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=:
distdir)
make[2]: Entering directory `/data/prj/aixtools/github/oot/tests'
roffit ../../curl-1432/tests/testcurl.1 >testcurl.html
/bin/sh: roffit: not found.
make[2]: *** [testcurl.html] Error 127
make[2]: Leaving directory `/data/prj/aixtools/github/oot/tests'
make[1]: *** [distdir] Error 1
make[1]: Leaving directory `/data/prj/aixtools/github/oot'
make: *** [dist] Error 2
michael_at_x071.home.local:[/data/prj/aixtools/github/oot]

michael_at_x071.home.local:[/data/prj/aixtools/github/oot]find .. -name curl.1
../oot/curl--/docs/curl.1
../oot/docs/curl.1

Hope this helps!

-------------------------------------------------------------------
Unsubscribe: https://cool.haxx.se/list/listinfo/curl-library
Etiquette: https://curl.haxx.se/mail/etiquette.html
Received on 2017-04-21