diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2016-02-15 14:24:51 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2016-02-15 14:24:51 +0000 |
| commit | b2afa563c55bbab9fde0d13f02313925c4bccbe7 (patch) | |
| tree | 61e763b6610f8f87b425f71282346a2d8f57f8df /www/nghttp2/files | |
| parent | security/letsencrypt.sh: Fix periodic script (diff) | |
www/nghttp2: Update to version 1.7.1
- Convert MASTER_SITES to USE_GITHUB
- Remove USES=tar:xz
- Remove unneeded RUN_DEPENDS
- Add USES=autoreconf
- Fix pkgconfig path
- Remove defunct configure jemalloc fix
- Fix LDFLAGS -ldl problem
Reviewed by: koobs (mentor), feld (mentor)
Approved by: feld (mentor)
Differential Revision: D5218
MFH: 2016Q1
Notes
Notes:
svn path=/head/; revision=408929
Diffstat (limited to 'www/nghttp2/files')
| -rw-r--r-- | www/nghttp2/files/patch-configure.ac | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/www/nghttp2/files/patch-configure.ac b/www/nghttp2/files/patch-configure.ac new file mode 100644 index 000000000000..94e17924b1d2 --- /dev/null +++ b/www/nghttp2/files/patch-configure.ac @@ -0,0 +1,35 @@ +From e4b2847d3135a024c740d25f9e11da7ff0bf0fd6 Mon Sep 17 00:00:00 2001 +From: Bernard Spil <Sp1l@users.noreply.github.com> +Date: Sat, 6 Feb 2016 14:36:27 +0100 +Subject: [PATCH] Don't check for dlopen/libdl on *BSD + +This makes linking fail on -ldl as there is no libdl on in /usr/lib or /usr/local/lib on *BSD +Tested (and part of the proposed nghttp2 1.7.0) on [https://reviews.freebsd.org/D5218|FreeBSD] +--- + configure.ac | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 09a2538..4a4defe 100644 +--- configure.ac.orig ++++ configure.ac +@@ -256,9 +256,16 @@ if test "x${have_zlib}" = "xno"; then + fi + + # dl: openssl requires libdl when it is statically linked. +-LIBS_OLD=$LIBS +-AC_SEARCH_LIBS([dlopen], [dl], [APPLDFLAGS="-ldl $APPLDFLAGS"], [], []) +-LIBS=$LIBS_OLD ++case "${host_os}" in ++ *bsd*) ++ # dlopen is in libc on *BSD ++ ;; ++ *) ++ save_LIBS=$LIBS ++ AC_SEARCH_LIBS([dlopen], [dl], [APPLDFLAGS="-ldl $APPLDFLAGS"], [], []) ++ LIBS=$save_LIBS ++ ;; ++esac + + # cunit + PKG_CHECK_MODULES([CUNIT], [cunit >= 2.1], [have_cunit=yes], [have_cunit=no]) |