Skip to content
GitLab
Explore
Sign in
Register
Commits on Source (2)
debian/rules: Add progress info when compiling against several PG versions
· 959d7b27
Christoph Berg
authored
Jul 16, 2018
959d7b27
Don't run tests in -indep builds.
· 1b88cf2c
Christoph Berg
authored
Jul 16, 2018
1b88cf2c
Show whitespace changes
Inline
Side-by-side
debian/changelog
View file @
1b88cf2c
...
...
@@ -11,6 +11,7 @@ postgis (2.5.0~beta1+dfsg-1~exp2) UNRELEASED; urgency=medium
* Work around failure in building the postgis_tiger_geocoder extension.
* debian/rules: Ignore test failures instead of disabling tests completely
on specific architectures; ignore tests on i386.
* Don't run tests in -indep builds.
* debian/rules: Import architecture from /usr/share/dpkg/architecture.mk.
* Re-enable tests on Ubuntu.
...
...
debian/rules
View file @
1b88cf2c
...
...
@@ -139,6 +139,7 @@ override_dh_auto_configure:
done)
# PostGIS for the most recent PostgreSQL version
@echo
" ### configuring $(NEWEST_POSTGRES_VERSION) ###"
./configure
$(COMMON_CONFIGURE_ARGS)
\
--datadir
=
\$
${
prefix
}
/share/postgresql-
$(
NEWEST_POSTGRES_VERSION
)
-postgis
\
--with-pgconfig
=
/usr/lib/postgresql/
$(
NEWEST_POSTGRES_VERSION
)
/bin/pg_config
...
...
@@ -146,6 +147,7 @@ override_dh_auto_configure:
# PostGIS for all older Postgres versions
(set
-e;
\
for
PGVER
in
$(OTHER_POSTGRES_VERSIONS);
do
\
echo
" ### configuring $$PGVER ###"
;
\
cd
$(CURDIR)/debian/build-$$PGVER;
\
./configure
$(COMMON_CONFIGURE_ARGS)
\
--datadir
=
\$
${
prefix
}
/share/postgresql-
$$
PGVER-postgis
\
...
...
@@ -160,12 +162,14 @@ override_dh_auto_configure:
override_dh_auto_build-arch
:
build-arch-stamp
build-arch-stamp
:
# Build against the newest Postgres version
@echo
" ### building $(NEWEST_POSTGRES_VERSION) ###"
$(MAKE)
$(NJOBS)
$(MAKE)
$(NJOBS)
-C
doc
# Build against all other Postgres versions
(set
-e;
\
for
PGVER
in
$(OTHER_POSTGRES_VERSIONS);
do
\
echo
" ### building $$PGVER ###"
;
\
$(MAKE)
$(NJOBS)
-C
$(CURDIR)/debian/build-$$PGVER;
\
done)
...
...
@@ -185,7 +189,9 @@ override_dh_auto_build-indep: build-arch-stamp
# clever enough to run this before 'install'.
$(MAKE)
$(NJOBS)
-C
extensions
override_dh_auto_test
:
override_dh_auto_test-indep
:
override_dh_auto_test-arch
:
ifeq
(,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
# Run unit tests (against the newest Postgres version, first)
echo
"LD_PRELOAD = '$(CURDIR)/liblwgeom/.libs/liblwgeom-$(MAJOR_VERSION).$(MINOR_VERSION).so.$(LIBLWGEOM_SOVERSION)'"
\
...
...