Am 17.01.2012 10:06, schrieb Reinhard Tartler:
It seems that this patch broke compilation on armel, see this buildlog: https://buildd.debian.org/status/fetch.php?pkg=libav&arch=armel&ver=4%3A0.8~beta2-2&stamp=1326762191
I see. This is because optimized shared libraries are created in two flavors on armel, whereas my current approach only consideres one flavor that is not shared or static.
Fabian, do you think you can fix this somehow soon. Alternatively, we can also revert that commit and re-introduce it later. What would you prefer?
Unfortunately, alioth is currently down and I cannot commit my actual fix directly to our git repository. But please find a git format-patch compliant patch attached.
- Fabian
>From fc35acc36968c21f0472e3800d697b288290d86d Mon Sep 17 00:00:00 2001 From: Fabian Greffrath <fabian+deb...@greffrath.com> Date: Tue, 17 Jan 2012 10:34:34 +0100 Subject: [PATCH] Fix debian/*.install file generation on archs (e.g. armel) that build more than only one optimized shared library (Closes: #656184). --- debian/rules | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/debian/rules b/debian/rules index 95f508c..127200c 100755 --- a/debian/rules +++ b/debian/rules @@ -22,20 +22,23 @@ endif endif include debian/confflags -OPT_FLAVOR := $(filter-out static shared, $(FLAVORS)) +OPT_FLAVORS := $(filter-out static shared, $(FLAVORS)) $(info FLAVORS = $(FLAVORS)) $(info DEB_BUILD_OPTIONS = $(DEB_BUILD_OPTIONS)) $(info CFLAGS = $(CFLAGS)) $(info LDFLAGS = $(LDFLAGS)) +define dh_install_file_opt_flavor + grep @DEB_HOST_MULTIARCH_OPT@ < $(1).in | \ + sed 's:@DEB_HOST_MULTIARCH_OPT@:$(DEB_HOST_MULTIARCH)/$($(2)_shlibdir):g' >> $(1) + +endef + DH_INSTALL_FILES := $(foreach pkg, $(LIB_PKGS) $(DEV_PKGS), debian/$(pkg).install) $(DH_INSTALL_FILES): sed 's/@DEB_HOST_MULTIARCH\(_OPT\)\?@/$(DEB_HOST_MULTIARCH)/g' $@.in > $@ -ifneq (,$(OPT_FLAVOR)) - grep @DEB_HOST_MULTIARCH_OPT@ < $@.in | \ - sed 's:@DEB_HOST_MULTIARCH_OPT@:$(DEB_HOST_MULTIARCH)/$($(OPT_FLAVOR)_shlibdir):g' >> $@ -endif + $(foreach opt_flavor,$(OPT_FLAVORS),$(call dh_install_file_opt_flavor,$@,$(opt_flavor))) configure-%: configure-stamp-% configure-stamp-%: $(QUILT_STAMPFN) -- 1.7.8.3
_______________________________________________ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
