Package: hplip
Severity: important
Version: 2.8.6.b-1
Tags: patch
User: [EMAIL PROTECTED]
Usertags: kfreebsd


Hi,

the current version fails to build on GNU/kFreeBSD.

It needs to build "pp" only on linux architectures.

Please find atatched patch with needed changes,
it also contain correction for dh_shlibdeps call.

Thanks in advance

                        Petr
--- hplip-2.8.6.b/debian/rules
+++ hplip-2.8.6.b/debian/rules
@@ -36,6 +36,8 @@
 # Autoconf
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+export DEB_HOST_ARCH_OS   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
 CONFFLAGS =
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
   CONFFLAGS += --build $(DEB_HOST_GNU_TYPE)
@@ -43,6 +45,12 @@
   CONFFLAGS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
+ifeq ($(DEB_HOST_ARCH_OS), linux)
+  CONFFLAGS += --enable-pp-build
+else
+  CONFFLAGS += --disable-pp-build
+endif
+
 DEBUGFLAGS=-g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
        DEBUGFLAGS += -O0
@@ -119,7 +127,6 @@
                --disable-foomatic-xml-install \
                --disable-foomatic-ppd-install \
                --enable-network-build \
-               --enable-pp-build \
                --enable-scan-build \
                --enable-gui-build \
                --enable-fax-build
@@ -287,7 +294,7 @@
 #      dh_python -i /usr/share/hplip
 #      dh_makeshlibs -i
        dh_installdeb -i
-       dh_shlibdeps -i -dpkg-shlibdeps-params=--ignore-missing-info
+       dh_shlibdeps -i --dpkg-shlibdeps-params=--ignore-missing-info
        dh_gencontrol -i -- \
                -V"hplip:source:Version=$(HPLIP_VERSION)" \
                -V"hpijs:source:Version=$(HPLIP_VERSION)" \
@@ -338,7 +345,7 @@
        dh_fixperms -a
        dh_makeshlibs -a
        dh_installdeb -a
-       dh_shlibdeps -a -dpkg-shlibdeps-params=--ignore-missing-info
+       dh_shlibdeps -a --dpkg-shlibdeps-params=--ignore-missing-info
        dh_gencontrol -a -- \
                -V"hplip:source:Version=$(HPLIP_VERSION)" \
                -V"hpijs:source:Version=$(HPLIP_VERSION)" \

Reply via email to