[arch-commits] Commit in thrift/trunk (PKGBUILD fix_cglib_compile_options.patch)

Anatol Pomozov anatolik at archlinux.org
Sun Dec 21 13:09:27 UTC 2014


    Date: Sunday, December 21, 2014 @ 14:09:26
  Author: anatolik
Revision: 124300

upgpkg: thrift 0.9.2-2

Fix FS#43071

Added:
  thrift/trunk/fix_cglib_compile_options.patch
Modified:
  thrift/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |   16 +++++++++++----
 fix_cglib_compile_options.patch |   39 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-12-21 13:02:45 UTC (rev 124299)
+++ PKGBUILD	2014-12-21 13:09:26 UTC (rev 124300)
@@ -9,19 +9,26 @@
 
 pkgname=thrift
 pkgver=0.9.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Scalable cross-language services framework for IPC/RPC'
 arch=(i686 x86_64)
 url='http://thrift.apache.org/'
 license=(APACHE)
-depends=(gcc-libs openssl)
+depends=(gcc-libs openssl boost)
 makedepends=(qt4 boost libevent emacs-nox)
 optdepends=(
   'qt4: TQTcpServer support'
 )
-source=(http://www.apache.org/dist/thrift/$pkgver/thrift-$pkgver.tar.gz)
-sha1sums=('02f78b158da795ea89a26ce41964fbe562cc4235')
+source=(http://www.apache.org/dist/thrift/$pkgver/thrift-$pkgver.tar.gz
+        fix_cglib_compile_options.patch)
+sha1sums=('02f78b158da795ea89a26ce41964fbe562cc4235'
+          '96650c499ab45824be04070d868114205fb4538c')
 
+prepare() {
+  cd thrift-$pkgver
+  patch -p1 < ../fix_cglib_compile_options.patch
+}
+
 build() {
   cd thrift-$pkgver
 
@@ -30,6 +37,7 @@
               --with-c_glib \
               --with-qt4 \
               --with-libevent \
+              --with-csharp \
               --without-haskell \
               --without-php \
               --without-ruby \

Added: fix_cglib_compile_options.patch
===================================================================
--- fix_cglib_compile_options.patch	                        (rev 0)
+++ fix_cglib_compile_options.patch	2014-12-21 13:09:26 UTC (rev 124300)
@@ -0,0 +1,39 @@
+commit 4bf97c196aba9e50289333c15336ad109fc87f2d
+Author: Anatol Pomozov <anatol.pomozov at gmail.com>
+Date:   Mon Nov 24 11:12:52 2014 -0800
+
+    Do not drop CFLAGS from c_glib compilation
+    
+    CFLAGS contains important flags. Dropping it introduces e.g. such issues:
+    https://sourceware.org/bugzilla/show_bug.cgi?id=13979
+    
+    Signed-off-by: Anatol Pomozov <anatol.pomozov at gmail.com>
+    
+    This closes #284
+
+diff --git a/lib/c_glib/Makefile.am b/lib/c_glib/Makefile.am
+index 88e2d73..4e0aa88 100755
+--- a/lib/c_glib/Makefile.am
++++ b/lib/c_glib/Makefile.am
+@@ -24,11 +24,7 @@ pkgconfigdir = $(libdir)/pkgconfig
+ lib_LTLIBRARIES = libthrift_c_glib.la
+ pkgconfig_DATA = thrift_c_glib.pc
+ 
+-common_cflags = -g -Wall -W -Isrc -I src/thrift/c_glib $(GLIB_CFLAGS)
+-common_ldflags = -g -Wall -W $(GLIB_LDFLAGS) @GCOV_LDFLAGS@
+-
+-# this removes optimizations and adds coverage flags
+-CFLAGS = @GCOV_CFLAGS@
++AM_CFLAGS = -Isrc -I src/thrift/c_glib
+ 
+ # Define the source files for the module
+ 
+@@ -54,7 +50,7 @@ libthrift_c_glib_la_SOURCES = src/thrift/c_glib/thrift.c \
+                               src/thrift/c_glib/server/thrift_server.c \
+                               src/thrift/c_glib/server/thrift_simple_server.c
+ 
+-libthrift_c_glib_la_CFLAGS = $(common_cflags)
++libthrift_c_glib_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS)
+ 
+ include_thriftdir = $(includedir)/thrift/c_glib
+ include_thrift_HEADERS = \



More information about the arch-commits mailing list