Skip to content
Commits on Source (2)
Show whitespace changes
Inline Side-by-side
debian/changelog
View file @ d71ff902
postgis (2.4.4+dfsg-4) unstable; urgency=medium
* Add patches to fix parallel build of other extensions.
-- Bas Couwenberg <sebastic@debian.org> Sun, 10 Jun 2018 00:28:43 +0200
postgis (2.4.4+dfsg-3) unstable; urgency=medium
* Add patch to fix parallel build of postgis_tiger_geocoder extension.
......
debian/patches/parallel-extensions.patch 0 → 100644
View file @ d71ff902
Description: Fix parallel build of postgis_topology extension.
Author: Bas Couwenberg <sebastic@debian.org>
--- a/extensions/postgis_topology/Makefile.in
+++ b/extensions/postgis_topology/Makefile.in
@@ -42,20 +42,24 @@ sql/$(EXTENSION).sql: extlock.sql sql_bi
#this is a cludge to allow upgrading from same SVN to same SVN
sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql: extlock.sql ../postgis_extension_helper.sql sql_bits/remove_from_extension.sql.in sql/topology_upgrade.sql sql_bits/mark_editable_objects.sql.in sql_bits/topology_comments.sql ../postgis_extension_helper_uninstall.sql
+ mkdir -p sql
cat $^ > $@
sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql: sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql
+ mkdir -p sql
cat $^ > $@
#strip BEGIN/COMMIT since these are not allowed in extensions
#strip CREATE SCHEMA since we force extension
# to create schema by setting schema to topology in control
sql_bits/topology.sql: ../../topology/topology.sql
+ mkdir -p sql_bits
sed -e 's/BEGIN;//g' -e 's/COMMIT;//g' -e '/^CREATE SCHEMA/d;' $< > $@
../../doc/topology_comments.sql:
$(MAKE) -C ../../doc comments
sql_bits/topology_comments.sql: ../../doc/topology_comments.sql
+ mkdir -p sql_bits
cp $< $@
sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: ../../topology/topology.sql ../../utils/create_unpackaged.pl
--- a/extensions/address_standardizer/Makefile.in
+++ b/extensions/address_standardizer/Makefile.in
@@ -70,21 +70,26 @@ sql/%.sql: %.sql.in
sql/address_standardizer--@POSTGIS_LIB_VERSION@.sql: sql/address_standardizer_types.sql \
sql/address_standardizer_functions.sql
+ mkdir -p sql
cat $^ > $@
sql/address_standardizer.sql: sql/address_standardizer_types.sql \
sql/address_standardizer_functions.sql
+ mkdir -p sql
cat $^ > $@
sql/address_standardizer--1.0--$(EXTVERSION).sql: sql/address_standardizer_functions.sql
+ mkdir -p sql
cat $^ > $@
# upgrade logic for us data extension (to go to next cludge for dev upgrading)
sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql: sql/address_standardizer_functions.sql
+ mkdir -p sql
cat $^ > $@
# upgrade logic for us data extension (to go to original round-robin yoyo cludge for dev upgrading)
sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql: sql/address_standardizer_functions.sql
+ mkdir -p sql
cat $^ > $@
# build us data extension
@@ -98,10 +103,12 @@ sql/$(EXTENSION)_data_us.sql: us_lex.sql
# upgrade logic for us data extension (to go to next cludge for dev upgrading)
sql/$(EXTENSION)_data_us--$(EXTVERSION)--$(EXTVERSION)next.sql: sql/$(EXTENSION)_data_us--$(EXTVERSION).sql
+ mkdir -p sql
cat $^ > $@
# upgrade logic for us data extension (to go to original round-robin yoyo cludge for dev upgrading)
sql/$(EXTENSION)_data_us--$(EXTVERSION)next--$(EXTVERSION).sql: sql/$(EXTENSION)_data_us--$(EXTVERSION).sql
+ mkdir -p sql
cat $^ > $@
mk-st-regexp: mk-st-regexp.pl
debian/patches/parallel-postgis.patch 0 → 100644
View file @ d71ff902
Description: Fix parallel build of postgis extension.
FTBFS on i386: https://buildd.debian.org/status/fetch.php?pkg=postgis&arch=i386&ver=2.4.4%2Bdfsg-3&stamp=1528578814&file=log
.
cp: cannot create regular file 'sql_bits/postgis_comments.sql': No such file or directory
/bin/sh: 1: cannot create sql_bits/spatial_ref_sys_config_dump.sql: Directory nonexistent
Author: Bas Couwenberg <sebastic@debian.org>
--- a/extensions/postgis/Makefile.in
+++ b/extensions/postgis/Makefile.in
@@ -52,12 +52,15 @@ sql/$(EXTENSION)--unpackaged--$(EXTVERSI
#this is a cludge to allow upgrading from same SVN to same SVN
sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql: sql_bits/postgis_extension_upgrade_minor.sql
+ mkdir -p sql
cp $< $@
sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql: sql_bits/postgis_extension_upgrade_minor.sql
+ mkdir -p sql
cp $< $@
#strip BEGIN/COMMIT since these are not allowed in extensions
sql_bits/spatial_ref_sys.sql: ../../spatial_ref_sys.sql
+ mkdir -p sql_bits
$(PERL) -pe 's/BEGIN\;//g ; s/COMMIT\;//g' $< > $@
#strip BEGIN/COMMIT since these are not allowed in extensions
@@ -69,6 +72,7 @@ sql_bits/postgis.sql: ../../postgis/post
$(MAKE) -C ../../doc comments
sql_bits/postgis_comments.sql: ../../doc/postgis_comments.sql
+ mkdir -p sql_bits
cp $< $@
#strip BEGIN/COMMIT since these are not allowed in extensions
@@ -77,12 +81,15 @@ sql_bits/rtpostgis.sql: ../../raster/rt_
$(PERL) -pe 's/BEGIN\;//g ; s/COMMIT\;//g' $< > $@
sql_bits/spatial_ref_sys_config_dump.sql: ../../spatial_ref_sys.sql ../../utils/create_spatial_ref_sys_config_dump.pl
+ mkdir -p sql_bits
$(PERL) ../../utils/create_spatial_ref_sys_config_dump.pl $< > $@
sql_bits/rtpostgis_upgrade.sql: ../../raster/rt_pg/rtpostgis_upgrade_for_extension.sql
+ mkdir -p sql_bits
$(PERL) -pe "s/BEGIN\;//g ; s/COMMIT\;//g; s/^(DROP .*)\;/SELECT postgis_extension_drop_if_exists('$(EXTENSION)', '\1');\n\1\;/" $< > $@
sql_bits/postgis_upgrade.sql: ../../postgis/postgis_upgrade_for_extension.sql
+ mkdir -p sql_bits
$(PERL) -pe "s/BEGIN\;//g ; s/COMMIT\;//g; s/^(DROP .*)\;/SELECT postgis_extension_drop_if_exists('$(EXTENSION)', '\1');\n\1\;/" $< > $@
@@ -90,10 +97,12 @@ sql_bits/postgis_upgrade.sql: ../../post
$(MAKE) -C ../../doc comments
sql_bits/raster_comments.sql: ../../doc/raster_comments.sql
+ mkdir -p sql_bits
cp $< $@
#postgis_extension_upgrade_minor.sql is the one that contains both postgis AND raster
sql_bits/postgis_extension_upgrade_minor.sql: ../postgis_extension_helper.sql sql_bits/postgis_upgrade.sql sql_bits/rtpostgis_upgrade.sql ../../doc/raster_comments.sql ../../doc/postgis_comments.sql ../postgis_extension_helper_uninstall.sql
+ mkdir -p sql_bits
printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@
cat $^ >> $@
debian/patches/parallel-postgis_tiger_geocoder.patch
View file @ d71ff902
......@@ -22,3 +22,37 @@ Author: Bas Couwenberg <sebastic@debian.org>
cp $< $@
sql/test-pagc_normalize_address.sql: sql_bits/test_tuples_only_unaligned.sql.in ../../extras/tiger_geocoder/regress/pagc_normalize_address_regress.sql
@@ -123,6 +125,7 @@ sql_bits/tiger_geocoder_minor.sql.in: ..
../../extras/tiger_geocoder/geocode/geocode.sql \
../../extras/tiger_geocoder/geocode/reverse_geocode.sql \
../../extras/tiger_geocoder/geocode/census_tracts_functions.sql
+ mkdir -p sql_bits
cat $^ > $@
#also remove tiger_data from extension if it is part of it so data gets backed up
@@ -162,21 +165,25 @@ sql_bits/tiger_geocoder.sql.in: sql_bits
../../extras/tiger_geocoder/topology/tiger_topology_loader.sql \
../postgis_extension_helper.sql \
sql_bits/add_search_path.sql
+ mkdir -p sql_bits
cat $^ > $@
echo "SELECT postgis_extension_drop_if_exists('${EXTENSION}', 'DROP SCHEMA tiger_data');" >> $@
cat ../postgis_extension_helper_uninstall.sql >> $@
sql_bits/tiger_geocoder.sql: sql_bits/tiger_geocoder.sql.in
+ mkdir -p sql_bits
sed -e 's/BEGIN;//g' -e 's/COMMIT;//g' -e '/^CREATE SCHEMA/d;' $< > $@
$(PERL) -pe 's/BEGIN\;//g ; s/COMMIT\;//g' $< > $@
sql_bits/add_search_path.sql: sql_bits/add_search_path.sql.in
+ mkdir -p sql_bits
cp $< $@
../../doc/tiger_geocoder_comments.sql:
$(MAKE) -C ../../doc comments
sql_bits/tiger_geocoder_comments.sql: ../../doc/tiger_geocoder_comments.sql
+ mkdir -p sql_bits
cp $< $@
#grep all lines that start with CREATE OR REPLACE FUNCTION, TRIGGER...
debian/patches/series
View file @ d71ff902
......@@ -2,3 +2,5 @@ link-liblwgeom
relax-test-timing-constraints.patch
rt_gdalwarp.patch
parallel-postgis_tiger_geocoder.patch
parallel-postgis.patch
parallel-extensions.patch