From 36d54f67d5e991e2ddf25fdb7b55b597edeb10bd Mon Sep 17 00:00:00 2001 From: Patrick Gartung Date: Mon, 5 Oct 2015 19:00:49 +0000 Subject: [PATCH 1/4] enclose statement in %isdarwin conditional --- py2-dxr.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/py2-dxr.spec b/py2-dxr.spec index f7e372123d2..10ef046c5a3 100644 --- a/py2-dxr.spec +++ b/py2-dxr.spec @@ -2,7 +2,7 @@ ## INITENV +PATH PYTHONPATH %i/$PYTHON_LIB_SITE_PACKAGES BuildRequires: llvm sqlite Requires: python zlib py2-setuptools py2-futures py2-jinja py2-markupsafe py2-ordereddict py2-parsimonious - +%define isdarwin %(case %{cmsos} in (osx*) echo 1 ;; (*) echo 0 ;; esac) %define dxrCommit 6ea764102a %define triliteCommit e64a2a1 %define re2Version 20140304 @@ -33,7 +33,9 @@ mv trilite-%triliteCommit/* trilite # GCC + libstdc++. The ABIs are different, thus correct # it accordingly. # https://code.google.com/p/re2/issues/detail?id=99 +%if %isdarwin sed -ibak 's;__ZlsRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEERKN3re211StringPieceE;__ZlsRSoRKN3re211StringPieceE;' ./trilite/re2/libre2.symbols.darwin +%endif %build export SQLITE_ROOT From fcc2822e8ee45cf2c887b817ec3bb7f3d4322ebc Mon Sep 17 00:00:00 2001 From: Patrick Gartung Date: Mon, 5 Oct 2015 16:41:38 -0500 Subject: [PATCH 2/4] force py2-dxr to be rebuilt against mysql 3.8 --- py2-dxr.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/py2-dxr.spec b/py2-dxr.spec index 10ef046c5a3..d3df56b28b6 100644 --- a/py2-dxr.spec +++ b/py2-dxr.spec @@ -1,7 +1,7 @@ ### RPM external py2-dxr 1.0 ## INITENV +PATH PYTHONPATH %i/$PYTHON_LIB_SITE_PACKAGES BuildRequires: llvm sqlite -Requires: python zlib py2-setuptools py2-futures py2-jinja py2-markupsafe py2-ordereddict py2-parsimonious +Requires: python llvm sqlite zlib py2-setuptools py2-futures py2-jinja py2-markupsafe py2-ordereddict py2-parsimonious %define isdarwin %(case %{cmsos} in (osx*) echo 1 ;; (*) echo 0 ;; esac) %define dxrCommit 6ea764102a %define triliteCommit e64a2a1 @@ -33,9 +33,7 @@ mv trilite-%triliteCommit/* trilite # GCC + libstdc++. The ABIs are different, thus correct # it accordingly. # https://code.google.com/p/re2/issues/detail?id=99 -%if %isdarwin sed -ibak 's;__ZlsRNSt3__113basic_ostreamIcNS_11char_traitsIcEEEERKN3re211StringPieceE;__ZlsRSoRKN3re211StringPieceE;' ./trilite/re2/libre2.symbols.darwin -%endif %build export SQLITE_ROOT From 93dca8fe98d588a9de23108152024ade832c24f2 Mon Sep 17 00:00:00 2001 From: Patrick Gartung Date: Tue, 6 Oct 2015 07:44:39 -0500 Subject: [PATCH 3/4] force rebuild against mysql 3.8 --- py2-dxr.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/py2-dxr.spec b/py2-dxr.spec index d3df56b28b6..145e55f2e26 100644 --- a/py2-dxr.spec +++ b/py2-dxr.spec @@ -1,8 +1,9 @@ ### RPM external py2-dxr 1.0 ## INITENV +PATH PYTHONPATH %i/$PYTHON_LIB_SITE_PACKAGES BuildRequires: llvm sqlite -Requires: python llvm sqlite zlib py2-setuptools py2-futures py2-jinja py2-markupsafe py2-ordereddict py2-parsimonious -%define isdarwin %(case %{cmsos} in (osx*) echo 1 ;; (*) echo 0 ;; esac) +Requires: python zlib py2-setuptools py2-futures py2-jinja py2-markupsafe py2-ordereddict py2-parsimonious +# +# %define dxrCommit 6ea764102a %define triliteCommit e64a2a1 %define re2Version 20140304 From 993f11e7deef70505cdb571009fc533c056169ee Mon Sep 17 00:00:00 2001 From: Patrick Gartung Date: Tue, 6 Oct 2015 10:38:56 -0500 Subject: [PATCH 4/4] make dxr depend on sqlite so maybe it will get rebuilt when sqlite is rebuilt --- py2-dxr.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/py2-dxr.spec b/py2-dxr.spec index 145e55f2e26..9d95c96c44d 100644 --- a/py2-dxr.spec +++ b/py2-dxr.spec @@ -1,7 +1,7 @@ ### RPM external py2-dxr 1.0 ## INITENV +PATH PYTHONPATH %i/$PYTHON_LIB_SITE_PACKAGES BuildRequires: llvm sqlite -Requires: python zlib py2-setuptools py2-futures py2-jinja py2-markupsafe py2-ordereddict py2-parsimonious +Requires: python llvm sqlite zlib py2-setuptools py2-futures py2-jinja py2-markupsafe py2-ordereddict py2-parsimonious # # %define dxrCommit 6ea764102a