Attachment 900271 Details for Bug 1102559 – patch + spec changes

[patch] patch + spec changes

trafficserver.patch (text/plain), 5.75 KB, created by Marcin Juszkiewicz on 2014-05-29 08:28:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcin Juszkiewicz

Created: 2014-05-29 08:28:43 UTC

Size: 5.75 KB

patch

obsolete

>diff --git a/trafficserver-aarch64.patch b/trafficserver-aarch64.patch
>new file mode 100644
>index 0000000..1003f9b
>--- /dev/null
>+++ b/trafficserver-aarch64.patch
>@@ -0,0 +1,44 @@
>+Index: trafficserver-4.2.1/plugins/header_filter/lulu.h
>+===================================================================
>+--- trafficserver-4.2.1.orig/plugins/header_filter/lulu.h
>++++ trafficserver-4.2.1/plugins/header_filter/lulu.h
>+@@ -41,7 +41,10 @@
>+ #define mb()  __asm__ __volatile__ ( "dmb" : : : "memory")
>+ #define rmb() __asm__ __volatile__ ( "dmb" : : : "memory")
>+ #define wmb() __asm__ __volatile__ ( "" : : : "memory")
>+-#elif defined(__arm__)
>++#elif defined(__aarch64__)
>++#define mb()  __asm__ __volatile__ ( "dsb sy" : : : "memory")
>++#define rmb() __asm__ __volatile__ ( "dsb ld" : : : "memory")
>++#define wmb() __asm__ __volatile__ ( "dsb st" : : : "memory")
>+ #else
>+ #error "Define barriers"
>+ #endif
>+Index: trafficserver-4.2.1/lib/ts/ink_queue.h
>+===================================================================
>+--- trafficserver-4.2.1.orig/lib/ts/ink_queue.h
>++++ trafficserver-4.2.1/lib/ts/ink_queue.h
>+@@ -134,7 +134,7 @@ extern "C"
>+ #define FREELIST_VERSION(_x) (_x).s.version
>+ #define SET_FREELIST_POINTER_VERSION(_x,_p,_v) \
>+ (_x).s.pointer = _p; (_x).s.version = _v
>+-#elif defined(__x86_64__) || defined(__ia64__)
>++#elif defined(__x86_64__) || defined(__ia64__) || defined(__aarch64__)
>+ #define FREELIST_POINTER(_x) ((void*)(((((intptr_t)(_x).data)<<16)>>16) | \
>+  (((~((((intptr_t)(_x).data)<<16>>63)-1))>>48)<<48)))  // sign extend
>+ #define FREELIST_VERSION(_x) (((intptr_t)(_x).data)>>48)
>+Index: trafficserver-4.2.1/plugins/header_rewrite/lulu.h
>+===================================================================
>+--- trafficserver-4.2.1.orig/plugins/header_rewrite/lulu.h
>++++ trafficserver-4.2.1/plugins/header_rewrite/lulu.h
>+@@ -39,6 +39,10 @@
>+ #define mb()  __asm__ __volatile__ ( "dmb" : : : "memory")
>+ #define rmb() __asm__ __volatile__ ( "dmb" : : : "memory")
>+ #define wmb() __asm__ __volatile__ ( "" : : : "memory")
>++#elif defined(__aarch64__)
>++#define mb()  __asm__ __volatile__ ( "dsb sy" : : : "memory")
>++#define rmb() __asm__ __volatile__ ( "dsb ld" : : : "memory")
>++#define wmb() __asm__ __volatile__ ( "dsb st" : : : "memory")
>+ #else
>+ #error "Define barriers"
>+ #endif
>diff --git a/trafficserver-fix-dbg.patch b/trafficserver-fix-dbg.patch
>new file mode 100644
>index 0000000..3a35a25
>--- /dev/null
>+++ b/trafficserver-fix-dbg.patch
>@@ -0,0 +1,23 @@
>+Index: trafficserver-4.2.1/lib/ts/ink_defs.h
>+===================================================================
>+--- trafficserver-4.2.1.orig/lib/ts/ink_defs.h
>++++ trafficserver-4.2.1/lib/ts/ink_defs.h
>+@@ -144,12 +144,12 @@ countof(const T (&)[N]) {
>+ 
>+ #else
>+ 
>+-#define FDBG                if (debug_level==1) printf("debug "__FILE__":%d %s : entered\n" ,__LINE__,__FUNCTION__)
>+-#define DBG(s)              if (debug_level==1) printf("debug "__FILE__":%d %s :" s ,__LINE__,__FUNCTION__)
>+-#define DBG1(s,a)           if (debug_level==1) printf("debug "__FILE__":%d %s :" s ,__LINE__,__FUNCTION__, a)
>+-#define DBG2(s,a1,a2)       if (debug_level==1) printf("debug "__FILE__":%d %s :" s ,__LINE__,__FUNCTION__, a1,a2)
>+-#define DBG3(s,a1,a2,a3)    if (debug_level==1) printf("debug "__FILE__":%d %s :" s ,__LINE__,__FUNCTION__, a1,a2,a3)
>+-#define DBG4(s,a1,a2,a3,a4) if (debug_level==1) printf("debug "__FILE__":%d %s :" s ,__LINE__,__FUNCTION__, a1,a2,a3,a4)
>++#define FDBG                if (debug_level==1) printf("debug " __FILE__ ":%d %s : entered\n" ,__LINE__,__FUNCTION__)
>++#define DBG(s)              if (debug_level==1) printf("debug " __FILE__ ":%d %s :" s ,__LINE__,__FUNCTION__)
>++#define DBG1(s,a)           if (debug_level==1) printf("debug " __FILE__ ":%d %s :" s ,__LINE__,__FUNCTION__, a)
>++#define DBG2(s,a1,a2)       if (debug_level==1) printf("debug " __FILE__ ":%d %s :" s ,__LINE__,__FUNCTION__, a1,a2)
>++#define DBG3(s,a1,a2,a3)    if (debug_level==1) printf("debug " __FILE__ ":%d %s :" s ,__LINE__,__FUNCTION__, a1,a2,a3)
>++#define DBG4(s,a1,a2,a3,a4) if (debug_level==1) printf("debug " __FILE__ ":%d %s :" s ,__LINE__,__FUNCTION__, a1,a2,a3,a4)
>+ 
>+ #endif
>+ 
>diff --git a/trafficserver.spec b/trafficserver.spec
>index 233867b..3972aea 100644
>--- a/trafficserver.spec
>+++ b/trafficserver.spec
>@@ -3,7 +3,7 @@
> Summary:	Fast, scalable and extensible HTTP/1.1 compliant caching proxy server
> Name:		trafficserver
> Version:	4.2.1
>-Release:	4%{?dist}
>+Release:	5%{?dist}
> License:	ASL 2.0
> Group:		System Environment/Daemons
> Source0:	http://www.apache.org/dist/%{name}/%{name}-%{version}.tar.bz2
>@@ -19,7 +19,7 @@ BuildRequires:	autoconf, automake, libtool, openssl-devel, tcl-devel, expat-deve
> BuildRequires:	pcre-devel, zlib-devel, xz-devel, gcc-c++, gnupg, perl-ExtUtils-MakeMaker
> BuildRequires:	hwloc-devel
> # trafficserver fails to build on ppc and others, TS-1131, see lib/ts/ink_queue.h
>-ExclusiveArch:	%{ix86} x86_64 ia64 %{arm}
>+ExclusiveArch:	%{ix86} x86_64 ia64 %{arm} aarch64
> Requires: initscripts
> %if %{?fedora}0 > 140 || %{?rhel}0 > 60
> # For systemd.macros
>@@ -33,6 +33,8 @@ Requires(postun): initscripts
> %endif
> 
> Patch2:		trafficserver-init_scripts.patch
>+Patch3:		trafficserver-aarch64.patch
>+Patch4:		trafficserver-fix-dbg.patch
> 
> 
> %description
>@@ -45,6 +47,8 @@ gpgv --homedir /tmp --keyring %{SOURCE2} --status-fd=1 %{SOURCE1} %{SOURCE0} | g
> %setup -q
> 
> %patch2 -p1 -b .patch2
>+%patch3 -p1
>+%patch4 -p1
> 
> %build
> %configure \
>@@ -219,6 +223,10 @@ header files, and Apache httpd style module build system.
> %attr(0644,root,root) %{_libdir}/trafficserver/*.so
> 
> %changelog
>+* Tue May 27 2014 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 4.2.1-5
>+- Add AArch64 support.
>+- Fix DBG macros to not generate warnings.
>+
> * Thu May 22 2014 Petr Machata <pmachata@redhat.com> - 4.2.1-4
> - Rebuild for boost 1.55.0
>

Actions: View | Diff

Attachments on bug 1102559: 900271 | 1012624