[unshield] 06/08: cherry-pick upstram commit to fix build process in build jails

[Evgeni Golov]

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

evgeni pushed a commit to branch master
in repository unshield.

commit f0f678bf3ba0db99c7ba55d9a39bcea86129178c
Author: Evgeni Golov <evgeni at debian.org>
Date:   Sat Apr 30 11:49:00 2016 +0200

    cherry-pick upstram commit to fix build process in build jails
---
 .../patches/Fix-build-process-in-build-jails.patch | 59 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 60 insertions(+)

diff --git a/debian/patches/Fix-build-process-in-build-jails.patch b/debian/patches/Fix-build-process-in-build-jails.patch
new file mode 100644
index 0000000..ba56c90
--- /dev/null
+++ b/debian/patches/Fix-build-process-in-build-jails.patch
@@ -0,0 +1,59 @@
+From 07ce8d82f0f60b9048265410fa8063298ab520c4 Mon Sep 17 00:00:00 2001
+From: Dan Church <amphetamachine at gmail.com>
+Date: Thu, 2 Jul 2015 12:02:06 -0500
+Subject: [PATCH] Fix build process in build jails
+
+Fixes #22
+---
+ CMakeLists.txt | 3 ++-
+ lib/internal.h | 2 +-
+ src/unshield.c | 2 +-
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c7a748b..8cc0001 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -58,6 +58,7 @@ message(STATUS "BUILD_STATIC: ${BUILD_STATIC}")
+ add_definitions(-DHAVE_CONFIG_H)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lib/unshield_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/lib/unshield_config.h)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libunshield.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libunshield.pc @ONLY)
++include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ 
+ # To force position independent code for static libs on Linux x64
+ if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
+@@ -68,4 +69,4 @@ add_subdirectory(lib)
+ add_subdirectory(src)
+ 
+ install(FILES man/unshield.1 DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/man/man1)
+-install(FILES libunshield.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libunshield.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+diff --git a/lib/internal.h b/lib/internal.h
+index 0ea88be..1f5718a 100644
+--- a/lib/internal.h
++++ b/lib/internal.h
+@@ -3,7 +3,7 @@
+ #define __internal_h__
+ 
+ #include "libunshield.h"
+-#include "unshield_config.h"
++#include "lib/unshield_config.h"
+ 
+ #if HAVE_STDINT_H
+ #include <stdint.h>
+diff --git a/src/unshield.c b/src/unshield.c
+index 296abf6..158195f 100644
+--- a/src/unshield.c
++++ b/src/unshield.c
+@@ -13,7 +13,7 @@
+ #include <unistd.h>
+ #include "../lib/libunshield.h"
+ #ifdef HAVE_CONFIG_H
+-#include "../lib/unshield_config.h"
++#include "lib/unshield_config.h"
+ #endif
+ #if HAVE_FNMATCH
+ #include <fnmatch.h>
+-- 
+2.8.1
+
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..5102359 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Fix-build-process-in-build-jails.patch

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