update to the latest upstream release (1.5.0)
This commit is contained in:
Kamil Dudka
parent
8efb526590
commit
0f11ba8130
|
|
@ -1,75 +0,0 @@
|
|||
From 66f1d9c8232d6c5ae4919c5d59db013de9aee92c Mon Sep 17 00:00:00 2001
|
||||
From: Kamil Dudka <kdudka@redhat.com>
|
||||
Date: Mon, 26 Oct 2015 16:41:17 +0100
|
||||
Subject: [PATCH] configure: do not enable hidden visibility
|
||||
|
||||
... until the upstream test-suite is ready for that
|
||||
|
||||
Bug: https://github.com/tatsuhiro-t/nghttp2/issues/410
|
||||
---
|
||||
configure | 35 -----------------------------------
|
||||
configure.ac | 2 +-
|
||||
2 files changed, 1 insertion(+), 36 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 07fefc6..724c0d0 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -22983,41 +22983,6 @@ CFLAGS=$ac_save_CFLAGS
|
||||
|
||||
|
||||
EXTRACFLAG=
|
||||
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fvisibility=hidden" >&5
|
||||
-$as_echo_n "checking whether C compiler accepts -fvisibility=hidden... " >&6; }
|
||||
-if ${ax_cv_check_cflags___fvisibility_hidden+:} false; then :
|
||||
- $as_echo_n "(cached) " >&6
|
||||
-else
|
||||
-
|
||||
- ax_check_save_flags=$CFLAGS
|
||||
- CFLAGS="$CFLAGS -fvisibility=hidden"
|
||||
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
-/* end confdefs.h. */
|
||||
-
|
||||
-int
|
||||
-main ()
|
||||
-{
|
||||
-
|
||||
- ;
|
||||
- return 0;
|
||||
-}
|
||||
-_ACEOF
|
||||
-if ac_fn_c_try_compile "$LINENO"; then :
|
||||
- ax_cv_check_cflags___fvisibility_hidden=yes
|
||||
-else
|
||||
- ax_cv_check_cflags___fvisibility_hidden=no
|
||||
-fi
|
||||
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
- CFLAGS=$ax_check_save_flags
|
||||
-fi
|
||||
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fvisibility_hidden" >&5
|
||||
-$as_echo "$ax_cv_check_cflags___fvisibility_hidden" >&6; }
|
||||
-if test x"$ax_cv_check_cflags___fvisibility_hidden" = xyes; then :
|
||||
- EXTRACFLAG="-fvisibility=hidden"
|
||||
-else
|
||||
- :
|
||||
-fi
|
||||
-
|
||||
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 59fa5b0..a906b43 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -678,7 +678,7 @@ CFLAGS=$ac_save_CFLAGS
|
||||
AC_SUBST([WARNCFLAGS])
|
||||
|
||||
EXTRACFLAG=
|
||||
-AX_CHECK_COMPILE_FLAG([-fvisibility=hidden], [EXTRACFLAG="-fvisibility=hidden"])
|
||||
+dnl AX_CHECK_COMPILE_FLAG([-fvisibility=hidden], [EXTRACFLAG="-fvisibility=hidden"])
|
||||
|
||||
AC_SUBST([EXTRACFLAG])
|
||||
|
||||
--
|
||||
2.5.2
|
||||
|
||||
14
nghttp2.spec
14
nghttp2.spec
|
|
@ -1,14 +1,12 @@
|
|||
Summary: Experimental HTTP/2 client, server and proxy
|
||||
Name: nghttp2
|
||||
Version: 1.4.0
|
||||
Version: 1.5.0
|
||||
Release: 1%{?dist}
|
||||
License: MIT
|
||||
Group: Applications/Internet
|
||||
URL: https://nghttp2.org/
|
||||
Source0: https://github.com/tatsuhiro-t/nghttp2/releases/download/v%{version}/nghttp2-%{version}.tar.xz
|
||||
|
||||
Patch1: 0001-configure-do-not-enable-hidden-visibility.patch
|
||||
|
||||
BuildRequires: CUnit-devel
|
||||
BuildRequires: libev-devel
|
||||
BuildRequires: openssl-devel
|
||||
|
|
@ -43,11 +41,6 @@ for building applications with libnghttp2.
|
|||
%prep
|
||||
%setup -q
|
||||
|
||||
# Do not enable hidden visibility until the upstream test-suite is ready for
|
||||
# that. See https://github.com/tatsuhiro-t/nghttp2/issues/410 for details.
|
||||
%patch1 -p1
|
||||
touch aclocal.m4 configure {config.h,Makefile}.in
|
||||
|
||||
|
||||
%build
|
||||
%configure \
|
||||
|
|
@ -80,7 +73,7 @@ rm -f "$RPM_BUILD_ROOT%{_datadir}/doc/nghttp2/README.rst"
|
|||
|
||||
%check
|
||||
# test the just built library instead of the system one, without using rpath
|
||||
export "LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}"
|
||||
export "LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}:$LD_LIBRARY_PATH"
|
||||
make %{?_smp_mflags} check
|
||||
|
||||
|
||||
|
|
@ -108,6 +101,9 @@ make %{?_smp_mflags} check
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Nov 26 2015 Kamil Dudka <kdudka@redhat.com> 1.5.0-1
|
||||
- update to the latest upstream release
|
||||
|
||||
* Mon Oct 26 2015 Kamil Dudka <kdudka@redhat.com> 1.4.0-1
|
||||
- update to the latest upstream release
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue