Commit Graph

73 Commits

Author SHA1 Message Date
Thomas Tuegel
de938ee3f5
gdal: fix path to mysql_config 2020-09-12 06:58:25 -05:00
Jonathan Ringer
bd6bfd53e7 gdal: 3.0.4 -> 3.1.2.post2020-08-26
parsing of POPPLER_MINOR_VERSION is broken, as it doesn't truncate
leading zeroes. Leading gcc to believe it's trying to evaluate an
octal value (e.g. 08 > 72 ). However, 8 isn't a valid octal value.

Patches from master do not apply cleanly do a series of changes
done to configure.ac. So instead, a commit from master was chosen.
2020-08-26 12:38:57 +02:00
Bruce Toll
bb46f897d1 gdal: 3.0.3 -> 3.0.4
Update GDAL/OGR to 3.0.4

GDAL 3.0.4 includes a fix for build failure due to poppler 0.85.0
upgrade (change to parameters for setErrorCallback). See commit:

6e9e51ef93
2020-03-02 09:38:08 -05:00
brano543
78b6642e5d gdal: correct indentation in preConfigure 2020-02-15 13:29:00 +01:00
brano543
b57af2d024 gdal: Fix finding postgresql after 3.0 update 2020-02-15 13:09:14 +01:00
brano543
175d83634b gdal: Clean up formatting 2020-02-15 13:05:56 +01:00
Raphael Das Gupta
e8aa909fa7 gdal: 3.0.1 -> 3.0.3
GDAL/OGR 3.0.3 contains bugfixes to be shipped with QGIS 3.10.2
(https://github.com/NixOS/nixpkgs/issues/78755)

See https://lists.osgeo.org/pipermail/qgis-developer/2020-January/060056.html
and https://blog.qgis.org/2020/01/24/public-service-announcement-update-to-the-latest-point-release-now/
2020-01-29 16:13:33 +01:00
Robert Scott
def17695b9 gdal: add patch for CVE-2019-17545 2019-10-26 21:06:23 +01:00
Vladimír Čunát
22a216849b
Re-Revert "Merge branch 'staging-next'"
This reverts commit f8a8fc6c7c.
2019-09-22 09:38:09 +02:00
Vladimír Čunát
f8a8fc6c7c
Revert "Merge branch 'staging-next'"
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
2019-09-21 20:05:09 +02:00
Izorkin
329a88efa7 treewide: replace mysql.connector-c to libmysqlclient 2019-09-09 15:55:34 +03:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Jonathan Ringer
a84f21944f gdal: 2.4.0 -> 3.0.1 2019-07-14 09:58:53 -07:00
Daniel Schaefer
bac4d95aa2 treewide: Change URLs to HTTPS
Lots of URLs were HTTP redirect to HTTPS. Changed those and checked them
if there's actual content. Inspired by
https://github.com/NixOS/nixpkgs/issues/60004
2019-04-22 10:19:54 +02:00
Vladimír Čunát
e36b4d6a85
gdal: fix patch hashes
Commit d2f39adea9 added them with hashes *before* normalization done
by fetchpatch.
2019-01-20 00:38:41 +01:00
Gabriel Ebner
d2f39adea9 gdal: fix build with poppler 0.73 2019-01-19 15:42:58 +01:00
R. RyanTM
6f8e0ae608 gdal: 2.3.2 -> 2.4.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gdal/versions
2019-01-19 15:21:50 +01:00
Chris Hodapp
4af38a2516 gdal: Add libxml2 to build 2018-10-06 11:09:21 -04:00
Matthew Pickering
f80730d903 gdal: 2.3.1 -> 2.3.2 2018-09-30 20:07:36 +00:00
Orivej Desh
c2cf0c5f4c gdal: build with xml support 2018-08-11 00:58:31 +00:00
Orivej Desh
2659e0a206 gdal: update proj option 2018-08-09 03:48:09 +00:00
Orivej Desh
e6a3e4706a gdal: 2.3.0 -> 2.3.1
qhull and giflib are added to build inputs to unbundle them, otherwise gdal uses
internal copies.
2018-08-09 02:26:57 +00:00
Silvan Mosberger
57bccb3cb8 treewide: http -> https sources (#42676)
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
2018-06-28 20:43:35 +02:00
Josef Kemetmüller
13e3a21b5c gdal: Fix darwin build
This fixes:
  error: cannot initialize a variable of type 'GooString *' with an rvalue of type 'const GooString *'
which occurs with recent clang or gcc-7.
See https://github.com/OSGeo/gdal/pull/573
2018-06-04 14:19:35 +02:00
R. RyanTM
17ccab6b12 gdal: 2.2.4 -> 2.3.0
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/gdal/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/.gdal2tiles.py-wrapped -h’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/.gdal2tiles.py-wrapped --help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/gdal2tiles.py -h’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/gdal2tiles.py --help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/.gdalident.py-wrapped -h’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/.gdalident.py-wrapped --help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/.gdalident.py-wrapped help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/gdalident.py -h’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/gdalident.py --help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/gdalident.py help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/.mkgraticule.py-wrapped help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/mkgraticule.py help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/gdalsrsinfo help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/ogrinfo help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/testepsg -h’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/testepsg --help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/testepsg help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/gdal-config --version’ and found version 2.3.0
- found 2.3.0 with grep in /nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0
- directory tree listing: https://gist.github.com/b6bcad3891a98e65991899121540cc85
- du listing: https://gist.github.com/f89d55b943a68b1550b8eff3f204f27f
2018-05-14 03:58:18 -07:00
Ryan Mulligan
dcd13b929e gdal: 2.2.3 -> 2.2.4
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/.epsg_tr.py-wrapped --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/epsg_tr.py --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/.gcps2vec.py-wrapped --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gcps2vec.py --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/.gdal2tiles.py-wrapped -h` got 0 exit code
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/.gdal2tiles.py-wrapped --help` got 0 exit code
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/.gdal2tiles.py-wrapped --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdal2tiles.py -h` got 0 exit code
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdal2tiles.py --help` got 0 exit code
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdal2tiles.py --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/.gdal_auth.py-wrapped --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdal_auth.py --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/.gdal_fillnodata.py-wrapped --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdal_fillnodata.py --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/.gdal_merge.py-wrapped --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdal_merge.py --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/.gdal_polygonize.py-wrapped --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdal_polygonize.py --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/.gdal_proximity.py-wrapped --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdal_proximity.py --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/.gdal_sieve.py-wrapped --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdal_sieve.py --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/.gdalchksum.py-wrapped --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdalchksum.py --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/.gdalcompare.py-wrapped --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdalcompare.py --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/.gdalident.py-wrapped -h` got 0 exit code
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/.gdalident.py-wrapped --help` got 0 exit code
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/.gdalident.py-wrapped help` got 0 exit code
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/.gdalident.py-wrapped --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdalident.py -h` got 0 exit code
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdalident.py --help` got 0 exit code
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdalident.py help` got 0 exit code
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdalident.py --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/.gdalimport.py-wrapped --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdalimport.py --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/.gdalmove.py-wrapped --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdalmove.py --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/.mkgraticule.py-wrapped help` got 0 exit code
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/mkgraticule.py help` got 0 exit code
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/.rgb2pct.py-wrapped --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/rgb2pct.py --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdalinfo --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdalserver --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdal_translate --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdaladdo --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdalwarp --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/nearblack --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdalmanage --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdalenhance --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdaltransform --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdallocationinfo --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdalsrsinfo help` got 0 exit code
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdalsrsinfo --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdaltindex --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdal_rasterize --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdal_grid --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/ogrinfo help` got 0 exit code
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/ogrinfo --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/ogr2ogr --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/ogrlineref --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/testepsg -h` got 0 exit code
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/testepsg --help` got 0 exit code
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/testepsg help` got 0 exit code
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdalbuildvrt --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gnmmanage --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gnmanalyse --version` and found version 2.2.4
- ran `/nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4/bin/gdal-config --version` and found version 2.2.4
- found 2.2.4 with grep in /nix/store/jdbh08lrbarwcp1j656y02qqjlcv28xf-gdal-2.2.4
- directory tree listing: https://gist.github.com/9fbb0e6bcdf6a8ed1d3b5a8f20a84eca
2018-03-22 08:55:30 -07:00
Michel Kuhlmann
b2282b0e1d gdal: 2.2.1 -> 2.2.3 2018-01-03 20:17:41 +01:00
Robin Gloster
ee1c85aee9 mariadb: lib -> connector-c 2017-12-29 02:18:35 +01:00
Robin Gloster
6b05651c20
Revert "postgresql: Add dev output"
Firstly this creates a cycle in 9.6 .out <-> .dev after fixing the PGXS
path.

Secondly this breaks extension handling and the pg_config as it
resolves a lot of paths relatively resulting in the following bogus
output:

BINDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/bin
DOCDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/share/doc
HTMLDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/share/doc
INCLUDEDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/include
PKGINCLUDEDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/include
INCLUDEDIR-SERVER = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/include/server
LIBDIR = /nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib
PKGLIBDIR = /nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib
LOCALEDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/share/locale
MANDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/share/man
SHAREDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/share
SYSCONFDIR = /etc/postgresql
PGXS = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/lib/pgxs/src/makefiles/pgxs.mk
CONFIGURE = '--prefix=/nix/store/irqqq4g173g9xrk1mh12kxv0s1d8dbyh-postgresql-9.5.9' '--with-openssl' '--with-libxml' '--sysconfdir=/etc' '--libdir=/nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib' '--with-ossp-uuid' 'CC=gcc'
CC = gcc
CPPFLAGS = -D_GNU_SOURCE -I/nix/store/z6r0j2b4bcdfw3pck2x6ay0vvx0qzb92-libxml2-2.9.5-dev/include/libxml2
CFLAGS = -Wall -Wmissing-prototypes -Wpointer-arith -Wdeclaration-after-statement -Wendif-labels -Wmissing-format-attribute -Wformat-security -fno-strict-aliasing -fwrapv -fexcess-precision=standard -O2
CFLAGS_SL = -fPIC
LDFLAGS = -L../../../src/common -L/nix/store/ighspl5sa3qi1zy7nkih0c9p73xjfqa6-libxml2-2.9.5/lib -Wl,--as-needed -Wl,-rpath,'/nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib',--enable-new-dtags
LDFLAGS_EX =
LDFLAGS_SL =
LIBS = -lpgcommon -lpgport -lxml2 -lssl -lcrypto -lz -lreadline -lrt -lcrypt -ldl -lm
VERSION = PostgreSQL 9.5.9

This can probably only be properly fixed by rewriting pg_config in large
parts as it does not in any way respect splitting the postgres tree and
assumes it can simply resolve paths relative to its location. This does
not even handle symlinks:

$ result-dev/bin/pg_config
BINDIR = /home/robin/dev/nixpkgs-upstream/result-dev/bin
DOCDIR = /home/robin/dev/nixpkgs-upstream/result-dev/share/doc
HTMLDIR = /home/robin/dev/nixpkgs-upstream/result-dev/share/doc
INCLUDEDIR = /home/robin/dev/nixpkgs-upstream/result-dev/include
PKGINCLUDEDIR = /home/robin/dev/nixpkgs-upstream/result-dev/include
INCLUDEDIR-SERVER = /home/robin/dev/nixpkgs-upstream/result-dev/include/server
LIBDIR = /nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib
PKGLIBDIR = /nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib
LOCALEDIR = /home/robin/dev/nixpkgs-upstream/result-dev/share/locale
MANDIR = /home/robin/dev/nixpkgs-upstream/result-dev/share/man
SHAREDIR = /home/robin/dev/nixpkgs-upstream/result-dev/share
SYSCONFDIR = /etc/postgresql
PGXS = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/lib/pgxs/src/makefiles/pgxs.mk
CONFIGURE = '--prefix=/nix/store/irqqq4g173g9xrk1mh12kxv0s1d8dbyh-postgresql-9.5.9' '--with-openssl' '--with-libxml' '--sysconfdir=/etc' '--libdir=/nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib' '--with-ossp-uuid' 'CC=gcc'
CC = gcc
CPPFLAGS = -D_GNU_SOURCE -I/nix/store/z6r0j2b4bcdfw3pck2x6ay0vvx0qzb92-libxml2-2.9.5-dev/include/libxml2
CFLAGS = -Wall -Wmissing-prototypes -Wpointer-arith -Wdeclaration-after-statement -Wendif-labels -Wmissing-format-attribute -Wformat-security -fno-strict-aliasing -fwrapv -fexcess-precision=standard -O2
CFLAGS_SL = -fPIC
LDFLAGS = -L../../../src/common -L/nix/store/ighspl5sa3qi1zy7nkih0c9p73xjfqa6-libxml2-2.9.5/lib -Wl,--as-needed -Wl,-rpath,'/nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib',--enable-new-dtags
LDFLAGS_EX =
LDFLAGS_SL =
LIBS = -lpgcommon -lpgport -lxml2 -lssl -lcrypto -lz -lreadline -lrt -lcrypt -ldl -lm
VERSION = PostgreSQL 9.5.9

cc @edolstra

Revert "bacula: fix after postgresql output splitting"

This reverts commit 13c9cbacdd.

Revert "postgresql: fix pgxs dir in pg_config"

This reverts commit 21998d597b.

Revert "rubyGems.pg: fix postgresql path"

This reverts commit e253ae7d3a.

Revert "kea: fix path to pg_config"

This reverts commit 086c636eb7.

Revert "php: fix build wrt. new postgres.dev build output"

This reverts commit 2f23a83920.

Revert "gdal: fix path to pg_config"

This reverts commit 032c50d45b.

Revert "postgresql: Add dev output"

This reverts commit b0280f598e.
2017-09-27 21:58:44 +02:00
makefu
032c50d45b
gdal: fix path to pg_config 2017-09-25 23:23:38 +02:00
Robin Gloster
4d858a2a17
gdal: don't use composableDerivation 2017-08-27 20:14:36 +02:00
Robin Gloster
400abb8877
gdal: 2.1.3 -> 2.2.1 2017-08-11 11:40:35 +02:00
Frederik Rietdijk
56fe381490 gdal: enable parallel building 2017-07-30 10:24:19 +02:00
Josef Kemetmueller
7b25d31825 gdal: Add hdf4 support 2017-06-08 07:52:16 +00:00
Chris Hodapp
f277137522 gdal: add GeoPDF support via poppler 2017-05-04 09:34:19 +02:00
Daiderd Jordan
516f909acb
gdal: fix darwin build 2017-05-02 22:21:03 +02:00
Chris Hodapp
610570e979 gdal: Add SQLite & Spatialite support 2017-04-30 20:21:16 -04:00
Lancelot SIX
4f644cd004
gdal: 2.1.1 -> 2.1.3 2017-03-14 17:59:07 +01:00
Josef Kemetmueller
9141b8cad1 gdal: enable darwin support
Also some minor tweaks:
There didn't seem any need to use -O0 optimization level anymore.
Also the option "with-libpng" should have been "with-png" all along.
2016-11-07 20:42:53 +01:00
Dmitry Kalinkin
468a5bc224
dgal: fix 2016-10-17 11:23:14 -04:00
Tuomas Tynkkynen
f97ba3070a gdal: Fix reference to mysql dev output 2016-08-30 23:00:13 +03:00
Robin Gloster
1be4907ca2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-02 13:46:36 +00:00
Michel Kuhlmann
6cf020fc29 gdal: 2.0.2 -> 2.1.1 2016-07-27 16:04:03 +02:00
Robin Gloster
2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Tuomas Tynkkynen
7fb29bfa73 treewide: Make explicit that 'dev' output of zlib is used 2016-05-19 10:04:38 +02:00
Tuomas Tynkkynen
ad1a47061e treewide: Make explicit that 'dev' output of libtiff is used 2016-05-19 10:00:46 +02:00
Tuomas Tynkkynen
309b2644ac treewide: Make explicit that 'dev' output of libpng is used 2016-05-19 10:00:44 +02:00
Tuomas Tynkkynen
be00816cab treewide: Make explicit that 'dev' output of libjpeg is used 2016-05-19 10:00:42 +02:00
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
Robin Gloster
3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00