current gcc doesn't accept -Xcompiler
some pdf's don't build on ppc, ignore them atm.
This commit is contained in:
parent
886647d692
commit
52687d5206
13
gdal-1.7.3-xcompiler.patch
Normal file
13
gdal-1.7.3-xcompiler.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
diff -up gdal-1.7.3-fedora/ltmain.sh.xcompiler gdal-1.7.3-fedora/ltmain.sh
|
||||||
|
diff -up gdal-1.7.3-fedora/swig/ruby/RubyMakefile.mk.xcompiler gdal-1.7.3-fedora/swig/ruby/RubyMakefile.mk
|
||||||
|
--- gdal-1.7.3-fedora/swig/ruby/RubyMakefile.mk.xcompiler 2011-03-15 23:55:58.000000000 +0100
|
||||||
|
+++ gdal-1.7.3-fedora/swig/ruby/RubyMakefile.mk 2011-03-15 23:56:11.000000000 +0100
|
||||||
|
@@ -25,7 +25,7 @@ RUBY_EXTENSIONS_DIR := $(shell ruby -rrb
|
||||||
|
INSTALL_DIR := $(RUBY_EXTENSIONS_DIR)/gdal
|
||||||
|
|
||||||
|
RUBY_INCLUDE = -I$(RUBY_INCLUDE_DIR)
|
||||||
|
-LDFLAGS += -Xcompiler -shared -L$(RUBY_LIB_DIR)
|
||||||
|
+LDFLAGS += -shared -L$(RUBY_LIB_DIR)
|
||||||
|
RUBY_LIB := -l$(RUBY_SO_NAME)
|
||||||
|
|
||||||
|
build: $(RUBY_MODULES)
|
12
gdal.spec
12
gdal.spec
@ -1,6 +1,6 @@
|
|||||||
Name: gdal
|
Name: gdal
|
||||||
Version: 1.7.3
|
Version: 1.7.3
|
||||||
Release: 3%{?dist}
|
Release: 3.1%{?dist}
|
||||||
Summary: GIS file format library
|
Summary: GIS file format library
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
License: MIT
|
License: MIT
|
||||||
@ -15,6 +15,7 @@ Patch0: %{name}-libdap.patch
|
|||||||
Patch1: %{name}-mysql.patch
|
Patch1: %{name}-mysql.patch
|
||||||
Patch2: %{name}-bindir.patch
|
Patch2: %{name}-bindir.patch
|
||||||
Patch3: %{name}-AIS.patch
|
Patch3: %{name}-AIS.patch
|
||||||
|
Patch4: %{name}-%{version}-xcompiler.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
BuildRequires: libtool pkgconfig
|
BuildRequires: libtool pkgconfig
|
||||||
BuildRequires: python-devel numpy xerces-c-devel
|
BuildRequires: python-devel numpy xerces-c-devel
|
||||||
@ -133,6 +134,7 @@ This package contains html and pdf documentation for GDAL.
|
|||||||
%patch1 -p0 -b .mysql~
|
%patch1 -p0 -b .mysql~
|
||||||
%patch2 -p1 -b .bindir~
|
%patch2 -p1 -b .bindir~
|
||||||
%patch3 -p1 -b .AIS~
|
%patch3 -p1 -b .AIS~
|
||||||
|
%patch4 -p1 -b .xcompiler
|
||||||
|
|
||||||
# unpack test cases also.
|
# unpack test cases also.
|
||||||
tar -xzf %{SOURCE1}
|
tar -xzf %{SOURCE1}
|
||||||
@ -381,13 +383,17 @@ install -p -m 644 latex/class*.pdf docs/docs-%{cpuarch}/
|
|||||||
install -p -m 644 ogr/latex/refman.pdf docs/docs-%{cpuarch}/pdf/ogr/
|
install -p -m 644 ogr/latex/refman.pdf docs/docs-%{cpuarch}/pdf/ogr/
|
||||||
install -p -m 644 ogr/latex/class*.pdf docs/docs-%{cpuarch}/pdf/ogr/
|
install -p -m 644 ogr/latex/class*.pdf docs/docs-%{cpuarch}/pdf/ogr/
|
||||||
install -p -m 644 ogr/ogrsf_frmts/latex/refman.pdf docs/docs-%{cpuarch}/pdf/ogrsf_frmts/
|
install -p -m 644 ogr/ogrsf_frmts/latex/refman.pdf docs/docs-%{cpuarch}/pdf/ogrsf_frmts/
|
||||||
|
%ifnarch ppc ppc64
|
||||||
install -p -m 644 ogr/ogrsf_frmts/dgn/latex/refman.pdf docs/docs-%{cpuarch}/pdf/ogrsf_frmts/dgn/
|
install -p -m 644 ogr/ogrsf_frmts/dgn/latex/refman.pdf docs/docs-%{cpuarch}/pdf/ogrsf_frmts/dgn/
|
||||||
|
%endif
|
||||||
%if "%{?dist}" != ".el4"
|
%if "%{?dist}" != ".el4"
|
||||||
# broken on el4
|
# broken on el4
|
||||||
install -p -m 644 frmts/gxf/latex/refman.pdf docs/docs-%{cpuarch}/pdf/frmts/gxf/
|
install -p -m 644 frmts/gxf/latex/refman.pdf docs/docs-%{cpuarch}/pdf/frmts/gxf/
|
||||||
install -p -m 644 frmts/sdts/latex/class*.pdf docs/docs-%{cpuarch}/pdf/frmts/gxf/
|
install -p -m 644 frmts/sdts/latex/class*.pdf docs/docs-%{cpuarch}/pdf/frmts/gxf/
|
||||||
%endif
|
%endif
|
||||||
|
%ifnarch ppc ppc64
|
||||||
install -p -m 644 frmts/sdts/latex/refman.pdf docs/docs-%{cpuarch}/pdf/frmts/sdts/
|
install -p -m 644 frmts/sdts/latex/refman.pdf docs/docs-%{cpuarch}/pdf/frmts/sdts/
|
||||||
|
%endif
|
||||||
install -p -m 644 frmts/iso8211/latex/refman.pdf docs/docs-%{cpuarch}/pdf/frmts/iso8211/
|
install -p -m 644 frmts/iso8211/latex/refman.pdf docs/docs-%{cpuarch}/pdf/frmts/iso8211/
|
||||||
mkdir -p doc/docs-perl/docs-%{cpuarch}/pdf
|
mkdir -p doc/docs-perl/docs-%{cpuarch}/pdf
|
||||||
install -p -m 644 swig/perl/latex/refman.pdf doc/docs-perl/docs-%{cpuarch}/pdf
|
install -p -m 644 swig/perl/latex/refman.pdf doc/docs-perl/docs-%{cpuarch}/pdf
|
||||||
@ -586,6 +592,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%doc docs
|
%doc docs
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Mar 16 2011 Karsten Hopp <karsten@redhat.com> 1.7.3-3.1
|
||||||
|
- current gcc doesn't accept -Xcompiler
|
||||||
|
- some pdf's don't build on ppc, ignore them atm.
|
||||||
|
|
||||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.3-3
|
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.3-3
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user