OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Oct-2005 08:50:23
Branch: HEAD Handle: 2005101107502300
Added files:
openpkg-src/libdbi libdbi.patch
Modified files:
openpkg-src/libdbi libdbi.spec
Log:
remove CFLAGS fiddling to allow it building
Summary:
Revision Changes Path
1.1 +91 -0 openpkg-src/libdbi/libdbi.patch
1.8 +3 -1 openpkg-src/libdbi/libdbi.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/libdbi/libdbi.patch
============================================================================
$ cvs diff -u -r0 -r1.1 libdbi.patch
--- /dev/null 2005-10-11 08:50:16 +0200
+++ libdbi.patch 2005-10-11 08:50:23 +0200
@@ -0,0 +1,91 @@
+Index: libdbi-0.8.1/configure
+--- libdbi-0.8.1/configure.orig 2005-09-28 21:01:35 +0200
++++ libdbi-0.8.1/configure 2005-10-11 08:43:10 +0200
+@@ -19221,41 +19221,6 @@
+
+
+
+-if test -z "$GCC"; then
+- case $host in
+- *-*-irix*)
+- if test -z "$CC"; then
+- CC=cc
+- fi
+- DEBUG="-g -signed"
+- CFLAGS="-O2 -w -signed"
+- PROFILE="-p -g3 -O2 -signed" ;;
+- sparc-sun-solaris*)
+- DEBUG="-v -g"
+- CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
+- PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92
-Dsuncc" ;;
+- *)
+- DEBUG="-g"
+- CFLAGS="-O"
+- PROFILE="-g -p" ;;
+- esac
+-else
+-
+- case $host in
+- *-*-linux*)
+- DEBUG="-g -Wall -D_REENTRANT -D__NO_MATH_INLINES
-fsigned-char -std=gnu99"
+- CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char
-std=gnu99"
+- PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char
-std=gnu99";;
+- sparc-sun-*)
+- DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -mv8
-std=gnu99"
+- CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char
-mv8 -std=gnu99"
+- PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8
-std=gnu99" ;;
+- *)
+- DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char
-std=gnu99"
+- CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char -std=gnu99"
+- PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char
-std=gnu99" ;;
+- esac
+-fi
+
+
+
+Index: libdbi-drivers-0.8.1/configure
+--- libdbi-drivers-0.8.1/configure.orig 2005-09-20 20:45:26 +0200
++++ libdbi-drivers-0.8.1/configure 2005-10-11 08:42:04 +0200
+@@ -19247,42 +19247,6 @@
+
+
+
+-if test -z "$GCC"; then
+- case $host in
+- *-*-irix*)
+- if test -z "$CC"; then
+- CC=cc
+- fi
+- DEBUG="-g -signed"
+- CFLAGS="-O2 -w -signed"
+- PROFILE="-p -g3 -O2 -signed" ;;
+- sparc-sun-solaris*)
+- DEBUG="-v -g"
+- CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
+- PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92
-Dsuncc" ;;
+- *)
+- DEBUG="-g"
+- CFLAGS="-O"
+- PROFILE="-g -p" ;;
+- esac
+-else
+-
+- case $host in
+- *-*-linux*)
+- DEBUG="-g -Wall -D_REENTRANT -D__NO_MATH_INLINES
-fsigned-char"
+- CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char"
+- PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT
-fsigned-char";;
+- sparc-sun-*)
+- DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -mv8"
+- CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char
-mv8"
+- PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char
-mv8" ;;
+- *)
+- DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
+- CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
+- PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
+- esac
+-fi
+-
+
+
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libdbi/libdbi.spec
============================================================================
$ cvs diff -u -r1.7 -r1.8 libdbi.spec
--- openpkg-src/libdbi/libdbi.spec 29 Sep 2005 11:22:39 -0000 1.7
+++ openpkg-src/libdbi/libdbi.spec 11 Oct 2005 06:50:23 -0000 1.8
@@ -37,7 +37,7 @@
Group: Database
License: LGPL
Version: %{V_dbi}
-Release: 20050929
+Release: 20051011
# package options
%option with_sqlite yes
@@ -47,6 +47,7 @@
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/libdbi/libdbi-%{V_dbi}.tar.gz
Source1:
http://osdn.dl.sourceforge.net/sourceforge/libdbi-drivers/libdbi-drivers-%{V_dbi_drivers}.tar.gz
+Patch0: libdbi.patch
# build information
Prefix: %{l_prefix}
@@ -90,6 +91,7 @@
%prep
%setup -q -c
%setup -q -D -T -a 1
+ %patch -p0
%build
( cd libdbi-%{V_dbi}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]