From: =?utf-8?q?C=C3=A9dric_Villemain?= <cedric@2ndquadrant.com>
Reply-To: cedric@2ndquadrant.com
Organization: 2ndQuadrant
To: pgsql-hackers@postgresql.org
Subject: Re: Bugfix and new feature for PGXS
Date: Thu, 20 Jun 2013 13:12:32 +0200
User-Agent: KMail/1.13.7 (Linux/3.8-2-amd64; KDE/4.8.4; x86_64; ; )
Cc: Peter Eisentraut <peter_e@gmx.net>, Andrew Dunstan <andrew@dunslane.net>,
 Craig Ringer <craig@2ndquadrant.com>
References: <201306181552.36673.cedric@2ndquadrant.com>
 <201306192058.23832.cedric@2ndquadrant.com>
 <1371698781.13762.48.camel@vanquo.pezone.net>
In-Reply-To: <1371698781.13762.48.camel@vanquo.pezone.net>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="nextPart10321261.T6sbM6skSC";
 protocol="application/pgp-signature"; micalg=pgp-sha1
Content-Transfer-Encoding: 7bit
Message-Id: <201306201312.35493.cedric@2ndquadrant.com>
Precedence: bulk
Sender: pgsql-hackers-owner@postgresql.org

--nextPart10321261.T6sbM6skSC
Content-Type: Text/Plain;
  charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Le jeudi 20 juin 2013 05:26:21, Peter Eisentraut a =C3=A9crit :
> On Wed, 2013-06-19 at 20:58 +0200, C=C3=A9dric Villemain wrote:
> > I believe he answered the proposal to put all headers on the same flat
> > directory, instead of a tree.
>=20
> The headers are used as
>=20
> #include "hstore.h"
> #include "ltree.h"
> etc.
>=20
> in the existing source code.
>=20
> If you want to install the for use by others, you can do one of three
> things:
>=20
> 1) Install them into $(pg_config --includedir-server), so other users
> will just include them in the same way as shown above.

I don't like this one because extension can overwrite sever headers.

> 2) Install them in a different directory, but keep the same #include
> lines.  That would require PGXS changes, perhaps a new pg_config option,
> or something that produces the right -I option to find them.

Patch of PGXS is not a problem.
pg_config patch is a requirement only if users set their own=20
$(includedir_contrib) variable. I didn't though about it, but it is probabl=
y=20
better to add that. This looks trivial too.

To include hstore header we write =C2=AB#include "hstore.h"=C2=BB but we ad=
d :
 -I$(includedir_contrib)/hstore to the FLAGS in the extension makefile whic=
h=20
does require hstore. It changes nothing to hstore Makefile itself.

The main difference is that before we had to -I$(top_srcdir)/../contrib/hst=
ore=20
*iff* we are not building with PGXS (else we need to have the hstore source=
=20
available somewhere), now we can do -I$(includedir_contrib)/hstore with PGX=
S=20
(hstore need to be installed first, as we USE_PGXS)

Then PGXS offers to catch both case transparently so we can do :
=2DI${include_contrib_header)  in Makefile
and pgxs.mk takes care of adjusting include_contrib_header (or whatever its=
=20
name) according to USE_PGXS value.

> 3) Install them in a different directory and require a different
> #include line.  But then you have to change the existing uses as well,
> which would probably require moving files around.

Having to change existing source code do keep the same behavior is not=20
attractive at all.

> Both 2 and 3 require a lot of work, possibly compatibility breaks, for
> no obvious reason.

2 is a good solution and not a lot of work, IMO.

Removing the need of setting -I$(include...) in the contrib Makefile can be=
=20
done later by adding a PGXS variable to define the contrib requirements, th=
is=20
is something different from the current feature (build contrib depending on=
=20
another(s) without full source tree)
=2D-=20
C=C3=A9dric Villemain +33 (0)6 20 30 22 52
http://2ndQuadrant.fr/
PostgreSQL: Support 24x7 - D=C3=A9veloppement, Expertise et Formation

--nextPart10321261.T6sbM6skSC
Content-Type: application/pgp-signature; name=signature.asc 
Content-Description: This is a digitally signed message part.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)

iQEcBAABAgAGBQJRwuOjAAoJENsgH0yzVBebQ/oH/3EH82lP4Es/Y462ZqScTV5a
W/Vir/vqRMSnA4NqU0n+dxHsFfY82zr8BvqhM+9iEh8rkS0mjqQiVQKkuq92NlJj
EUdfjsU7YI9fiBdQgOf2rqa11E8hwT8DFHsAPWeDuPDE80cDPcz4IRj8UAD3azrs
P3ykZ2P7uBf+NPyfzI6fDTIYyPWqSk79++ALK0uxiwcD5QNqjd4/IaxucHp8GiZZ
etduv+khWwjHY0BaNJmvoqqOgVpiWlMbm0GuaUK/w7xOMMKum4whDKZ9DcRh1BiE
m1dP1KU04vIMTP5loTajzgr7AzQRibJ15tp2/YCXVboTHEhYdDYegSM4rZlNlPI=
=HwWF
-----END PGP SIGNATURE-----

--nextPart10321261.T6sbM6skSC--