From 186580dd49cd32c0bdbfec71e58a3098c9bd5887 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Tue, 30 Oct 2018 09:47:40 +0100 Subject: Fix packaging for native build - *.pc file must have ascii charset - remove gcc dependency for deb package - Fix *.pc file packaging for deb package - set CMAKE_INSTALL_LIBDIR in debian.rules Change-Id: I448aedcdb6fd21d662416ac72148d98da5e05ac3 Signed-off-by: Ronan Le Martret --- conf.d/afb-test.pc.in | 2 +- conf.d/packaging/deb/agl-app-afb-test.dsc | 1 - conf.d/packaging/deb/debian.agl-app-afb-test-dev.install | 2 +- conf.d/packaging/deb/debian.rules | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/conf.d/afb-test.pc.in b/conf.d/afb-test.pc.in index 3e9ed8b..d99eb6b 100644 --- a/conf.d/afb-test.pc.in +++ b/conf.d/afb-test.pc.in @@ -1,6 +1,6 @@ ## ## Copyright (C) 2016, 2017, 2018 "IoT.bzh" -## Author: José Bollo +## Author: Romain Forlot ## ## This file is part of afb-daemon project. ## diff --git a/conf.d/packaging/deb/agl-app-afb-test.dsc b/conf.d/packaging/deb/agl-app-afb-test.dsc index ee57c95..2ae81ca 100644 --- a/conf.d/packaging/deb/agl-app-afb-test.dsc +++ b/conf.d/packaging/deb/agl-app-afb-test.dsc @@ -12,7 +12,6 @@ Build-Depends: debhelper (>= 5), cmake, agl-app-framework-binder-bin, agl-app-framework-binder-dev, - gcc-c++, lua5.3, liblua5.3-dev, libjson-c-dev, diff --git a/conf.d/packaging/deb/debian.agl-app-afb-test-dev.install b/conf.d/packaging/deb/debian.agl-app-afb-test-dev.install index 699f573..e71513b 100644 --- a/conf.d/packaging/deb/debian.agl-app-afb-test-dev.install +++ b/conf.d/packaging/deb/debian.agl-app-afb-test-dev.install @@ -1 +1 @@ -/opt/AGL/lib/pkgconfig/*.pc +/opt/AGL/lib/*/pkgconfig/*.pc diff --git a/conf.d/packaging/deb/debian.rules b/conf.d/packaging/deb/debian.rules index 5a71d2a..d159744 100644 --- a/conf.d/packaging/deb/debian.rules +++ b/conf.d/packaging/deb/debian.rules @@ -33,7 +33,7 @@ build-stamp: configure-stamp mkdir -p build export PKG_CONFIG_PATH=/opt/AGL/lib/$(DEB_HOST_MULTIARCH)/pkgconfig cd build && \ - cmake -DCMAKE_INSTALL_PREFIX:PATH=/opt/AGL -DCMAKE_BUILD_TYPE=DEBUG .. && \ + cmake -DCMAKE_INSTALL_PREFIX:PATH=/opt/AGL -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_INSTALL_LIBDIR:PATH=lib/$(DEB_HOST_MULTIARCH) .. && \ $(MAKE) touch build-stamp -- cgit 1.2.3-korg