Skip to content

Commit 7f027b3

Browse files
committed
Revert "Pass --host to configure when cross-building"
This reverts commit 9802a27. No support in Ubuntu 16.04
1 parent 8e6ca5e commit 7f027b3

File tree

2 files changed

+0
-14
lines changed

2 files changed

+0
-14
lines changed

debian/control

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ Build-Depends: bison,
1919
netbase,
2020
openssl,
2121
procps,
22-
ruby:native <cross>,
2322
rubygems-integration (>= 1.6),
2423
systemtap-sdt-dev [linux-any],
2524
zlib1g-dev

debian/rules

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ export DH_OPTIONS
1010
TESTOPTS += -v
1111
export TESTOPTS
1212

13-
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
1413
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
15-
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
1614
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
1715

1816
include /usr/share/dpkg/pkg-info.mk
@@ -31,17 +29,6 @@ configure_options += --disable-rpath
3129
configure_options += --with-sitedir='/usr/local/lib/site_ruby'
3230
configure_options += --with-sitearchdir="/usr/local/lib/$(DEB_HOST_MULTIARCH)/site_ruby"
3331

34-
ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
35-
# Cross-building. This is the same logic that debhelper's
36-
# lib/Debian/Debhelper/Buildsystem/autoconf.pm uses.
37-
# note that you also need --with-baseruby, so use the "cross" build-profile.
38-
configure_options += --build=$(DEB_BUILD_GNU_TYPE)
39-
configure_options += --host=$(DEB_HOST_GNU_TYPE)
40-
endif
41-
ifneq ($(filter cross,$(DEB_BUILD_PROFILES)),)
42-
configure_options += --with-baseruby=/usr/bin/ruby
43-
endif
44-
4532
# the following are ignored by ./configure, but used by some extconf.rb scripts
4633
configure_options += --enable-ipv6
4734
configure_options += --with-dbm-type=gdbm_compat

0 commit comments

Comments
 (0)