OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 13-Aug-2003 21:32:40
Branch: HEAD Handle: 2003081320323801
Modified files:
openpkg-src/unixodbc unixodbc.spec
openpkg-web news.txt
Log:
do a quick hack to allow Christoph to proceed: provide shared
libraries in an ad-hoc fashion by building and installing twice --
once with and once without shared libraries. This way we at least have
shared variants of the libs under <prefix>/lib/unixodbc/ for manual
loading as DSOs. Please feel free to revise this ugly way of building
by a more elegant solution. But until we have such a solution, let us
stick with this for now.
Summary:
Revision Changes Path
1.37 +47 -15 openpkg-src/unixodbc/unixodbc.spec
1.6160 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/unixodbc/unixodbc.spec
============================================================================
$ cvs diff -u -r1.36 -r1.37 unixodbc.spec
--- openpkg-src/unixodbc/unixodbc.spec 21 Jul 2003 18:15:41 -0000 1.36
+++ openpkg-src/unixodbc/unixodbc.spec 13 Aug 2003 19:32:39 -0000 1.37
@@ -33,7 +33,7 @@
Group: Database
License: GPL
Version: 2.2.6
-Release: 20030721
+Release: 20030813
# list of sources
Source0: http://www.unixodbc.org/unixODBC-%{version}.tar.gz
@@ -53,24 +53,56 @@
%setup -q -n unixODBC-%{version}
%build
- CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O}" \
- LDFLAGS="%{l_ldflags}" \
- ./configure \
- --prefix=%{l_prefix} \
- --sysconfdir=%{l_prefix}/etc/unixodbc \
- --disable-gui \
- --disable-shared \
- --enable-threads
- %{l_make} %{l_mflags -O}
%install
rm -rf $RPM_BUILD_ROOT
- %{l_make} %{l_mflags} install \
- prefix=$RPM_BUILD_ROOT%{l_prefix} \
- exec_prefix=$RPM_BUILD_ROOT%{l_prefix} \
- sysconfdir=$RPM_BUILD_ROOT%{l_prefix}/etc/unixodbc
+
+ # shared functions for configuring, building and installing
+ configure () {
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O}" \
+ LDFLAGS="%{l_ldflags}" \
+ ./configure \
+ --prefix=%{l_prefix} \
+ --sysconfdir=%{l_prefix}/etc/unixodbc \
+ --disable-gui \
+ --enable-threads \
+ $@
+ }
+ build () {
+ %{l_make} %{l_mflags -O}
+ }
+ install () {
+ %{l_make} %{l_mflags} install \
+ prefix=$RPM_BUILD_ROOT%{l_prefix} \
+ exec_prefix=$RPM_BUILD_ROOT%{l_prefix} \
+ sysconfdir=$RPM_BUILD_ROOT%{l_prefix}/etc/unixodbc
+ }
+ cleanup () {
+ %{l_make} %{l_mflags -O} distclean
+ }
+
+ # configure and install package with both static and shared libraries
+ configure --enable-static --enable-shared
+ build
+ install
+ cleanup
+
+ # remember the shared library versions separately
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/unixodbc
+ mv $RPM_BUILD_ROOT%{l_prefix}/lib/lib*.so* \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/unixodbc/
+
+ # configure and install package with static libraries only
+ configure --enable-static --disable-shared
+ build
+ install
+
+ # strip down installation
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+
+ # determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6159 -r1.6160 news.txt
--- openpkg-web/news.txt 13 Aug 2003 18:17:08 -0000 1.6159
+++ openpkg-web/news.txt 13 Aug 2003 19:32:38 -0000 1.6160
@@ -1,3 +1,4 @@
+13-Aug-2003: Upgraded package: P<unixodbc-2.2.6-20030813>
13-Aug-2003: Upgraded package: P<uvscan-4.1.6.4285-20030813>
13-Aug-2003: Upgraded package: P<netrik-1.11-20030813>
13-Aug-2003: Upgraded package: P<perl-util-20030813-20030813>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
