SHA256
1
0
forked from pool/perl

bring back NDBM_File [bnc#732929]

OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl?expand=0&rev=71
This commit is contained in:
Michael Schröder 2012-01-13 13:51:12 +00:00 committed by Git OBS Bridge
parent 010ac578a4
commit ed93e17003
3 changed files with 16 additions and 23 deletions

View File

@ -372,16 +372,6 @@
+# module, so add cccdlflags if we're going for a shared libperl +# module, so add cccdlflags if we're going for a shared libperl
+$self->{CCFLAGS} = ($self->{CCFLAGS} || $Config{ccflags}) . " $Config{cccdlflags}" if $Config{'useshrplib'} eq 'true'; +$self->{CCFLAGS} = ($self->{CCFLAGS} || $Config{ccflags}) . " $Config{cccdlflags}" if $Config{'useshrplib'} eq 'true';
1; 1;
--- ./ext/NDBM_File/Makefile.PL.orig 2011-04-13 11:36:34.000000000 +0000
+++ ./ext/NDBM_File/Makefile.PL 2011-06-17 09:05:57.000000000 +0000
@@ -2,6 +2,7 @@ use ExtUtils::MakeMaker;
WriteMakefile(
NAME => 'NDBM_File',
LIBS => ["-L/usr/local/lib -lndbm", "-ldbm -lucb"],
+ CCFLAGS => '-I/usr/include/db1 -Dbool=char -DHAS_BOOL',
XSPROTOARG => '-noprototypes', # XXX remove later?
VERSION_FROM => 'NDBM_File.pm',
INC => ($^O eq "MacOS" ? "-i ::::db:include" : "")
--- ./ext/ODBM_File/Makefile.PL.orig 2011-04-13 11:36:34.000000000 +0000 --- ./ext/ODBM_File/Makefile.PL.orig 2011-04-13 11:36:34.000000000 +0000
+++ ./ext/ODBM_File/Makefile.PL 2011-06-17 09:05:57.000000000 +0000 +++ ./ext/ODBM_File/Makefile.PL 2011-06-17 09:05:57.000000000 +0000
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jan 13 14:50:25 CET 2012 - mls@suse.de
- bring back NDBM_File [bnc#732929]
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 25 15:20:26 CEST 2011 - mls@suse.de Tue Oct 25 15:20:26 CEST 2011 - mls@suse.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package perl # spec file for package perl
# #
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -14,18 +14,16 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# icecream 0 # icecream 0
Name: perl Name: perl
Summary: The Perl interpreter Summary: The Perl interpreter
Version: 5.14.2
Release: 1
%define pversion 5.14.2
License: Artistic-1.0 ; GPL-2.0+ License: Artistic-1.0 ; GPL-2.0+
Group: Development/Languages/Perl Group: Development/Languages/Perl
AutoReqProv: on Version: 5.14.2
Release: 0
%define pversion 5.14.2
Url: http://www.perl.org/ Url: http://www.perl.org/
Source: perl-5.14.2.tar.bz2 Source: perl-5.14.2.tar.bz2
Source1: %name-rpmlintrc Source1: %name-rpmlintrc
@ -43,7 +41,11 @@ Patch7: perl-cbuilder-ccflags.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: perl-base = %version PreReq: perl-base = %version
#PreReq: %fillup_prereq #PreReq: %fillup_prereq
BuildRequires: db-devel gdbm-devel libbz2-devel ncurses-devel zlib-devel BuildRequires: db-devel
BuildRequires: gdbm-devel
BuildRequires: libbz2-devel
BuildRequires: ncurses-devel
BuildRequires: zlib-devel
#Requires: gzip # needed in SuSEconfig.perl #Requires: gzip # needed in SuSEconfig.perl
Suggests: perl-doc = %version Suggests: perl-doc = %version
# #
@ -86,8 +88,6 @@ Some of the modules available on CPAN can be found in the "perl"
series. series.
%package base %package base
License: Artistic-1.0 ; GPL-2.0+
Group: Development/Languages/Perl
Summary: The Perl interpreter Summary: The Perl interpreter
Provides: perl-Digest perl-Digest-MD5 Provides: perl-Digest perl-Digest-MD5
%if "%version" != "%pversion" %if "%version" != "%pversion"
@ -113,8 +113,6 @@ This package contains only some basic modules and the perl binary
itself. itself.
%package doc %package doc
License: Artistic-1.0 ; GPL-2.0+
Group: Development/Languages/Perl
Summary: Perl Documentation Summary: Perl Documentation
Requires: perl = %{version} Requires: perl = %{version}
Provides: perl:/usr/share/man/man3/CORE.3pm.gz Provides: perl:/usr/share/man/man3/CORE.3pm.gz
@ -155,7 +153,7 @@ options="$options -Duse64bitint"
options="$options -Accflags='-DPERL_USE_SAFE_PUTENV'" options="$options -Accflags='-DPERL_USE_SAFE_PUTENV'"
options="$options -Dotherlibdirs=/usr/lib/perl5/site_perl" options="$options -Dotherlibdirs=/usr/lib/perl5/site_perl"
chmod 755 ./configure.gnu chmod 755 ./configure.gnu
./configure.gnu --prefix=/usr -Dvendorprefix=/usr -Dinstallusrbinperl -Dusethreads -Di_db -Di_dbm -Di_ndbm -Di_gdbm -Duseshrplib=\'true\' $options ./configure.gnu --prefix=/usr -Dvendorprefix=/usr -Dinstallusrbinperl -Dusethreads -Di_db -Di_dbm -Di_ndbm -Di_gdbm -Dd_dbm_open -Duseshrplib=\'true\' $options
make %{?_smp_mflags} make %{?_smp_mflags}
cp -p libperl.so savelibperl.so cp -p libperl.so savelibperl.so
cp -p lib/Config.pm saveConfig.pm cp -p lib/Config.pm saveConfig.pm
@ -164,7 +162,7 @@ make clean > /dev/null
make clobber make clobber
rm -rf lib rm -rf lib
mv savelib lib mv savelib lib
./configure.gnu --prefix=/usr -Dvendorprefix=/usr -Dinstallusrbinperl -Dusethreads -Di_db -Di_dbm -Di_ndbm -Di_gdbm $options ./configure.gnu --prefix=/usr -Dvendorprefix=/usr -Dinstallusrbinperl -Dusethreads -Di_db -Di_dbm -Di_ndbm -Di_gdbm -Dd_dbm_open $options
make %{?_smp_mflags} make %{?_smp_mflags}
%check %check