OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 14-Aug-2003 10:59:15
Branch: HEAD Handle: 2003081409591401
Modified files:
openpkg-src/unixodbc unixodbc.spec
openpkg-web news.txt
Log:
also create shared libraries, keep programs linked static, drop all
drivers
Summary:
Revision Changes Path
1.38 +22 -42 openpkg-src/unixodbc/unixodbc.spec
1.6164 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/unixodbc/unixodbc.spec
============================================================================
$ cvs diff -u -r1.37 -r1.38 unixodbc.spec
--- openpkg-src/unixodbc/unixodbc.spec 13 Aug 2003 19:32:39 -0000 1.37
+++ openpkg-src/unixodbc/unixodbc.spec 14 Aug 2003 08:59:15 -0000 1.38
@@ -33,7 +33,7 @@
Group: Database
License: GPL
Version: 2.2.6
-Release: 20030813
+Release: 20030814
# list of sources
Source0: http://www.unixodbc.org/unixODBC-%{version}.tar.gz
@@ -53,51 +53,31 @@
%setup -q -n unixODBC-%{version}
%build
+ %{l_shtool} subst \
+ -e 's;\(--mode=link $(CCLD)\);\1 -all-static;' \
+ exe/Makefile.in
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O}" \
+ LDFLAGS="%{l_ldflags}" \
+ ./configure \
+ --prefix=%{l_prefix} \
+ --sysconfdir=%{l_prefix}/etc/unixodbc \
+ --disable-gui \
+ --disable-drivers \
+ --enable-threads \
+ --enable-static \
+ --with-pic \
+ --enable-shared \
+ --without-pth
+ %{l_make} %{l_mflags -O}
%install
rm -rf $RPM_BUILD_ROOT
- # 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
+ %{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
# strip down installation
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6163 -r1.6164 news.txt
--- openpkg-web/news.txt 14 Aug 2003 06:58:05 -0000 1.6163
+++ openpkg-web/news.txt 14 Aug 2003 08:59:14 -0000 1.6164
@@ -1,3 +1,4 @@
+14-Aug-2003: Upgraded package: P<unixodbc-2.2.6-20030814>
14-Aug-2003: Upgraded package: P<grepmail-5.10-20030814>
14-Aug-2003: Upgraded package: P<perl-mail-20030814-20030814>
13-Aug-2003: Upgraded package: P<gcc34-3.4s20030813-20030813>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
