Re: [devel] Re: perl-5.8.0-alt0.5

["Dmitry V. Levin" <ldv@altlinux.org>]

[-- Attachment #1.1: Type: text/plain, Size: 506 bytes --]

On Thu, Oct 24, 2002 at 11:41:39PM +0400, at@turbinal.org wrote:
> > Нет, нужно проверять, что собирается не сам перл:
> > 
> > [ -z "${f##*/usr/lib/*libperl*.so}" -a -z "${f##*/usr/lib/perl*/*/Config.pm}" ]
> > 
> > -- тогда не надо.
> 
> Ой, не то написал. :)
> Возможно, ещё проще и правильнее будет проверять на /usr/bin/perl5*.
> Здесь, насколько я понимаю, проблема в том, что нужно принимать
> отложенное решение, а не для текущего файла.

Другой вариант, с добавлением параметра.
Годится?


--
ldv

[-- Attachment #1.2: linux.req.in.diff --]
[-- Type: text/plain, Size: 1403 bytes --]

Index: linux.req.in
===================================================================
RCS file: /home/cvs/cvsroot/rpm-4_0/autodeps/linux.req.in,v
retrieving revision 1.8
retrieving revision 1.10
diff -u -r1.8 -r1.10
--- linux.req.in	4 Oct 2002 22:45:05 -0000	1.8
+++ linux.req.in	25 Oct 2002 11:21:28 -0000	1.10
@@ -42,7 +42,9 @@
 FIND_LIBS=
 FIND_PAM=
 FIND_PERL=
+FIND_LIBPERL=
 FIND_SHELL=
+libperl_so=
 
 ParseMethod()
 {
@@ -54,14 +56,21 @@
 				FIND_LIBS=
 				FIND_PAM=
 				FIND_PERL=
+				FIND_LIBPERL=
 				FIND_SHELL=
 				;;
 			lib|library)
 				FIND_LIBS=1
 				;;
+			libperl)
+				FIND_LIBPERL=1
+				;;
 			nolib|nolibrary)
 				FIND_LIBS=
 				;;
+			nolibperl)
+				FIND_LIBPERL=
+				;;
 			files)
 				FIND_FILES=1
 				;;
@@ -76,9 +85,11 @@
 				;;
 			perl)
 				FIND_PERL=1
+				FIND_LIBPERL=1
 				;;
 			noperl)
 				FIND_PERL=
+				FIND_LIBPERL=
 				;;
 			sh|shell)
 				FIND_SHELL=1
@@ -91,6 +102,7 @@
 				FIND_LIBS=1
 				FIND_PAM=1
 				FIND_PERL=1
+				FIND_LIBPERL=1
 				FIND_SHELL=1
 				;;
 			default|yes|true)
@@ -195,6 +207,10 @@
 			(start_version==1) && (lib_name!="") && ($4!="") {print lib_name "(" $4 ")";}
 			/^$/ {start_shared=0; start_version=0;}
 		'
+		if [ -n "$FIND_LIBPERL" -a -z "$libperl_so" -a -z "${f##*/usr/lib/perl?/*/auto/*.so}" ]; then
+			libperl_so=`perl -MConfig -e 'print "$Config{libperl}\n"'`
+			echo "$libperl_so"
+		fi
 	fi
 }
 

[-- Attachment #1.3: perl58.spec.diff --]
[-- Type: text/plain, Size: 3582 bytes --]

--- perl58.spec.orig	2002-10-24 23:33:15 +0400
+++ perl58.spec	2002-10-25 15:30:48 +0400
@@ -1,12 +1,12 @@
 %define version         5.8.0
-%define release         alt0.6
+%define release         alt0.6.1
 %define oldversion      5.00800
 %define majver          5
 %define sover           5.8
 
 %define interp_compat_versions 5.6.1 5.6.0
 %define binary_compat_versions %nil
-%define doc_compat_release     alt0.6
+%define doc_compat_release     alt0.6.1
 
 Name: perl
 Epoch: 1
@@ -39,6 +39,8 @@
 Group: Development/Perl
 Packager: Alexey Tourbin <at@altlinux.ru>
 
+AutoReq: yes, nolibperl
+
 Provides: perl = 0:%oldversion
 PreReq: perl-base = 1:%version-%release
 Requires: initscripts >= 5.49-ipl13mdk
@@ -79,7 +81,9 @@
 %define interp_inc_version_list %interp_compat_versions
 %define binary_inc_version_list %(echo %binary_compat_versions | sed 's!\([0-9.]\+\)!\1/%perl_arch_os!g')
 
-BuildRequires: glibc-devel kernel-headers >= 2.2.18-ipl5mdk
+BuildPreReq: rpm-build >= 4.0.4-alt9, kernel-headers >= 2.2.18-ipl5mdk
+
+# XXX no automation yet:
 BuildRequires: libdb1-devel gdbm-devel sed
 
 # ftp://ftp.cpan.org/pub/CPAN/src/
@@ -136,6 +140,7 @@
 Group: Development/Perl
 Epoch: 1
 Version: %version
+AutoReq: yes, nolibperl
 PreReq: %_sysconfdir/rpm/macros.d
 Provides: perl-base = 0:%oldversion %_bindir/perl
 Provides: perl-version = 1:%version
@@ -151,27 +156,32 @@
 Group: Development/Perl
 Epoch: 1
 Version: %version
+AutoReq: yes, nolibperl
 Provides: perl-devel = 0:%oldversion
 PreReq: perl-base = 1:%version-%release
 
 %package suidperl
 Summary: suidperl, for use with setuid perl scripts
 Group: Development/Perl
+AutoReq: yes, nolibperl
 PreReq: perl-base = 1:%version-%release
 
 %package pod
 Summary: The Perl programming language (documentation in pod format)
 Group: Development/Perl
+AutoReq: yes, nolibperl
 PreReq: perl-base >= 1:%version-%doc_compat_release
 
 %package man1
 Summary: The Perl programming language (manual pages, man1 section)
 Group: Development/Perl
+AutoReq: yes, nolibperl
 PreReq: perl-base >= 1:%version-%doc_compat_release
 
 %package man3
 Summary: The Perl programming language (manual pages, man3 section)
 Group: Development/Perl
+AutoReq: yes, nolibperl
 PreReq: perl-base >= 1:%version-%doc_compat_release
 
 %description
@@ -347,7 +357,7 @@
 
 # relocate libperl.so.%sover
 mkdir -p $RPM_BUILD_ROOT%_libdir
-cp -a $RPM_BUILD_ROOT%archlib/CORE/libperl.so.%sover $RPM_BUILD_ROOT%_libdir
+cp -a $RPM_BUILD_ROOT%archlib/CORE/libperl.so.%sover $RPM_BUILD_ROOT%_libdir/
 ln -sf libperl.so.%sover $RPM_BUILD_ROOT%_libdir/libperl.so
 
 # Generate *.ph files with a trick. Is this sick or what ?
@@ -393,13 +403,13 @@
 %pre base
 cd %privlib 2>/dev/null || exit 0
 if [ -d %_target -a ! -L %_target -a ! -e %_target.rpmsave ]; then
-	mv %_target %_target.rpmsave && ln -s %_target.rpmsave %_target ||:
+	%__mv %_target %_target.rpmsave && ln -s %_target.rpmsave %_target ||:
 fi
 
 %pre
 cd %privlib/site_perl/%version 2>/dev/null || exit 0
 if [ -d %_target -a ! -L %_target -a ! -e %_target.rpmsave ]; then
-	mv %_target %_target.rpmsave && ln -s %_target.rpmsave %_target ||:
+	%__mv %_target %_target.rpmsave && %__ln_s %_target.rpmsave %_target ||:
 fi
 %endif
 %endif
@@ -999,6 +1009,9 @@
 	%_man3dir/*
 
 %changelog
+* Fri Oct 25 2002 Dmitry V. Levin <ldv@altlinux.org> 1:5.8.0-alt0.6.1
+- Build without libperl dependency autodetection.
+
 * Wed Oct 24 2002 Alexey Tourbin <at@altlinux.ru> 1:5.8.0-alt0.6
 - separate packages: perl-CPAN, perl-libnet
 - provides, obsoletes: perl-Digest-MD5, perl-Time-HiRes (perl-base)

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]