Accepting request 391105 from devel:libraries:c_c++

- add disable_oom_test.patch

OBS-URL: https://build.opensuse.org/request/show/391105
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jemalloc?expand=0&rev=16

disable_oom_test.patch

@@ -0,0 +1,26 @@
+From: Jiri Slaby <jslaby@suse.cz>
+References: https://github.com/jemalloc/jemalloc/issues/379
+Subject: Fix broken test
+
+hugemax can be 0x70000000 on i586 and it can indeed be allocated
+twice.
+
+Reported, waiting for feedback.
+
+---
+ test/integration/mallocx.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/test/integration/mallocx.c
++++ b/test/integration/mallocx.c
+@@ -82,8 +82,8 @@ TEST_BEGIN(test_oom)
+ 
+ 		p = mallocx(hugemax, 0);
+ 		if (p != NULL) {
+-			assert_ptr_null(mallocx(hugemax, 0),
+-			    "Expected OOM for mallocx(size=%#zx, 0)", hugemax);
++/*			assert_ptr_null(mallocx(hugemax, 0),
++			    "Expected OOM for mallocx(size=%#zx, 0)", hugemax);*/
+ 			dallocx(p, 0);
+ 		}
+ 	}

jemalloc.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Apr 20 12:11:43 UTC 2016 - jslaby@suse.com
+
+- add disable_oom_test.patch
+
 -------------------------------------------------------------------
 Mon Feb 29 08:27:44 UTC 2016 - idonmez@suse.com
 

jemalloc.spec

@@ -26,14 +26,15 @@ Group:          Development/Libraries/C and C++
 Url:            http://canonware.com/jemalloc/
 
 #Git-Clone:	git://canonware.com/jemalloc
-Source:         http://www.canonware.com/download/jemalloc/jemalloc-%{version}.tar.bz2
+Source:         http://www.canonware.com/download/jemalloc/jemalloc-%version.tar.bz2
+Patch1:         disable_oom_test.patch
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  libxslt
+BuildRequires:  pkg-config
 %if 0%{?suse_version} == 1110
 BuildRequires:  gcc48
 %endif
-BuildRequires:  pkgconfig
+Requires:       %lname = %version
-Requires:       %lname = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -51,7 +52,7 @@ This distribution is the stand-alone "portable" version of jemalloc.
 %package devel
 Summary:        Development files for jemalloc
 Group:          Development/Libraries/C and C++
-Requires:       %lname = %{version}
+Requires:       %lname = %version
 
 %description devel
 Headers for jemalloc, general-purpose scalable concurrent malloc(3)
@@ -60,7 +61,7 @@ implementation.
 %package devel-static
 Summary:        Static libraries for jemalloc
 Group:          Development/Libraries/C and C++
-Requires:       %{name}-devel = %{version}
+Requires:       %name-devel = %version
 
 %description devel-static
 Static libraries of jemalloc, general-purpose scalable concurrent
@@ -68,17 +69,18 @@ malloc(3) implementation.
 
 %prep
 %setup -q
+%patch -P 1 -p1
 
 %build
-export EXTRA_CFLAGS="%{optflags} -std=gnu99"
+export EXTRA_CFLAGS="%optflags -std=gnu99"
 %if 0%{?suse_version} == 1110
-if [ -f /usr/bin/gcc-4.6 ]; then
+if [ -f "%_bindir/gcc-4.6" ]; then
 	export CC=gcc-4.6
 fi
-if [ -f /usr/bin/gcc-4.7 ]; then
+if [ -f "%_bindir/gcc-4.7" ]; then
 	export CC=gcc-4.7
 fi
-if [ -f /usr/bin/gcc-4.8 ]; then
+if [ -f "%_bindir/gcc-4.8" ]; then
 	export CC=gcc-4.8
 fi
 %endif
@@ -87,46 +89,43 @@ fi
 make %{?_smp_mflags}
 
 %install
-b=%{buildroot};
+b="%buildroot"
 make install DESTDIR="$b"
-
+chmod -x "%buildroot/%_libdir"/*.a
-chmod -x "%{buildroot}/%{_libdir}"/*.a
+if [ "%_docdir" != "%_datadir/doc" ]; then
-
-if [ "%_docdir" != "%{_datadir}/doc" ]; then
 	# stupid Makefile does not allow to set it
-	mkdir -p "$b/%_docdir";
+	mkdir -p "$b/%_docdir"
-	mv "$b/%{_datadir}/doc/jemalloc" "$b/%_docdir/%{name}";
+	mv "$b/%_datadir/doc/jemalloc" "$b/%_docdir/%name"
-fi;
+fi
 
 %check
-export LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH="$PWD/lib:$LD_LIBRARY_PATH"
 make check
 
+%post   -n %lname -p /sbin/ldconfig
+%postun -n %lname -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root)
-%{_bindir}/jemalloc.sh
+%_bindir/jemalloc.sh
-%{_bindir}/jemalloc-config
+%_bindir/jemalloc-config
-%{_bindir}/jeprof
+%_bindir/jeprof
-%{_mandir}/man*/*
+%_mandir/man*/*
-%_docdir/%{name}
+%_docdir/%name
 
-%files -n %{lname}
+%files -n %lname
 %defattr(-,root,root)
 %doc ChangeLog COPYING README
-%{_libdir}/libjemalloc.so.2*
+%_libdir/libjemalloc.so.2*
 
 %files devel
-%defattr(-,root,root,-)
+%defattr(-,root,root)
-%{_includedir}/jemalloc
+%_includedir/jemalloc
-%{_libdir}/libjemalloc.so
+%_libdir/libjemalloc.so
-%{_libdir}/pkgconfig/jemalloc.pc
+%_libdir/pkgconfig/jemalloc.pc
 
 %files devel-static
-%defattr(-,root,root,-)
+%defattr(-,root,root)
-%{_libdir}/libjemalloc*.a
+%_libdir/libjemalloc*.a
-
-%post -n %lname -p /sbin/ldconfig
-
-%postun -n %lname -p /sbin/ldconfig
 
 %changelog