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: 16-Nov-2005 20:55:51
Branch: OPENPKG_2_5_SOLID Handle: 2005111619555000
Added files: (Branch: OPENPKG_2_5_SOLID)
openpkg-src/perl-db perl-db.patch
Modified files: (Branch: OPENPKG_2_5_SOLID)
openpkg-src/perl-db perl-db.spec
Log:
MFC: fix linking of DB_File and BerkeleyDB modules under Solaris
(where OS librt is required because of fdatasync call in OpenPKG's
libdb)
Summary:
Revision Changes Path
1.2.2.2 +25 -0 openpkg-src/perl-db/perl-db.patch
1.56.2.2 +3 -1 openpkg-src/perl-db/perl-db.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/perl-db/perl-db.patch
============================================================================
$ cvs diff -u -r0 -r1.2.2.2 perl-db.patch
--- /dev/null 2005-11-16 20:55:49 +0100
+++ perl-db.patch 2005-11-16 20:55:51 +0100
@@ -0,0 +1,25 @@
+Index: BerkeleyDB-0.26/Makefile.PL
+--- BerkeleyDB-0.26/Makefile.PL.orig 2005-08-31 23:30:09.000000000 +0200
++++ BerkeleyDB-0.26/Makefile.PL 2005-11-16 20:50:32.640927202 +0100
+@@ -32,6 +32,9 @@
+ else {
+ if ($^O eq 'MSWin32')
+ { $LIBS = '-llibdb' }
++ elsif ($^O =~ /solaris/i ) {
++ $LIBS .= '-ldb -lrt';
++ }
+ elsif ($^O =~ /aix/i ) {
+ $LIBS .= '-ldb -lpthread ';
+ if ($Config{'cc'} eq 'gcc' && $Config{'osvers'} eq '5.1')
+Index: DB_File-1.812/Makefile.PL
+--- DB_File-1.812/Makefile.PL.orig 2005-08-31 23:29:18.000000000 +0200
++++ DB_File-1.812/Makefile.PL 2005-11-16 20:50:32.640641367 +0100
+@@ -29,7 +29,7 @@
+ }
+
+ # Solaris is special.
+-#$LIBS .= " -lthread" if $^O eq 'solaris' ;
++$LIBS .= " -lrt" if $^O eq 'solaris' ;
+
+ # AIX is special.
+ $LIBS .= " -lpthread" if $^O eq 'aix' ;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl-db/perl-db.spec
============================================================================
$ cvs diff -u -r1.56.2.1 -r1.56.2.2 perl-db.spec
--- openpkg-src/perl-db/perl-db.spec 11 Oct 2005 12:51:15 -0000 1.56.2.1
+++ openpkg-src/perl-db/perl-db.spec 16 Nov 2005 19:55:50 -0000 1.56.2.2
@@ -39,12 +39,13 @@
Group: Language
License: GPL/Artistic
Version: %{V_perl}
-Release: 2.5.0
+Release: 2.5.1
# list of sources
Source0:
http://www.cpan.org/modules/by-module/BerkeleyDB/BerkeleyDB-%{V_berkeleydb}.tar.gz
Source1:
http://www.cpan.org/modules/by-module/DB_File/DB_File-%{V_db_file}.tar.gz
Source2:
http://www.cpan.org/modules/by-module/DB_File/DB_File-Lock-%{V_db_file_lock}.tar.gz
+Patch0: perl-db.patch
# build information
Prefix: %{l_prefix}
@@ -83,6 +84,7 @@
%setup -q -c
%setup -q -T -D -a 1
%setup -q -T -D -a 2
+ %patch -p0
%build
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
