diff options
| author | Manoj Srivastava <srivasta@golden-gryphon.com> | 2014-04-27 15:58:15 -0700 |
|---|---|---|
| committer | Manoj Srivastava <srivasta@golden-gryphon.com> | 2014-04-27 15:58:15 -0700 |
| commit | 329e310259378b9c6f0a6be1b73712164dba73fb (patch) | |
| tree | 71fbbee049967f5d6a08a4f6d8a8ee98cc42ee29 /debian/rules | |
| parent | 5888776eb48b7f18267d99a0d5107d81448c5356 (diff) | |
[mastre]: Fix cross builds.
Adapted patch from Matthias Klose to add pre-seeding of autoconf
values as paramaters, fixing cross builds. flex uses runtime checks
for configure tests, and preseeding allows cross build to succeed,
Bug fix: "fix cross build", thanks to Matthias Klose. Applied fix
manually (Closes: #746172).
Diffstat (limited to 'debian/rules')
| -rwxr-xr-x | debian/rules | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/debian/rules b/debian/rules index 699bc29..514b19e 100755 --- a/debian/rules +++ b/debian/rules @@ -7,13 +7,21 @@ INSTALL = install ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s endif + install_file = $(INSTALL) -p -o root -g root -m 644 install_program = $(INSTALL) -p -o root -g root -m 755 install_script = $(INSTALL) -p -o root -g root -m 755 make_directory = $(INSTALL) -p -d -o root -g root -m 755 DPKG_ARCH := dpkg-architecture -export DEB_HOST_MULTIARCH := $(shell $(DPKG_ARCH) $(ha) -qDEB_HOST_MULTIARCH) +export DEB_HOST_MULTIARCH := $(shell $(DPKG_ARCH) $(ha) -qDEB_HOST_MULTIARCH) +export DEB_BUILD_MULTIARCH := $(shell $(DPKG_ARCH) $(ha) -qDEB_BUILD_MULTIARCH) + +confflags = ac_cv_lib_util_getloadavg=no +ifneq ($(DEB_BUILD_MULTIARCH),$(DEB_HOST_MULTIARCH)) + confflags += ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes +endif + %: dh $@ --with autoreconf @@ -28,8 +36,7 @@ override_dh_auto_configure: touch scan.c; \ fi; \ fi - ac_cv_lib_util_getloadavg=no dh_auto_configure -- \ - --prefix=$(PREFIX) $(confflags) + dh_auto_configure -- --prefix=$(PREFIX) $(confflags) override_dh_install: test ! -d debian/tmp/lib/$(DEB_HOST_MULTIARCH) || \ |