[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[lintian] 01/04: Prepare detection of arch problem in pkg-config



This is an automated email from the git hooks/post-receive script.

lamby pushed a commit to branch sl2
in repository lintian.

commit 5d74221d77a4e330d37efa26c953f64190aff8fd
Author: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
Date:   Sat Jul 5 11:30:53 2014 +0200

    Prepare detection of arch problem in pkg-config
    
    Generate cross arch pkg-config
    
    Signed-off-by: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
---
 t/tests/files-pkgconfig/debian/Makefile                   | 7 ++++++-
 t/tests/files-pkgconfig/debian/generated/arch-cross.pc.in | 6 ++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/t/tests/files-pkgconfig/debian/Makefile b/t/tests/files-pkgconfig/debian/Makefile
index ca9f8c3..796e1bc 100644
--- a/t/tests/files-pkgconfig/debian/Makefile
+++ b/t/tests/files-pkgconfig/debian/Makefile
@@ -1,7 +1,12 @@
 ARCH=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+ifeq ($(ARCH), x86_64-linux-gnu)
+ ARCH_CROSS=i386-linux-gnu
+else
+ ARCH_CROSS=x86_64-linux-gnu
+endif
 
 all:
-	find generated -name '*.pc.in' -exec sh -c 'echo "build" {} && sed s/\$$\(ARCH\)/$(ARCH)/ {} > `echo {} | sed s/\.pc\.in$$/\.pc/g`' \;
+	find generated -name '*.pc.in' -exec sh -c 'echo "build" {} && cat {} | sed s/\$$\(ARCH\)/$(ARCH)/g | sed s/\$$\(ARCH_CROSS\)/$(ARCH_CROSS)/g > `echo {} | sed s/\.pc\.in$$/\.pc/g`' \;
 
 install:
 	install -d $(DESTDIR)/usr/lib/pkgconfig/
diff --git a/t/tests/files-pkgconfig/debian/generated/arch-cross.pc.in b/t/tests/files-pkgconfig/debian/generated/arch-cross.pc.in
new file mode 100644
index 0000000..452d3a2
--- /dev/null
+++ b/t/tests/files-pkgconfig/debian/generated/arch-cross.pc.in
@@ -0,0 +1,6 @@
+Name: arch-cross
+Description: A library that include cross architecture
+Requires:
+Version: 3.1.3
+Libs:
+Cflags: -I/usr/include/$(ARCH_CROSS)/someconfig.h

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git


Reply to: