ports

morpheus ports
git clone git://git.2f30.org/ports.git
Log | Files | Refs | LICENSE

commit d8411e9a905eef73d6c1dbc332c47cf96c1bb7cf
parent 13824d00d763abcf111c1c7a64b366cee1dd39e4
Author: Hiltjo Posthuma <hiltjo@codemadness.org>
Date:   Sat May 17 19:14:00 +0200

fix curl + patch

disable manual and explicitly set zlib libdir.

Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>

Diffstat:
curl/curl-fix-hugehelp.patch | 14++++++++++++++
curl/curl.mk | 18++++++++++++++----
2 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/curl/curl-fix-hugehelp.patch b/curl/curl-fix-hugehelp.patch @@ -0,0 +1,14 @@ +--- src/tool_operate.old 2014-05-17 18:57:51.464665892 +0200 ++++ src/tool_operate.c 2014-05-17 18:58:16.687664860 +0200 +@@ -1793,9 +1793,11 @@ + /* Check if we were asked for the help */ + if(res == PARAM_HELP_REQUESTED) + tool_help(); ++#ifdef USE_MANUAL + /* Check if we were asked for the manual */ + else if(res == PARAM_MANUAL_REQUESTED) + hugehelp(); ++#endif + /* Check if we were asked for the version information */ + else if(res == PARAM_VERSION_INFO_REQUESTED) + tool_version_info(); diff --git a/curl/curl.mk b/curl/curl.mk @@ -1,3 +1,5 @@ +# make deps: perl +# src/tool_hugehelp.c is automatically generated by the mkhelp.pl perl script TARG = curl DEPS = zlib openssl cares INSTALL_BIN = src/curl @@ -8,12 +10,20 @@ INSTALL_MAN1 = \ <$mkbuild/mk.common curl:QV: + # fix: hugehelp is not defined because we use --disable-manual. + # in src/tool_operate.c this is used though, so it's a bug. + patch -p0 < ../curl-fix-hugehelp.patch + # export CFLAGS="$CFLAGS $DEPS_CFLAGS" export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" - CC="$CC -static" ./configure --prefix="" \ - --bindir="$BINDIR" --sbindir="$BINDIR" --libexecdir="$BINDIR" \ - --mandir="/share/man" \ + CC="$CC -static" ./configure \ + --prefix="" \ + --bindir="$BINDIR" \ + --sbindir="$BINDIR" \ + --libexecdir="$BINDIR" \ + --mandir="$prefix/share/man" \ --disable-shared \ + --disable-manual \ --disable-ntlm-wb \ --disable-pop3 \ --disable-imap \ @@ -26,7 +36,7 @@ curl:QV: --without-libssh2 \ --with-ssl=${openssl_libdir} \ --enable-cares=${cares_libdir} \ - --with-zlib \ + --with-zlib=${zlib_libdir} \ --enable-static \ --enable-ipv6 make -j$nprocs