[firebird] replace several ppc64 special cases with just one
Karsten Hopp
karsten at fedoraproject.org
Wed Jan 26 16:24:43 UTC 2011
commit 2d759cf8866cca4521217f7bf10fb21c37aaf3de
Author: Karsten Hopp <karsten at redhat.com>
Date: Wed Jan 26 17:23:54 2011 +0100
replace several ppc64 special cases with just one
firebird.spec | 20 ++++----------------
1 files changed, 4 insertions(+), 16 deletions(-)
---
diff --git a/firebird.spec b/firebird.spec
index e87786d..8a16f4c 100644
--- a/firebird.spec
+++ b/firebird.spec
@@ -163,9 +163,6 @@ export CFLAGS='-m32'
export LDFLAGS='-m32'
%endif
-#ifarch ppc64
-#autoreconf -vfi
-#endif
NOCONFIGURE=1 ./autogen.sh
#%configure --prefix=%{fbroot} --with-system-icu --with-system-editline \
%configure --prefix=%{fbroot} --with-system-icu --with-system-editline \
@@ -190,18 +187,10 @@ sed "s at chown@echo ""# chown at g" -i ./install/makeInstallImage.sh
sed "s at chmod@echo ""# chmod at g" -i ./install/makeInstallImage.sh
./install/makeInstallImage.sh
-# here we patch a bug in the configure script
-%ifarch ppc64
-mv -f ./buildroot/usr/lib/* ./buildroot/%{_libdir}
-%endif
-
mv ./buildroot/ buildroot-classic
cd ..
# superserver
-#ifarch ppc64
-#autoreconf -vfi
-#endif
%configure --prefix=%{fbroot} --with-system-icu --with-system-editline --enable-superserver \
--with-fbbin=%{fbroot}/bin-superserver --with-fbinclude=%{_includedir}/%{name} \
--with-fbsbin=%{_sbindir} --with-fbconf=%{_sysconfdir}/%{name} --with-fblib=%{_libdir} \
@@ -226,11 +215,6 @@ sed "s at chown@echo ""# chown at g" -i ./install/makeInstallImage.sh
sed "s at chmod@echo ""# chmod at g" -i ./install/makeInstallImage.sh
./install/makeInstallImage.sh
-# here we patch a bug in the configure script
-%ifarch ppc64
-mv -f ./buildroot/usr/lib/* ./buildroot/%{_libdir}
-%endif
-
%install
# we wanted to setup both Classic and Superserver, we need to do all here
@@ -289,6 +273,10 @@ cp -d %{_builddir}/%{pkgname}/gen/buildroot%{fbroot}/intl/fbintl %{buildroot}%{f
cp -d %{_builddir}/%{pkgname}/gen/buildroot%{fbroot}/intl/fbintl.conf %{buildroot}%{_sysconfdir}/%{name}/fbintl.conf
ln -s %{_sysconfdir}/%{name}/fbintl.conf .%{fbroot}/intl/fbintl.conf
+# here we patch a bug in the configure script
+%ifarch ppc64
+cp %{_builddir}/%{pkgname}/gen/firebird/lib/libfbclient.so.2.5.0 %{buildroot}%{_libdir}
+%endif
cd %{buildroot}%{_libdir}
ln -s libfbclient.so libgds.so
More information about the scm-commits
mailing list