diff options
Diffstat (limited to 'debian/rules')
| -rwxr-xr-x | debian/rules | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/debian/rules b/debian/rules index 4dcdbbd..9b2067b 100755 --- a/debian/rules +++ b/debian/rules @@ -9,11 +9,6 @@ include /usr/share/dpkg/default.mk # Vendor and version CXXFLAGS += -DPACKAGEVERSION='"$(DEB_VERSION).$(DEB_VENDOR)"' -H2O_SOURCE_DIR=$(CURDIR)/debian/vendor-h2o/ -H2O_BUILD_DIR=$(CURDIR)/debian/vendor-h2o-build/ -H2O_INSTALL_DIR=$(CURDIR)/debian/vendor-h2o-destdir/ -LDFLAGS += -L$(H2O_INSTALL_DIR)/usr/lib/$(DEB_HOST_MULTIARCH) -CXXFLAGS += -I$(H2O_INSTALL_DIR)/usr/include %: dh $@ @@ -21,15 +16,8 @@ CXXFLAGS += -I$(H2O_INSTALL_DIR)/usr/include override_dh_auto_clean: dh_auto_clean rm -f dnslabeltext.cc - rm -rf $(H2O_BUILD_DIR) $(H2O_INSTALL_DIR) -vendored_libh2o: - # Build vendorized copy of libh2o first - mkdir $(H2O_BUILD_DIR) $(H2O_INSTALL_DIR) - (cd $(H2O_BUILD_DIR) && CFLAGS='-fPIC' cmake -DWITH_PICOTLS=off -DWITH_BUNDLED_SSL=off -DWITH_MRUBY=off -DCMAKE_INSTALL_PREFIX=/usr $(H2O_SOURCE_DIR)) - $(MAKE) -C $(H2O_BUILD_DIR) install DESTDIR=$(H2O_INSTALL_DIR) - -override_dh_auto_configure: vendored_libh2o +override_dh_auto_configure: # Actually configure dnsdist now chmod a+x debian/configure-helpers/* PATH=debian/configure-helpers/:$$PATH dh_auto_configure -- \ @@ -51,6 +39,7 @@ override_dh_auto_configure: vendored_libh2o --with-nghttp2 \ --with-protobuf \ --with-re2 \ + --with-xsk \ --with-service-user='_dnsdist' \ --with-service-group='_dnsdist' \ $(CONFIGURE_ARGS) PKG_CONFIG_PATH=$(H2O_INSTALL_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig:$(PKG_CONFIG_PATH) |