From ad8bbe5cef955315ce30a67a392b745742b8b4c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Tue, 13 Jun 2017 11:31:52 +0000 Subject: [PATCH] fixed build for ubuntu, fedora, opensuse --- ax_init_standard_project.m4 | 8 ++++---- bootstrap.sh | 12 ++++++++---- libpcscxx.spec.in | 7 ++++--- resolve-debbuilddeps.sh | 11 +++++++---- resolve-rpmbuilddeps.sh | 9 +++++++++ 5 files changed, 32 insertions(+), 15 deletions(-) diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4 index 8d51d64..9fdb16c 100644 --- a/ax_init_standard_project.m4 +++ b/ax_init_standard_project.m4 @@ -840,8 +840,8 @@ AC_DEFUN([AX_PKG_REQUIRE], [ fi done for f in $pkg $4; do - if (test -x /usr/bin/zypper && zypper search -x "${f}-devel" 1>&2 > /dev/n ull) || \ - (test -x /usr/bin/dnf && dnf list -q "${f}-devel" 1>&2 > /dev/null) || \ + if (test -x /usr/bin/zypper && zypper search -x "${f}-devel" 1>&2 > /dev/null) || \ + (test -x /usr/bin/dnf && dnf list -q "${f}-devel" 1>&2 > /dev/null) || \ (test -x /usr/bin/yum && yum list -q "${f}-devel" 1>&2 > /dev/null) || \ (test -x /usr/sbin/urpmq && urpmq "${f}-devel" 1>&2 > /dev/null); then rpm_pkg=${f}-devel @@ -911,8 +911,8 @@ AC_DEFUN([AX_PKG_CHECK], [ if test -n "$(apt-cache policy -q ${deb_pkg} 2> /dev/null)"; then AX_DEB_BUILD_DEPEND([$deb_pkg]) fi - if (test -x /usr/bin/zypper && zypper search -x "$rpm_pkg" 1>&2 > /dev/n ull) || \ - (test -x /usr/bin/dnf && dnf list -q "$rpm_pkg" 1>&2 > /dev/null) || \ + if (test -x /usr/bin/zypper && zypper search -x "$rpm_pkg" 1>&2 > /dev/null) || \ + (test -x /usr/bin/dnf && dnf list -q "$rpm_pkg" 1>&2 > /dev/null) || \ (test -x /usr/bin/yum && yum list -q "$rpm_pkg" 1>&2 > /dev/null) || \ (test -x /usr/sbin/urpmq && urpmq "$rpm_pkg" 1>&2 > /dev/null); then AX_RPM_BUILD_DEPEND([$rpm_pkg]) diff --git a/bootstrap.sh b/bootstrap.sh index c1bd79b..c038fd3 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1629,15 +1629,19 @@ BuildRequires: which, pkgconfig, gnupg, expect, ${VCSDEPENDS_RPM}make, automake, if testtag AX_USE_PERLDOC; then echo -n ", libpod-tree-perl"; fi - if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then - echo -n ", qt-devel, libqt5-qtbase-devel, libqt5-qttools, libQt5WebKit5-devel"; - fi ) @RPM_BUILD_DEPEND@ @RPM_DEPEND_IFEXISTS@ #### os dependent definitions #### %if 0%{?suse_version} || 0%{?sles_version} -BuildRequires: lsb-release +BuildRequires: lsb-release$( + if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then + echo -n ", qt-devel, libqt5-qtbase-devel, libqt5-qttools, libQt5WebKit5-devel"; + fi) %else +$( + if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then + echo -n "BuildRequires: qt-devel, qt5-qtbase-devel, qt5-qttools-devel, qtwebkit-devel"; + fi) %if 0%{?mageia} BuildRequires: rpm-sign, lsb-release %else diff --git a/libpcscxx.spec.in b/libpcscxx.spec.in index 413db8b..81a3e85 100644 --- a/libpcscxx.spec.in +++ b/libpcscxx.spec.in @@ -7,12 +7,13 @@ Group: Development/Libraries/C++ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: which, pkgconfig, gnupg, expect, subversion, make, automake, autoconf, rpm-build, binutils-devel, gcc-c++, doxygen, graphviz, java-openjdk, qt-devel, libqt5-qtbase-devel, libqt5-qttools, libQt5WebKit5-devel @RPM_BUILD_DEPEND@ @RPM_DEPEND_IFEXISTS@ +BuildRequires: which, pkgconfig, gnupg, expect, subversion, make, automake, autoconf, rpm-build, binutils-devel, gcc-c++, doxygen, graphviz, java-openjdk @RPM_BUILD_DEPEND@ @RPM_DEPEND_IFEXISTS@ #### os dependent definitions #### %if 0%{?suse_version} || 0%{?sles_version} -BuildRequires: lsb-release +BuildRequires: lsb-release, qt-devel, libqt5-qtbase-devel, libqt5-qttools, libQt5WebKit5-devel %else +BuildRequires: qt-devel, qt5-qtbase-devel, qt5-qttools-devel, qtwebkit-devel %if 0%{?mageia} BuildRequires: rpm-sign, lsb-release %else @@ -74,12 +75,12 @@ This Package contains all files required for developement. %files devel %defattr(-,root,root,-) -/usr/bin/* /usr/%_lib/*.so /usr/%_lib/*.a /usr/%_lib/*.la /usr/%_lib/pkgconfig /usr/include/* +/usr/bin/* %doc /usr/share/doc/packages/@PACKAGE_NAME@/html /usr/share/doc/packages/@PACKAGE_NAME@/examples diff --git a/resolve-debbuilddeps.sh b/resolve-debbuilddeps.sh index a6b7c4f..36a94e6 100755 --- a/resolve-debbuilddeps.sh +++ b/resolve-debbuilddeps.sh @@ -36,10 +36,7 @@ DEPS= if test -e debian/control.in -a ! -e debian/control; then function pkg_exists() { - test -n "$(${DO} apt-cache policy -q ${1})" \ - && ((! $(${DO} apt-cache policy ${1} 2>&1 \ - | grep -q 'N: Unable to locate package')) \ - && (! ${DO} dpkg -l "${1}" 1>&2 > /dev/null)) + test -n "$(${DO} apt-cache policy -q ${1})" } function AX_PKG_CHECK() { local DEV_DEB_DIST_PKG= @@ -127,4 +124,10 @@ if test -n "${TO_INSTALL}" && ! install ${TO_INSTALL}; then exit 1 fi +FILES="$(LANG= ${DO} dpkg-checkbuilddeps 2>&1 | sed -n '/Unmet build dependencies/ { s,.*Unmet build dependencies: ,,g; s, ([^)]*),,g; s, *| *,|,g; p}')" +if test -n "${FILES}"; then + echo "**** ERROR: Cannot install: " $FILES + exit 1 +fi + echo "**** Success: All Dependencies Resolved" diff --git a/resolve-rpmbuilddeps.sh b/resolve-rpmbuilddeps.sh index 5498e99..7c1843b 100755 --- a/resolve-rpmbuilddeps.sh +++ b/resolve-rpmbuilddeps.sh @@ -107,5 +107,14 @@ else fi fi +if test -n "${SCHROOTNAME}"; then + FILES=$(LANG= schroot -c ${SCHROOTNAME} -- rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p') +else + FILES=$(LANG= rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p') +fi +if test -n "${FILES}"; then + echo "**** ERROR: Cannot install: " $FILES + exit 1 +fi echo "**** Success: All Dependencies Resolved"