openkylin
/
cups
mirror of https://gitee.com/openkylin/cups.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

* debian/rules: 

+ fix openkylin vendor
This commit is contained in:
openKylinBot 2022-06-01 10:59:08 +08:00
parent a15a99feab
commit 627cbd9ab9
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
cups (2.3.1-ok2) yangtze; urgency=medium
* debian/rules:
+ fix openkylin vendor
-- luzhiping <luzhiping@kylinos.cn> Wed, 01 Jun 2022 10:57:48 +0800
cups (2.3.1-ok1) yangtze; urgency=medium cups (2.3.1-ok1) yangtze; urgency=medium
* Build for openKylin. * Build for openKylin.

7
debian/rules vendored
View File

@ -1,6 +1,7 @@
#!/usr/bin/make -f #!/usr/bin/make -f
derives_from_ubuntu := $(shell (dpkg-vendor --derives-from Ubuntu && echo "yes") || echo "no") derives_from_ubuntu := $(shell (dpkg-vendor --derives-from Ubuntu && echo "yes") || echo "no")
derives_from_openkylin := $(shell (dpkg-vendor --derives-from openKylin && echo "yes") || echo "no")
# Enabling PIE globally doesn't work, but ./configure already enables PIE # Enabling PIE globally doesn't work, but ./configure already enables PIE
# where necessary. # where necessary.
@ -11,6 +12,10 @@ ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes) $(DEB_HOST_ARCH), yes i386)
skip_packages = -Ncups -Ncups-core-drivers skip_packages = -Ncups -Ncups-core-drivers
endif endif
ifeq ($(shell dpkg-vendor --is openKylin && echo yes) $(DEB_HOST_ARCH), yes i386)
skip_packages = -Ncups -Ncups-core-drivers
endif
# The build system uses only DSOFLAGS but not LDFLAGS to build some libraries. # The build system uses only DSOFLAGS but not LDFLAGS to build some libraries.
# Add LDFLAGS to enable (hardening) build flags. # Add LDFLAGS to enable (hardening) build flags.
export DSOFLAGS = $(shell dpkg-buildflags --get LDFLAGS) export DSOFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
@ -27,7 +32,7 @@ CONFIG_LIBUSB=--enable-libusb
endif endif
override_dh_auto_configure: override_dh_auto_configure:
ifeq ($(derives_from_ubuntu),yes) ifeq ($(filter yes,$(derives_from_ubuntu) $(derives_from_openkylin)),yes)
set -e; if ! [ -e debian/patches-ubuntu/stamp-applied ]; then \ set -e; if ! [ -e debian/patches-ubuntu/stamp-applied ]; then \
echo '---- Applying Ubuntu specific patches'; \ echo '---- Applying Ubuntu specific patches'; \
for p in debian/patches-ubuntu/*; do \ for p in debian/patches-ubuntu/*; do \