diff options
| -rw-r--r-- | patches/curl-7.51.0.local.patch | 41 | ||||
| -rw-r--r-- | vars/build.vars | 9 |
2 files changed, 4 insertions, 46 deletions
diff --git a/patches/curl-7.51.0.local.patch b/patches/curl-7.51.0.local.patch deleted file mode 100644 index 4c9cacf6..00000000 --- a/patches/curl-7.51.0.local.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- curl-7.51.0/configure.orig 2016-10-31 10:41:43.000000000 +0100 -+++ curl-7.51.0/configure 2016-12-14 19:53:31.265092100 +0100 -@@ -14831,6 +14831,18 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+midipix*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}" -+ soname_spec="\${libname}\${release}\${shared_ext}\$major" -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=no -+ dynamic_linker='GNU/Linux ld.so' -+ ;; -+ - netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no ---- curl-7.51.0/lib/Makefile.in.orig 2016-10-31 10:41:45.000000000 +0100 -+++ curl-7.51.0/lib/Makefile.in 2016-12-14 19:54:05.594475300 +0100 -@@ -249,7 +249,7 @@ - am__v_lt_1 = - libcurl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libcurl_la_CFLAGS) \ -- $(CFLAGS) $(libcurl_la_LDFLAGS) $(LDFLAGS) -o $@ -+ $(CFLAGS) $(LDFLAGS) -o $@ - libcurlu_la_LIBADD = - am__objects_7 = libcurlu_la-file.lo libcurlu_la-timeval.lo \ - libcurlu_la-base64.lo libcurlu_la-hostip.lo \ -@@ -889,7 +889,7 @@ - vtls/$(DEPDIR)/$(am__dirstamp) - - libcurl.la: $(libcurl_la_OBJECTS) $(libcurl_la_DEPENDENCIES) $(EXTRA_libcurl_la_DEPENDENCIES) -- $(AM_V_CCLD)$(libcurl_la_LINK) -rpath $(libdir) $(libcurl_la_OBJECTS) $(libcurl_la_LIBADD) $(LIBS) -+ $(AM_V_CCLD)$(libcurl_la_LINK) -rpath $(libdir) $(libcurl_la_OBJECTS) $(libcurl_la_LIBADD) $(LIBS) $(libcurl_la_LDFLAGS) - vauth/libcurlu_la-vauth.lo: vauth/$(am__dirstamp) \ - vauth/$(DEPDIR)/$(am__dirstamp) - vauth/libcurlu_la-cleartext.lo: vauth/$(am__dirstamp) \ diff --git a/vars/build.vars b/vars/build.vars index 73dc66ca..ae96b76f 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -371,11 +371,10 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python"; : ${PKG_BZIP2_INSTALL_FILES:="@bzdiff=bin/bzcmp @bzgrep=bin/bzegrep @bzgrep=bin/bzfgrep @bzmore=bin/bzless ../bzip2-${PKG_BZIP2_VERSION}/libbz2.so.1.0=lib/ ../bzip2-${PKG_BZIP2_VERSION}/libbz2.so.1.0.6=lib/"}; : ${PKG_BZIP2_MAKEFLAGS_BUILD_EXTRA:=-f Makefile-libbz2_so}; : ${PKG_BZIP2_MAKE_INSTALL_VNAME:=PREFIX}; -: ${PKG_CURL_SHA256SUM:=7f8240048907e5030f67be0a6129bc4b333783b9cca1391026d700835a788dde}; -: ${PKG_CURL_VERSION:=7.51.0}; -: ${PKG_CURL_URL:=https://curl.haxx.se/download/curl-${PKG_CURL_VERSION}.tar.bz2}; -: ${PKG_CURL_CONFIGURE_ARGS_EXTRA:=--with-ssl}; -: ${PKG_CURL_LDFLAGS_BUILD_EXTRA:=-L${PREFIX_NATIVE}/lib}; +: ${PKG_CURL_SHA256SUM:=f5f6fd3c72b7b8389969f4fb671ed8532fa9b5bb7a5cae7ca89bc1cea45c7878}; +: ${PKG_CURL_VERSION:=7.57.0}; +: ${PKG_CURL_URL:=https://curl.haxx.se/download/curl-${PKG_CURL_VERSION}.tar.xz}; +: ${PKG_CURL_CONFIGURE_ARGS_EXTRA:="--enable-shared --with-ssl=${PREFIX_NATIVE} --disable-symbol-hiding"}; : ${PKG_LIBZ_SHA256SUM:=abcc2831b7a0e891d0875fa852e9b9510b420d843d3d20aad010f65493fe4f7b}; : ${PKG_LIBZ_VERSION:=1.2.8.2015.12.26}; : ${PKG_LIBZ_URL:=https://sortix.org/libz/release/libz-${PKG_LIBZ_VERSION}.tar.gz}; |