diff options
| author | Helmut Grohne <helmut@subdivi.de> | 2018-01-28 21:36:03 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-01-28 21:36:03 +0100 |
| commit | ef0a3d636681a0cb46b29eb2c1e20c55b68ce2fb (patch) | |
| tree | 5c8e40560cea9a5e7122f430355e6c20e76586fa | |
| parent | 949b91c64b1f6b028cc52883eb1ecb98357fc9a0 (diff) | |
| download | nx-libs-ef0a3d636681a0cb46b29eb2c1e20c55b68ce2fb.tar.gz nx-libs-ef0a3d636681a0cb46b29eb2c1e20c55b68ce2fb.tar.bz2 nx-libs-ef0a3d636681a0cb46b29eb2c1e20c55b68ce2fb.zip | |
debian/rules: Fix FTCBFS: (see Debian bug #875867) Fix build/host confusion in debian/rules. Pass --host to ./configure.
| -rwxr-xr-x | debian/rules | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/debian/rules b/debian/rules index b2258cd58..dffab72b5 100755 --- a/debian/rules +++ b/debian/rules @@ -6,16 +6,20 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk -export LIBDIR = "/usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)" +include /usr/share/dpkg/architecture.mk + +export LIBDIR = "/usr/lib/$(DEB_HOST_MULTIARCH)" export LIBEXECDIR = "$(LIBDIR)/nx/bin" -export INCLUDEDIR = "/usr/include/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)" +export INCLUDEDIR = "/usr/include/$(DEB_HOST_MULTIARCH)" %: CONFIGURE="./configure --disable-silent-rules \ --prefix=/usr \ --libdir=$(LIBDIR) \ --includedir=$(INCLUDEDIR) \ - --libexecdir=$(LIBEXECDIR)" dh $@ --with quilt + --libexecdir=$(LIBEXECDIR) \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --host=$(DEB_HOST_GNU_TYPE)" dh $@ --with quilt override_dh_auto_clean: rm -Rf nx-X11/.build-exports @@ -89,21 +93,21 @@ override_dh_clean: override_dh_install: # strip static libs and remove .la files - rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcomp.la - strip --strip-debug --remove-section=.comment --remove-section=.note debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcomp.a - rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcompshad.la - strip --strip-debug --remove-section=.comment --remove-section=.note debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcompshad.a - rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libNX_X11.la - strip --strip-debug --remove-section=.comment --remove-section=.note debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libNX_X11.a + rm debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libXcomp.la + strip --strip-debug --remove-section=.comment --remove-section=.note debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libXcomp.a + rm debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libXcompshad.la + strip --strip-debug --remove-section=.comment --remove-section=.note debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libXcompshad.a + rm debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libNX_X11.la + strip --strip-debug --remove-section=.comment --remove-section=.note debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libNX_X11.a # remove extras, GL, and other unneeded headers - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/GL/ - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XK*.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/*Xv*.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XRes*.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XIproto.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XI.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/Xtrans/ + rm -R debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/GL/ + rm -R debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/nx-X11/extensions/XK*.h + rm -R debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/nx-X11/extensions/*Xv*.h + rm -R debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/nx-X11/extensions/XRes*.h + rm -R debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/nx-X11/extensions/XIproto.h + rm -R debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/nx-X11/extensions/XI.h + rm -R debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/nx-X11/Xtrans/ dh_install --fail-missing |