Control: tag -1 + patch On Thu, 26 Jun 2014 21:42:42 +0300, Niko Tyni wrote:
> This package fails to build with perl_5.20.0-1 from experimental:
>
> dh_install
> cp: cannot stat 'debian/tmp/debian/tmp/usr/lib/perl5/auto/stfl/stfl.so': No
> such file or directory
> dh_install: cp -a debian/tmp/debian/tmp/usr/lib/perl5/auto/stfl/stfl.so
> debian/libstfl-perl//usr/lib/perl5/auto/stfl/ returned exit code 1
> make: *** [binary-arch] Error 2
Attached is a debdiff using debian/libstfl-perl.install.in, and
replacing the placeholder with $Config{vendorarch} during build.
Cheers,
gregor
--
.''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
: :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/
`. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
`- NP: Beatles
diff -Nru stfl-0.22/debian/changelog stfl-0.22/debian/changelog
--- stfl-0.22/debian/changelog 2014-02-12 02:07:22.000000000 +0100
+++ stfl-0.22/debian/changelog 2014-07-05 15:00:40.000000000 +0200
@@ -1,3 +1,14 @@
+stfl (0.22-1.2) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix "hardcodes /usr/lib/perl5":
+ - remove debian/libstfl-perl.dirs, not needed
+ - create debian/libstfl-perl.install during build, using
+ $Config{vendorarch}
+ (Closes: #752815)
+
+ -- gregor herrmann <gre...@debian.org> Sat, 05 Jul 2014 14:44:58 +0200
+
stfl (0.22-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru stfl-0.22/debian/libstfl-perl.dirs stfl-0.22/debian/libstfl-perl.dirs
--- stfl-0.22/debian/libstfl-perl.dirs 2011-10-25 16:22:53.000000000 +0200
+++ stfl-0.22/debian/libstfl-perl.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-/usr/lib/perl5
-/usr/lib/perl5/auto/stfl
diff -Nru stfl-0.22/debian/libstfl-perl.install stfl-0.22/debian/libstfl-perl.install
--- stfl-0.22/debian/libstfl-perl.install 2011-10-25 16:22:53.000000000 +0200
+++ stfl-0.22/debian/libstfl-perl.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/perl5/auto/stfl/stfl.so
-debian/tmp/usr/lib/perl5/stfl.pm
diff -Nru stfl-0.22/debian/libstfl-perl.install.in stfl-0.22/debian/libstfl-perl.install.in
--- stfl-0.22/debian/libstfl-perl.install.in 1970-01-01 01:00:00.000000000 +0100
+++ stfl-0.22/debian/libstfl-perl.install.in 2014-07-05 14:54:57.000000000 +0200
@@ -0,0 +1,2 @@
+debian/tmp/@PERL_ARCHLIB@/auto/stfl/stfl.so
+debian/tmp/@PERL_ARCHLIB@/stfl.pm
diff -Nru stfl-0.22/debian/rules stfl-0.22/debian/rules
--- stfl-0.22/debian/rules 2014-02-12 02:05:12.000000000 +0100
+++ stfl-0.22/debian/rules 2014-07-05 14:57:15.000000000 +0200
@@ -13,6 +13,7 @@
MAKE_FOUND_INTERPR := FOUND_PERL5=0 FOUND_SWIG=1 FOUND_SPL=1 FOUND_RUBY=0 FOUND_PYTHON=0
MAKE_INSTALL_TARGET := DESTDIR=$(MAKE_DESTDIR) prefix=/usr
CFLAGS += -fPIC
+PERL_ARCHLIB := $(shell perl -MConfig -e 'print $$Config{vendorarch}')
build: build-stamp $(addprefix build-stamp-python-, $(PYTHON_VERSIONS))
build-stamp:
@@ -42,6 +43,7 @@
$(MAKE) $(MAKE_INSTALL_TARGET) $(MAKE_FOUND_INTERPR) install
# perl
$(MAKE) -C perl5 install DESTDIR=$(MAKE_DESTDIR) PREFIX=/usr
+ sed -e 's;@PERL_ARCHLIB@;$(PERL_ARCHLIB);g' debian/libstfl-perl.install.in > debian/libstfl-perl.install
# ruby
dh_ruby --install
@@ -57,6 +59,8 @@
rm -f build-stamp*
# ruby
dh_ruby --clean
+ # perl
+ rm -f debian/libstfl-perl.install
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) clean
signature.asc
Description: Digital Signature
