[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.0.1-4-2877-g8fe555b
Mike Hommey
glandium at debian.org
Sat Oct 25 11:06:22 UTC 2008
The following commit has been merged in the debian/experimental branch:
commit cc4b5c13b899585c0149522e630e6e70feb4b412
Author: Mike Hommey <glandium at debian.org>
Date: Sat Oct 25 09:34:09 2008 +0200
Feed configure with --host and --build
diff --git a/debian/changelog b/debian/changelog
index d06b57e..668cd0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ webkit (1.0.2~pre.svn37878-1) UNRELEASED; urgency=low
- Don't remove automake/autoconf generated files.
- Bump shlibs because of some new symbols.
- Don't need --enable-svg-experimental anymore.
+ - Feed configure with --host and --build.
* debian/control: Don't build depend on autotools.
* GNUmakefile.am, GNUmakefile.in: Add missing dash in version script option.
* debian/libwebkit-1.0-1.symbols: Add new symbols.
diff --git a/debian/rules b/debian/rules
index 2391d34..a22bedc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
CFLAGS = -g -Wall
ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
@@ -35,7 +38,9 @@ build-stamp:
CXXFLAGS="$(CFLAGS)" \
CC="gcc -Wl,--as-needed" \
CXX="g++ -Wl,--as-needed" \
- ../configure --prefix=/usr
+ ../configure --prefix=/usr \
+ --host=$(DEB_HOST_GNU_TYPE) \
+ --build=$(DEB_BUILD_GNU_TYPE)
$(MAKE) -C build
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list