[packages/ninja] - updated to 1.7.2 - LFS patch replaced by defines added to CFLAGS

qboosh qboosh at pld-linux.org
Fri Jun 2 23:37:15 CEST 2017


commit 9f6a38a6e003a42e9b6fe1135199689d9c989ad3
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Jun 2 23:38:17 2017 +0200

    - updated to 1.7.2
    - LFS patch replaced by defines added to CFLAGS

 LFS.patch  | 13 -------------
 ninja.spec | 16 +++++++++-------
 2 files changed, 9 insertions(+), 20 deletions(-)
---
diff --git a/ninja.spec b/ninja.spec
index 524b162..ee10ec9 100644
--- a/ninja.spec
+++ b/ninja.spec
@@ -6,14 +6,14 @@
 Summary:	A small build system with a focus on speed
 Summary(pl.UTF-8):	Mały system budowania ukierunkowany na szybkość
 Name:		ninja
-Version:	1.6.0
+Version:	1.7.2
 Release:	1
 License:	Apache v2.0
 Group:		Development/Tools
-Source0:	https://github.com/martine/ninja/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	254133059f2da79d8727f654d7198f43
-Patch0:		LFS.patch
-URL:		http://martine.github.io/ninja/
+#Source0Download: https://github.com/ninja-build/ninja/releases
+Source0:	https://github.com/ninja-build/ninja/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	7b482218757acbaeac4d4d54a3cd94e1
+URL:		http://ninja-build.org/
 %{?with_doc:BuildRequires:	asciidoc}
 BuildRequires:	libstdc++-devel
 %{!?with_bootstrap:BuildRequires:	ninja}
@@ -88,6 +88,9 @@ Summary(pl.UTF-8):	Tryb Ninja dla Emacsa
 Group:		Applications/Editors
 Requires:	%{name} = %{version}-%{release}
 Requires:	emacs
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description -n emacs-ninja-mode
 Ninja mode for Emacs.
@@ -97,11 +100,10 @@ Tryb Ninja dla Emacsa.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 export CXX="%{__cxx}"
-export CFLAGS="%{rpmcxxflags}"
+export CFLAGS="%{rpmcxxflags} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 
 ./configure.py \
 	%{?with_bootstrap:--bootstrap} \
diff --git a/LFS.patch b/LFS.patch
deleted file mode 100644
index 9107eda..0000000
--- a/LFS.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Largefile patch
-https://github.com/martine/ninja/issues/829
-
---- ninja-1.5.1/configure.py~	2014-10-26 22:45:18.000000000 +0200
-+++ ninja-1.5.1/configure.py	2014-10-26 22:45:26.284641172 +0200
-@@ -142,6 +142,7 @@
-               '-fno-exceptions',
-               '-fvisibility=hidden', '-pipe',
-               '-Wno-missing-field-initializers',
-+              '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64',
-               '-DNINJA_PYTHON="%s"' % options.with_python]
-     if options.debug:
-         cflags += ['-D_GLIBCXX_DEBUG', '-D_GLIBCXX_DEBUG_PEDANTIC']
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ninja.git/commitdiff/9f6a38a6e003a42e9b6fe1135199689d9c989ad3



More information about the pld-cvs-commit mailing list