development/bootstrap-build-environment
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fixed debian dependencies

Browse Source
This commit is contained in:
Marc Wäckerlin
2017-02-06 22:55:20 +00:00
parent 5a75cd1111
commit 7072d83d3f
8 changed files with 101 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
scripts/ax_init_standard_project.m4
View File

@@ -167,12 +167,6 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
AM_CPPFLAGS+=" '-DMAKE_STRING(X)=\#X' '-DNAMESPACE=${PACKAGE_TARNAME//[^a-zA-Z0-9]/_}'"
AX_SUBST(NUMBERS)
AX_SUBST(HOME)
DEB_DEPEND_IFEXISTS=
DEB_BUILD_DEPEND=
DEB_DEPEND=
AC_SUBST(DEB_DEPEND_IFEXISTS)
AC_SUBST(DEB_BUILD_DEPEND)
AC_SUBST(DEB_DEPEND)
if test -f README.md; then
README=$(tail -n +3 README.md)
DESCRIPTION=$(head -1 README.md)
@@ -974,36 +968,40 @@ AC_DEFUN([AX_CHECK_VALID_LD_FLAG], [
# - parameter:
# $1 = package name
AC_DEFUN([AX_DEB_DEPEND_IFEXISTS], [
pkg=$1
pkg="$1"
if test -n "$(apt-cache policy -q ${pkg} 2> /dev/null)"; then
DEB_DEPEND_IFEXISTS+=", ${pkg}"
DEB_DEPEND_IFEXISTS="${DEB_DEPEND_IFEXISTS}, ${pkg}"
fi
AC_SUBST(DEB_DEPEND_IFEXISTS)
])
# require package in debian/control.in append @DEB_BUILD_DEPEND@ to Build-Depends
# - parameter:
# $1 = package name
AC_DEFUN([AX_DEB_BUILD_DEPEND], [
pkg=$1
DEB_BUILD_DEPEND+=", ${pkg}"
AC_SUBST(DEB_BUILD_DEPEND)
pkg="$1"
DEB_BUILD_DEPEND="${DEB_BUILD_DEPEND}, ${pkg}"
])
# require package in debian/control.in append @DEB_DEPEND@ to Depends
# - parameter:
# $1 = package name
AC_DEFUN([AX_DEB_DEPEND], [
pkg=$1
DEB_DEPEND+=", ${pkg}"
AC_SUBST(DEB_DEPEND)
pkg="$1"
DEB_DEPEND="${DEB_DEPEND}, ${pkg}"
])
# require package in debian/control.in append @DEB_DEPEND@ to Depends
# - parameter:
# $1 = package name
AC_DEFUN([AX_DEB_SECTION], [
pkg=$1
pkg="$1"
DEB_SECTION="${pkg}"
AC_SUBST(DEB_SECTION)
])
# call after setting debian dependencies
AC_DEFUN([AX_DEB_RESOLVE], [
AC_SUBST(DEB_BUILD_DEPEND)
AC_SUBST(DEB_DEPEND)
AC_SUBST(DEB_SECTION)
AC_SUBST(DEB_DEPEND_IFEXISTS)
])

2
scripts/bootstrap.sh
View File

@@ -1490,7 +1490,7 @@ $( if testtag AX_USE_LIBTOOL; then
Package: @PACKAGE_NAME@-dev
Section: libdevel
Architecture: any
Depends: @PACKAGE_NAME@ (= \${binary:Version}), ${BUILD_DEPENDS}${RUN_DEPENDS} @DEB_DEPEND@ @DEB_DEPEND_IFEXISTS@
Depends: @PACKAGE_NAME@ (= \${binary:Version}), ${BUILD_DEPENDS}${RUN_DEPENDS} @DEB_DEPEND@ @DEB_BUILD_DEPEND@ @DEB_DEPEND_IFEXISTS@
Description: @DESCRIPTION@ - Development Package
@README_DEB@
EOF2