summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonan Le Martret <ronan.lemartret@iot.bzh>2018-10-30 09:47:40 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2018-12-13 11:33:40 +0100
commit0bea7814df14ad697fb133fa594846f1b53a612a (patch)
treef18720dc71b201a088ecebedca755fc873b14b1a
parent67f8a0625fba4de154cc08c56de9a0730adfdaa9 (diff)
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 <ronan.lemartret@iot.bzh>
-rw-r--r--conf.d/afb-test.pc.in2
-rw-r--r--conf.d/packaging/deb/agl-app-afb-test.dsc1
-rw-r--r--conf.d/packaging/deb/debian.agl-app-afb-test-dev.install2
-rw-r--r--conf.d/packaging/deb/debian.rules2
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 <jose.bollo@iot.bzh>
+## Author: Romain Forlot <romain.forlot@iot.bzh>
##
## 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