orion pushed to g2clib (el6). "Build aarch64/ppc64le with -fpic"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri Mar 27 02:46:26 UTC 2015
>From 70371e429a6926f216b263206406742d81967e49 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at gmail.com>
Date: Mon, 28 Jul 2014 22:26:54 +0100
Subject: Build aarch64/ppc64le with -fpic
diff --git a/g2clib.spec b/g2clib.spec
index 517b39e..cfd0ff2 100644
--- a/g2clib.spec
+++ b/g2clib.spec
@@ -1,6 +1,6 @@
Name: g2clib
Version: 1.4.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: GRIB2 encoder/decoder and search/indexing routines in C
Group: System Environment/Libraries
@@ -15,7 +15,6 @@ Patch1: g2clib-templates.patch
# Patch from Wesley Ebisuzaki <wesley.ebisuzaki at noaa.gov> to fix sigfault
# if simunpack() is called with 0 values to unpack
Patch2: g2clib-simunpack.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libpng-devel jasper-devel
#Requires:
@@ -57,7 +56,7 @@ CFLAGS="$RPM_OPT_FLAGS -DUSE_PNG -DUSE_JPEG2000"
%ifarch sparc64 s390x
CFLAGS="$CFLAGS -D__64BIT__ -fPIC"
%endif
-%ifarch x86_64 ia64 ppc64
+%ifarch x86_64 ia64 %{power64} aarch64
CFLAGS="$CFLAGS -D__64BIT__ -fpic"
%endif
%ifarch %{ix86} %{arm}
@@ -68,7 +67,6 @@ make CFLAGS="$CFLAGS" CC="%{__cc}" ARFLAGS=
%install
-rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_includedir}
install -p -m0644 libgrib2c.a $RPM_BUILD_ROOT%{_libdir}
install -p -m0644 grib2.h $RPM_BUILD_ROOT%{_includedir}
@@ -92,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Jul 28 2014 Peter Robinson <pbrobinson at fedoraproject.org> 1.4.0-7
+- Build aarch64/ppc64le with -fpic
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/g2clib.git/commit/?h=el6&id=70371e429a6926f216b263206406742d81967e49
More information about the scm-commits
mailing list