Attachment 1477286 Details for Bug 1539077 – use-fedora-flags-patch

[patch] use-fedora-flags-patch

0001-Use-Fedora-standard-build-linker-flags.patch (text/plain), 8.21 KB, created by Rafael Fonseca on 2018-08-20 15:18:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rafael Fonseca

Created: 2018-08-20 15:18:51 UTC

Size: 8.21 KB

patch

obsolete

>From 033eb7e936a0b88873065823bf275ace0aed92e8 Mon Sep 17 00:00:00 2001
>From: Rafael dos Santos <rdossant@redhat.com>
>Date: Mon, 20 Aug 2018 17:16:59 +0200
>Subject: [PATCH] Use Fedora standard build/linker flags
>
>- Resolves #1539077
>
>Signed-off-by: Rafael dos Santos <rdossant@redhat.com>
>---
> thrift.spec            |  10 ++-
> use-fedora-flags.patch | 155 +++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 163 insertions(+), 2 deletions(-)
> create mode 100644 use-fedora-flags.patch
>
>diff --git a/thrift.spec b/thrift.spec
>index 3d0dc8a..9b09f3a 100644
>--- a/thrift.spec
>+++ b/thrift.spec
>@@ -50,7 +50,7 @@
> 
> Name:    thrift
> Version: 0.10.0
>-Release: 15%{?dist}
>+Release: 16%{?dist}
> Summary: Software framework for cross-language services development
> 
> # Parts of the source are used under the BSD and zlib licenses, but
>@@ -84,6 +84,9 @@ Patch4: THRIFT-4177.patch
> # Update fb303 for python3
> Patch5: python3.patch
> 
>+# https://bugzilla.redhat.com/show_bug.cgi?id=1539077
>+Patch6: use-fedora-flags.patch
>+
> Group: Development/Libraries
> 
> # BuildRequires for language-specific bindings are listed under these
>@@ -387,7 +390,7 @@ make %{?_smp_mflags}
>   cd contrib/fb303
>   sed -i '/^[.][/]configure.*/d' bootstrap.sh
>   sh bootstrap.sh
>-  %configure --disable-static --with-java --without-php --with-py3 --libdir=%{_libdir}
>+  %configure --disable-static --with-java --without-php --with-py3 --libdir=%{_libdir} --disable-opt
>   make %{?_smp_mflags}
>   (
>       cd java
>@@ -532,6 +535,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r
> %doc LICENSE NOTICE
> 
> %changelog
>+* Mon Aug 20 2018 Rafael Fonseca <rdossant@redhat.com> - 0.10.0-16
>+- Use fedora standard build/linker flags (#1539077)
>+
> * Wed Jul 18 2018 Christopher Tubbs <ctubbsii@fedoraproject.org> - 0.10.0-15
> - Rebuild to address transient error
> 
>diff --git a/use-fedora-flags.patch b/use-fedora-flags.patch
>new file mode 100644
>index 0000000..8e5fe84
>--- /dev/null
>+++ b/use-fedora-flags.patch
>@@ -0,0 +1,155 @@
>+diff -Nru thrift-0.10.0/compiler/cpp/Makefile.am thrift-modified/compiler/cpp/Makefile.am
>+--- thrift-0.10.0/compiler/cpp/Makefile.am	2016-12-12 18:58:52.000000000 +0100
>++++ thrift-modified/compiler/cpp/Makefile.am	2018-08-20 16:58:27.779270232 +0200
>+@@ -109,7 +109,7 @@
>+                   src/thrift/generate/t_lua_generator.cc
>+
>+ thrift_CPPFLAGS = -I$(srcdir)/src
>+-thrift_CXXFLAGS = -Wall -Wextra -pedantic
>++thrift_CXXFLAGS = $(CXXFLAGS)
>+ thrift_LDADD = @LEXLIB@ src/thrift/libparse.a
>+
>+ if !WITH_PLUGIN
>+@@ -133,7 +133,7 @@
>+
>+
>+ libthriftc_la_CPPFLAGS = -I$(srcdir)/src -Isrc -I$(top_builddir)/lib/cpp/src -DTHRIFT_ENABLE_PLUGIN=1
>+-libthriftc_la_CXXFLAGS = -Wall -Wextra -pedantic
>++libthriftc_la_CXXFLAGS = $(CXXFLAGS)
>+ libthriftc_la_LIBADD = $(top_builddir)/lib/cpp/libthrift.la
>+
>+ include_thriftdir = $(includedir)/thrift
>+diff -Nru thrift-0.10.0/compiler/cpp/src/Makefile.am thrift-modified/compiler/cpp/src/Makefile.am
>+--- thrift-0.10.0/compiler/cpp/src/Makefile.am	2016-10-12 18:12:58.000000000 +0200
>++++ thrift-modified/compiler/cpp/src/Makefile.am	2018-08-20 16:58:55.938647965 +0200
>+@@ -30,7 +30,7 @@
>+ noinst_LIBRARIES = thrift/libparse.a
>+
>+ thrift_libparse_a_CPPFLAGS = -I$(srcdir)
>+-thrift_libparse_a_CXXFLAGS = -Wall -Wno-sign-compare -Wno-unused
>++thrift_libparse_a_CXXFLAGS = $(CXXFLAGS) -Wall -Wno-sign-compare -Wno-unused
>+
>+ thrift_libparse_a_SOURCES = thrift/thrifty.yy \
>+                      thrift/thriftl.ll
>+@@ -82,6 +82,6 @@
>+
>+ main.cc: version.h
>+
>+-thrift_thrift_bootstrap_CXXFLAGS = -Wall -Wextra -pedantic
>++thrift_thrift_bootstrap_CXXFLAGS = $(CXXFLAGS)
>+ thrift_thrift_bootstrap_LDADD = @LEXLIB@ thrift/libparse.a
>+ endif
>+diff -Nru thrift-0.10.0/contrib/fb303/acinclude.m4 thrift-modified/contrib/fb303/acinclude.m4
>+--- thrift-0.10.0/contrib/fb303/acinclude.m4	2014-11-05 02:50:31.000000000 +0100
>++++ thrift-modified/contrib/fb303/acinclude.m4	2018-08-20 16:56:54.040012817 +0200
>+@@ -84,8 +84,8 @@
>+      CFLAGS="-Wall -O3"
>+      CXXFLAGS="-Wall -O3"
>+ else
>+-     CFLAGS="-Wall -g"
>+-     CXXFLAGS="-Wall -g"
>++     CFLAGS?="-Wall -g"
>++     CXXFLAGS?="-Wall -g"
>+ fi
>+ AC_MSG_RESULT($ENABLED_OPT)
>+ AM_CONDITIONAL([OPT], [test "$ENABLED_OPT" = yes])
>+@@ -107,11 +107,11 @@
>+ )
>+ if test "$ENABLED_DEBUG" = "yes"
>+ then
>+-     CFLAGS="-Wall -g"
>+-     CXXFLAGS="-Wall -g"
>++     CFLAGS?="-Wall -g"
>++     CXXFLAGS?="-Wall -g"
>+ else
>+-     CFLAGS="-Wall -O3"
>+-     CXXFLAGS="-Wall -O3"
>++     CFLAGS?="-Wall -O3"
>++     CXXFLAGS?="-Wall -O3"
>+ fi
>+ AC_MSG_RESULT($ENABLED_DEBUG)
>+ AM_CONDITIONAL([DEBUG], [test "$ENABLED_DEBUG" = yes])
>+@@ -138,9 +138,9 @@
>+      LTYPE=".a"
>+ else
>+      LTYPE=".so"
>+-     SHARED_CXXFLAGS="-fPIC"
>+-     SHARED_CFLAGS="-fPIC"
>+-     SHARED_LDFLAGS="-shared -fPIC"
>++     SHARED_CXXFLAGS="$(CXXFLAGS) -fPIC"
>++     SHARED_CFLAGS="$(CFLAGS) -fPIC"
>++     SHARED_LDFLAGS="$(LDFLAGS) -shared -fPIC"
>+      AC_SUBST(SHARED_CXXFLAGS)
>+      AC_SUBST(SHARED_CFLAGS)
>+      AC_SUBST(SHARED_LDFLAGS)
>+@@ -169,9 +169,9 @@
>+ if test "$ENABLED_SHARED" = "yes"
>+ then
>+      LTYPE=".so"
>+-     SHARED_CXXFLAGS="-fPIC"
>+-     SHARED_CFLAGS="-fPIC"
>+-     SHARED_LDFLAGS="-shared -fPIC"
>++     SHARED_CXXFLAGS="$(CXXFLAGS) -fPIC"
>++     SHARED_CFLAGS="$(CFLAGS) -fPIC"
>++     SHARED_LDFLAGS="$(LDFLAGS) -shared -fPIC"
>+      AC_SUBST(SHARED_CXXFLAGS)
>+      AC_SUBST(SHARED_CFLAGS)
>+      AC_SUBST(SHARED_LDFLAGS)
>+diff -Nru thrift-0.10.0/lib/c_glib/Makefile.am thrift-modified/lib/c_glib/Makefile.am
>+--- thrift-0.10.0/lib/c_glib/Makefile.am	2018-08-20 16:47:30.878458581 +0200
>++++ thrift-modified/lib/c_glib/Makefile.am	2018-08-20 16:59:47.930345378 +0200
>+@@ -54,7 +54,7 @@
>+                               src/thrift/c_glib/server/thrift_server.c \
>+                               src/thrift/c_glib/server/thrift_simple_server.c
>+
>+-libthrift_c_glib_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS)
>++libthrift_c_glib_la_CFLAGS = $(CFLAGS) $(AM_CFLAGS) $(GLIB_CFLAGS)
>+
>+ include_thriftdir = $(includedir)/thrift/c_glib
>+ include_thrift_HEADERS = \
>+diff -Nru thrift-0.10.0/lib/cpp/Makefile.am thrift-modified/lib/cpp/Makefile.am
>+--- thrift-0.10.0/lib/cpp/Makefile.am	2018-08-20 16:47:30.878458581 +0200
>++++ thrift-modified/lib/cpp/Makefile.am	2018-08-20 17:01:40.775859094 +0200
>+@@ -39,7 +39,7 @@
>+
>+ lib_LTLIBRARIES = libthrift.la
>+ pkgconfig_DATA = thrift.pc
>+-libthrift_la_LDFLAGS = -release $(VERSION)
>++libthrift_la_LDFLAGS = -release $(VERSION) $(LDFLAGS)
>+ libthrift_la_LIBADD = $(BOOST_LDFLAGS) $(OPENSSL_LDFLAGS) $(OPENSSL_LIBS)
>+
>+ ## We only build the extra libraries if we have the dependencies,
>+@@ -136,21 +136,21 @@
>+ CLEANFILES += $(libthriftqt5_la_MOC)
>+
>+ # Flags for the various libraries
>+-libthriftnb_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBEVENT_CPPFLAGS)
>+-libthriftz_la_CPPFLAGS  = $(AM_CPPFLAGS) $(ZLIB_CPPFLAGS)
>+-libthriftqt_la_CPPFLAGS = $(AM_CPPFLAGS) $(QT_CFLAGS)
>+-libthriftqt5_la_CPPFLAGS = $(AM_CPPFLAGS) $(QT5_CFLAGS)
>++libthriftnb_la_CPPFLAGS = $(CFLAGS) $(AM_CPPFLAGS) $(LIBEVENT_CPPFLAGS)
>++libthriftz_la_CPPFLAGS  = $(CFLAGS) $(AM_CPPFLAGS) $(ZLIB_CPPFLAGS)
>++libthriftqt_la_CPPFLAGS = $(CFLAGS) $(AM_CPPFLAGS) $(QT_CFLAGS)
>++libthriftqt5_la_CPPFLAGS = $(CFLAGS) $(AM_CPPFLAGS) $(QT5_CFLAGS)
>+ if QT5_REDUCE_RELOCATIONS
>+ libthriftqt5_la_CPPFLAGS += -fPIC
>+ endif
>+-libthriftnb_la_CXXFLAGS = $(AM_CXXFLAGS)
>+-libthriftz_la_CXXFLAGS  = $(AM_CXXFLAGS)
>+-libthriftqt_la_CXXFLAGS  = $(AM_CXXFLAGS)
>+-libthriftqt5_la_CXXFLAGS  = $(AM_CXXFLAGS)
>+-libthriftnb_la_LDFLAGS  = -release $(VERSION) $(BOOST_LDFLAGS)
>+-libthriftz_la_LDFLAGS   = -release $(VERSION) $(BOOST_LDFLAGS)
>+-libthriftqt_la_LDFLAGS   = -release $(VERSION) $(BOOST_LDFLAGS) $(QT_LIBS)
>+-libthriftqt5_la_LDFLAGS   = -release $(VERSION) $(BOOST_LDFLAGS) $(QT5_LIBS)
>++libthriftnb_la_CXXFLAGS = $(CXXFLAGS) $(AM_CXXFLAGS)
>++libthriftz_la_CXXFLAGS  = $(CXXFLAGS) $(AM_CXXFLAGS)
>++libthriftqt_la_CXXFLAGS  = $(CXXFLAGS) $(AM_CXXFLAGS)
>++libthriftqt5_la_CXXFLAGS  = $(CXXFLAGS) $(AM_CXXFLAGS)
>++libthriftnb_la_LDFLAGS  = -release $(VERSION) $(BOOST_LDFLAGS) $(LDFLAGS)
>++libthriftz_la_LDFLAGS   = -release $(VERSION) $(BOOST_LDFLAGS) $(LDFLAGS)
>++libthriftqt_la_LDFLAGS   = -release $(VERSION) $(BOOST_LDFLAGS) $(QT_LIBS) $(LDFLAGS)
>++libthriftqt5_la_LDFLAGS   = -release $(VERSION) $(BOOST_LDFLAGS) $(QT5_LIBS) $(LDFLAGS)
>+
>+ include_thriftdir = $(includedir)/thrift
>+ include_thrift_HEADERS = \
>-- 
>2.17.1
>

Actions: View | Diff

Attachments on bug 1539077: 1477286