rpms/unixODBC
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Clean up bogosity in multilib stub header support

Browse Source
This commit is contained in:
Tom Lane 2009-10-16 03:57:02 +00:00
parent e4e675f059
commit d24cfbe948
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
conffile.h
View File

@ -4,13 +4,14 @@
* identical. Hence, this file is architecture-independent and calls * identical. Hence, this file is architecture-independent and calls
* in an arch-dependent file that will appear in just one RPM. * in an arch-dependent file that will appear in just one RPM.
* *
* To avoid breaking arches not explicitly supported by Red Hat, we
* use this indirection file *only* on known multilib arches.
*
* Note: this may well fail if user tries to use gcc's -I- option. * Note: this may well fail if user tries to use gcc's -I- option.
* But that option is deprecated anyway. * But that option is deprecated anyway.
*/ */
#if defined(__x86_64__) #if defined(__x86_64__)
#include "CONFFILE_x86_64.h" #include "CONFFILE_x86_64.h"
#elif defined(__ia64__)
#include "CONFFILE_ia64.h"
#elif defined(__i386__) #elif defined(__i386__)
#include "CONFFILE_i386.h" #include "CONFFILE_i386.h"
#elif defined(__ppc64__) || defined(__powerpc64__) #elif defined(__ppc64__) || defined(__powerpc64__)

8
unixODBC.spec
View File

@ -1,7 +1,7 @@
Summary: A complete ODBC driver manager for Linux Summary: A complete ODBC driver manager for Linux
Name: unixODBC Name: unixODBC
Version: 2.2.14 Version: 2.2.14
Release: 6%{?dist} Release: 7%{?dist}
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.unixODBC.org/ URL: http://www.unixODBC.org/
# Programs are GPL, libraries are LGPL, except News Server library is GPL. # Programs are GPL, libraries are LGPL, except News Server library is GPL.
@ -111,7 +111,7 @@ desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}
# multilib header hacks # multilib header hacks
# we only apply this to known Red Hat multilib arches, per bug #181335 # we only apply this to known Red Hat multilib arches, per bug #181335
case `uname -i` in case `uname -i` in
i386 | x86_64 | ppc | ppc64 | s390 | s390x | sparc | sparcv9 | sparc64 ) i386 | x86_64 | ppc | ppc64 | s390 | s390x | sparc | sparc64 )
mv $RPM_BUILD_ROOT%{_includedir}/unixodbc_conf.h $RPM_BUILD_ROOT%{_includedir}/unixodbc_conf_`uname -i`.h mv $RPM_BUILD_ROOT%{_includedir}/unixodbc_conf.h $RPM_BUILD_ROOT%{_includedir}/unixodbc_conf_`uname -i`.h
rm -f unixodbc_conf.h rm -f unixodbc_conf.h
sed s/CONFFILE/unixodbc_conf/ %{SOURCE4} >unixodbc_conf.h sed s/CONFFILE/unixodbc_conf/ %{SOURCE4} >unixodbc_conf.h
@ -183,6 +183,10 @@ rm -rf $RPM_BUILD_ROOT
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%changelog %changelog
* Thu Oct 15 2009 Tom Lane <tgl@redhat.com> 2.2.14-7
- Clean up bogosity in multilib stub header support: ia64 should not be
listed (it's not multilib), sparcv9 isn't a possible uname -i output
* Fri Aug 21 2009 Tom Lane <tgl@redhat.com> 2.2.14-6 * Fri Aug 21 2009 Tom Lane <tgl@redhat.com> 2.2.14-6
- Switch to building against qt4, not qt3. This means the DataManager, - Switch to building against qt4, not qt3. This means the DataManager,
DataManagerII, and odbctest applications are gone. DataManagerII, and odbctest applications are gone.