rpm/graphviz
SHA256
1
0
Fork 0
forked from pool/graphviz
Code Pull Requests Activity

Accepting request 161579 from graphics

Browse Source 
Rename patch, switch off strict aliasing for vmalloc code

OBS-URL: https://build.opensuse.org/request/show/161579
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/graphviz?expand=0&rev=57
This commit is contained in:
Stephan Kulow 2013-04-02 09:49:18 +00:00 committed by Git OBS Bridge
commit c195f7e3c1
6 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
aarch64-lib64-support.diff → graphviz-aarch64_lib64_support.patch
View File

7
graphviz-plugins.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Mar 28 11:51:09 CET 2013 - pth@suse.de
- Rename aarch64-lib64-support.diff to graphviz-aarch64_lib64_support.patch.
- Compile the code in lib/vmalloc with -fno-strict-aliasing
as it does type punning.
-------------------------------------------------------------------
Sat Mar 16 22:27:10 UTC 2013 - dmueller@suse.com

6
graphviz-plugins.spec
View File

@ -91,7 +91,8 @@ Group: Productivity/Graphics/Visualization/Graph
Url: http://www.graphviz.org/
Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{mname}-%{version}.tar.gz
Patch1: graphviz-gd_png_check_sig.patch
Patch4: aarch64-lib64-support.diff
Patch4: graphviz-aarch64_lib64_support.patch
Patch5: graphviz-type_punning.patch
Patch100: graphviz-plugins-fix_install_dirs.patch
Patch101: graphviz-python_version.patch
Patch102: graphviz-plugins-tcl_install_dir.patch
@ -263,6 +264,7 @@ Provides some additional PDF and HTML documentation for graphviz.
%setup -q -n %{mname}-%{version}
%patch1
%patch4
%patch5
%patch100
%patch101
%patch102
@ -338,8 +340,6 @@ done
%if 0%{?suse_version} > 1020
%fdupes -s %{buildroot}%{_defaultdocdir}/%{mname}
%endif
#%clean
#rm -rf %{buildroot}
rm -rf %{buildroot}/%{_libdir}/%{mname}/%{_lib}
%files -n graphviz-gd

24
graphviz-type_punning.patch Normal file
View File

@ -0,0 +1,24 @@
From: Philipp Thomas <pth@suse.de>
Date: 2013-03-28 11:43:28+01:00
Subject: Switch of strict aliasing
The vmalloc code uses type-punning in a macro so switch off strict aliasing
for this code.
---
lib/vmalloc/Makefile.am | 2 ++
1 file changed, 2 insertions(+)
Index: lib/vmalloc/Makefile.am
===================================================================
--- lib/vmalloc/Makefile.am.orig 2009-09-16 20:49:46.000000000 +0200
+++ lib/vmalloc/Makefile.am 2013-03-28 11:42:12.948760295 +0100
@@ -9,6 +9,8 @@ libvmalloc_C_la_SOURCES = malloc.c vmbes
vmprofile.c vmregion.c vmsegment.c vmset.c vmstat.c vmstrdup.c \
vmtrace.c vmwalk.c
+AM_CFLAGS = -fno-strict-aliasing
+
${top_builddir}/FEATURE/vmalloc: ${top_srcdir}/lib/vmalloc/features/vmalloc
mkdir -p ${top_builddir}/FEATURE
${top_srcdir}/iffe - set cc $(CC) $(CCMODE) $(CXFLAGS) : run ${top_srcdir}/lib/vmalloc/features/vmalloc > $@

7
graphviz.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Mar 28 11:51:09 CET 2013 - pth@suse.de
- Rename aarch64-lib64-support.diff to graphviz-aarch64_lib64_support.patch.
- Add graphviz-type_punning.patch to compile the code in lib/vmalloc
with -fno-strict-aliasing as it does type punning.
-------------------------------------------------------------------
Sat Mar 16 22:26:37 UTC 2013 - dmueller@suse.com

4
graphviz.spec
View File

@ -31,7 +31,8 @@ Source2: graphviz-rpmlintrc
Patch1: graphviz-gd_png_check_sig.patch
Patch2: graphviz-fix-pkgIndex.patch
Patch3: graphviz-missing_headers.patch
Patch4: aarch64-lib64-support.diff
Patch4: graphviz-aarch64_lib64_support.patch
Patch5: graphviz-type_punning.patch
BuildRequires: bison
BuildRequires: fdupes
BuildRequires: flex
@ -90,6 +91,7 @@ Note: If you need output in png format you also need to install
%patch2
%patch3 -p1
%patch4
%patch5
# Fix path in generated man pages
sed -e 's$@LIB_DIR@$%{_libdir}$g' tclpkg/gv/gv_doc_langs.tcl >tclpkg/gv/gv_doc_langs.tcl.new && mv tclpkg/gv/gv_doc_langs.tcl.new tclpkg/gv/gv_doc_langs.tcl