diff options
| author | root <root@rshg054.dnsready.net> | 2012-08-15 00:02:45 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-08-15 00:02:45 +0000 |
| commit | c0241f4d9174d80fb50b9561095a685c8a0a5058 (patch) | |
| tree | d514c483a6361485025440e31f135ef36141453a /community/wvstreams | |
| parent | a36c4a33891932acf2ac1cdebbb9caed01d7df6f (diff) | |
Wed Aug 15 00:02:44 UTC 2012
Diffstat (limited to 'community/wvstreams')
| -rw-r--r-- | community/wvstreams/PKGBUILD | 12 | ||||
| -rw-r--r-- | community/wvstreams/wvstreams-4.6.1-gcc47.patch | 44 |
2 files changed, 48 insertions, 8 deletions
diff --git a/community/wvstreams/PKGBUILD b/community/wvstreams/PKGBUILD index 9b68ab184..02488b789 100644 --- a/community/wvstreams/PKGBUILD +++ b/community/wvstreams/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 74964 2012-08-10 12:12:57Z bluewind $ +# $Id: PKGBUILD 75083 2012-08-13 16:55:40Z bluewind $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=wvstreams pkgver=4.6.1 -pkgrel=4 +pkgrel=5 pkgdesc="A network programming library written in C++" arch=('i686' 'x86_64') url="http://alumnit.ca/wiki/?page=WvStreams" @@ -15,7 +15,7 @@ source=(http://wvstreams.googlecode.com/files/${pkgname}-${pkgver}.tar.gz wvstreams-4.6.1-glibc212.patch wvstreams-4.6.1-gcc47.patch openssl-buildfix.patch) md5sums=('2760dac31a43d452a19a3147bfde571c' '5f6e24864209055239cb4e7c9bbd4a41' - '918be13d35205385a39077403ce36388' + '217e5dedd7f1d50588a5a67d637fc8a1' 'df423c68134a09439b3961c34635e0b4') options=('!makeflags') @@ -23,7 +23,7 @@ build() { cd ${srcdir}/${pkgname}-${pkgver} patch -p0 -i "$srcdir/wvstreams-4.6.1-glibc212.patch" - patch -p1 -i "$srcdir/wvstreams-4.6.1-gcc47.patch" + patch -p0 -i "$srcdir/wvstreams-4.6.1-gcc47.patch" patch -p1 -i "$srcdir/openssl-buildfix.patch" ./configure --prefix=/usr \ @@ -33,8 +33,8 @@ build() { --with-pam \ --with-openssl \ --without-tcl \ - --without-qt || return 1 - make COPTS="$CFLAGS -fPIC" CXXOPTS="$CXXFLAGS -fPIC -fpermissive" VERBOSE=1 + --without-qt + make COPTS="$CFLAGS -fPIC" CXXOPTS="$CXXFLAGS -fPIC -fpermissive -fno-tree-dce -fno-optimize-sibling-calls" VERBOSE=1 } package() { diff --git a/community/wvstreams/wvstreams-4.6.1-gcc47.patch b/community/wvstreams/wvstreams-4.6.1-gcc47.patch index 3d6704832..b284da8f3 100644 --- a/community/wvstreams/wvstreams-4.6.1-gcc47.patch +++ b/community/wvstreams/wvstreams-4.6.1-gcc47.patch @@ -1,5 +1,33 @@ ---- wvstreams-4.6.1-dist/include/wvuid.h 2012-01-05 10:18:58.713661236 +0100 -+++ wvstreams-4.6.1/include/wvuid.h 2012-01-05 10:27:42.198435328 +0100 +http://bugs.gentoo.org/419563 +http://bugs.gentoo.org/419971 + +See -gcc47-patch and -magic.patch in Fedora git: + +http://pkgs.fedoraproject.org/gitweb/?p=libwvstreams.git;a=tree + +--- include/wvtask.h ++++ include/wvtask.h +@@ -45,7 +45,8 @@ + typedef void TaskFunc(void *userdata); + + static int taskcount, numtasks, numrunning; +- int magic_number, *stack_magic; ++ int volatile magic_number; ++ int *stack_magic; + WvString name; + int tid; + +@@ -84,7 +85,7 @@ + static WvTaskMan *singleton; + static int links; + +- static int magic_number; ++ static int volatile magic_number; + static WvTaskList all_tasks, free_tasks; + + static void get_stack(WvTask &task, size_t size); +--- include/wvuid.h ++++ include/wvuid.h @@ -7,6 +7,7 @@ #ifndef __WVUID_H #define __WVUID_H @@ -8,3 +36,15 @@ #include "wvstring.h" #if WIN32 +--- utils/wvtask.cc ++++ utils/wvtask.cc +@@ -58,7 +58,8 @@ + int WvTask::taskcount, WvTask::numtasks, WvTask::numrunning; + + WvTaskMan *WvTaskMan::singleton; +-int WvTaskMan::links, WvTaskMan::magic_number; ++int WvTaskMan::links; ++int volatile WvTaskMan::magic_number; + WvTaskList WvTaskMan::all_tasks, WvTaskMan::free_tasks; + ucontext_t WvTaskMan::stackmaster_task, WvTaskMan::get_stack_return, + WvTaskMan::toplevel; |