Bump to debhelper compat level 7 and use dh with the autoreconf addon.
Should make arm64 happy and closes: #735489. Thanks, Wookey!
This commit is contained in:
Julien Cristau
parent
940cabd789
commit
992803dd44
|
|
@ -1,6 +1,8 @@
|
|||
x11-xserver-utils (7.7+2) UNRELEASED; urgency=medium
|
||||
|
||||
* Remove Cyril Brulebois from Uploaders.
|
||||
* Bump to debhelper compat level 7 and use dh with the autoreconf addon.
|
||||
Should make arm64 happy and closes: #735489. Thanks, Wookey!
|
||||
|
||||
-- Julien Cristau <jcristau@debian.org> Sat, 18 Jan 2014 20:27:01 +0100
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
debian/autoreconf
|
||||
|
|
@ -1 +1 @@
|
|||
5
|
||||
7
|
||||
|
|
|
|||
|
|
@ -3,7 +3,8 @@ Section: x11
|
|||
Priority: optional
|
||||
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
|
||||
Build-Depends:
|
||||
debhelper (>= 5.0.0),
|
||||
debhelper (>= 7.0.50),
|
||||
dh-autoreconf,
|
||||
pkg-config,
|
||||
x11proto-core-dev (>= 7.0.17),
|
||||
libx11-dev (>= 2:1.0.0),
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ include debian/xsfbs/xsfbs.mk
|
|||
# subdirectory explicitly so that the build system knows what to build
|
||||
DEF_SUBDIRS=iceauth rgb sessreg xcmsdb xgamma xhost xmodmap xrandr xrdb xrefresh xset xsetmode xsetpointer xsetroot xstdcmap xvidtune
|
||||
SUBDIRS=$(DEF_SUBDIRS)
|
||||
CONFIG_STAMPS = $(addprefix $(STAMP_DIR)/configure-, $(SUBDIRS))
|
||||
BUILD_STAMPS = $(addprefix $(STAMP_DIR)/build-,$(SUBDIRS))
|
||||
|
||||
CFLAGS = `dpkg-buildflags --get CFLAGS`
|
||||
|
|
@ -23,85 +24,47 @@ CFLAGS += -Wall
|
|||
LDFLAGS = `dpkg-buildflags --get LDFLAGS`
|
||||
CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
|
||||
|
||||
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
|
||||
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
|
||||
MAKEFLAGS += -j$(NUMJOBS)
|
||||
endif
|
||||
%:
|
||||
dh $@ --with autoreconf,quilt --parallel
|
||||
|
||||
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
|
||||
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
|
||||
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
|
||||
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
|
||||
confflags += --build=$(DEB_HOST_GNU_TYPE)
|
||||
else
|
||||
confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
|
||||
endif
|
||||
debian/autoreconf:
|
||||
echo $(SUBDIRS) > $@
|
||||
|
||||
override_dh_autoreconf: debian/autoreconf
|
||||
dh_autoreconf
|
||||
|
||||
build: build-stamp
|
||||
build-stamp: $(BUILD_STAMPS)
|
||||
override_dh_auto_configure: $(CONFIG_STAMPS)
|
||||
|
||||
$(STAMP_DIR)/configure-%:
|
||||
mkdir -p $(STAMP_DIR)
|
||||
dh_auto_configure -D$* -B$*-build -- \
|
||||
--disable-silent-rules \
|
||||
CFLAGS="$(CFLAGS)" \
|
||||
CPPFLAGS="$(CPPFLAGS)" \
|
||||
LDFLAGS="$(LDFLAGS)"
|
||||
>$@
|
||||
|
||||
$(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch
|
||||
dh_testdir
|
||||
mkdir -p $*-build
|
||||
cd $*-build && \
|
||||
../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \
|
||||
--infodir=\$${prefix}/share/info $(confflags) \
|
||||
--disable-silent-rules \
|
||||
CFLAGS="$(CFLAGS)" \
|
||||
CPPFLAGS="$(CPPFLAGS)" \
|
||||
LDFLAGS="$(LDFLAGS)"
|
||||
cd $*-build && $(MAKE)
|
||||
override_dh_auto_build: $(BUILD_STAMPS)
|
||||
|
||||
$(STAMP_DIR)/build-%:
|
||||
mkdir -p $(STAMP_DIR)
|
||||
dh_auto_build -D$* -B$*-build
|
||||
>$@
|
||||
|
||||
clean: xsfclean
|
||||
dh_testdir
|
||||
rm -f build-stamp
|
||||
rm -f config.cache config.log config.status
|
||||
rm -f */config.cache */config.log */config.status
|
||||
rm -f conftest* */conftest*
|
||||
rm -rf autom4te.cache */autom4te.cache
|
||||
rm -rf *-build
|
||||
dh_clean
|
||||
override_dh_auto_clean: $(addprefix clean-, $(SUBDIRS))
|
||||
rm -rf $(STAMP_DIR)
|
||||
|
||||
install: build
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
dh_clean -k
|
||||
dh_installdirs
|
||||
clean-%:
|
||||
dh_auto_clean -D$* -B$*-build
|
||||
|
||||
override_dh_auto_install:
|
||||
for FILE in $(SUBDIRS); do \
|
||||
cd "$$FILE"-build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install ; \
|
||||
cd ..; \
|
||||
done
|
||||
|
||||
# Build architecture-dependent files here.
|
||||
binary-arch: build install
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
|
||||
dh_installdocs
|
||||
dh_install --sourcedir=debian/tmp -Xrgb.txt --fail-missing
|
||||
dh_installmenu
|
||||
dh_installchangelogs
|
||||
dh_link
|
||||
dh_strip
|
||||
dh_compress
|
||||
dh_fixperms
|
||||
dh_makeshlibs
|
||||
dh_shlibdeps
|
||||
dh_installdeb
|
||||
dh_gencontrol
|
||||
dh_md5sums
|
||||
dh_builddeb
|
||||
|
||||
# Build architecture-independent files here.
|
||||
binary-indep: build install
|
||||
# Nothing to do
|
||||
|
||||
binary: binary-indep binary-arch
|
||||
.PHONY: build clean binary-indep binary-arch binary install
|
||||
override_dh_install:
|
||||
dh_install -Xrgb.txt --fail-missing
|
||||
|
||||
.PHONY: get-tarballs
|
||||
get-tarballs: $(addprefix get-tarball-,$(SUBDIRS))
|
||||
|
|
|
|||
Loading…
Reference in New Issue