ppisar pushed to perl (master). "Use perl_version macro for libperl.so mangling (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Mar 25 16:28:29 UTC 2015
>From 5516d6aa305363f14e4345bebb7952bed3f551eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
Date: Wed, 25 Mar 2015 16:59:05 +0100
Subject: Use perl_version macro for libperl.so mangling
%{version} changes with each sub-package definition. Use
%{perl_version} for renaming and symlinking libperl.so.
diff --git a/perl.spec b/perl.spec
index 9137537..04a8c42 100644
--- a/perl.spec
+++ b/perl.spec
@@ -2188,14 +2188,14 @@ make install DESTDIR=$RPM_BUILD_ROOT
%{build_bindir}/perl
# Make proper DSO names, move libperl to standard path.
-%global soname libperl.so.%(echo '%{version}' | sed 's/^\\([^.]*\\.[^.]*\\).*/\\1/')
+%global soname libperl.so.%(echo '%{perl_version}' | sed 's/^\\([^.]*\\.[^.]*\\).*/\\1/')
mv "%{build_archlib}/CORE/libperl.so" \
- "$RPM_BUILD_ROOT%{_libdir}/libperl.so.%{version}"
-ln -s "libperl.so.%{version}" "$RPM_BUILD_ROOT%{_libdir}/%{soname}"
-ln -s "libperl.so.%{version}" "$RPM_BUILD_ROOT%{_libdir}/libperl.so"
+ "$RPM_BUILD_ROOT%{_libdir}/libperl.so.%{perl_version}"
+ln -s "libperl.so.%{perl_version}" "$RPM_BUILD_ROOT%{_libdir}/%{soname}"
+ln -s "libperl.so.%{perl_version}" "$RPM_BUILD_ROOT%{_libdir}/libperl.so"
# XXX: Keep symlink from original location because various code glues
# $archlib/CORE/$libperl to get the DSO.
-ln -s "../../libperl.so.%{version}" "%{build_archlib}/CORE/libperl.so"
+ln -s "../../libperl.so.%{perl_version}" "%{build_archlib}/CORE/libperl.so"
install -p -m 755 utils/pl2pm %{build_bindir}/pl2pm
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/perl.git/commit/?h=master&id=5516d6aa305363f14e4345bebb7952bed3f551eb
More information about the scm-commits
mailing list