MIME-Version: 1.0
In-Reply-To: 
 <CAMsr+YFNvjv1NDwuFqBvvg9SV4h1Y-CFVTwaLM4MJ5FHFg3o5w@mail.gmail.com>
References: <1453239881.24314.362.camel@gunduz.org>
 <CAMsr+YFqaX7shapoLRJ2S7QD1vst9ENrOtGU-_OD18Z=vpoHTA@mail.gmail.com>
 <CAMsr+YFNvjv1NDwuFqBvvg9SV4h1Y-CFVTwaLM4MJ5FHFg3o5w@mail.gmail.com>
Date: Wed, 20 Jan 2016 12:22:57 +0800
Message-ID: 
 <CAMsr+YHbLPO4XthDTmpWrNpJJZ8LN=eh8OiR7WOn6uPr=GbvpQ@mail.gmail.com>
Subject: Re: New and unified 9.5 spec file is in git
From: Craig Ringer <craig@2ndquadrant.com>
To: =?UTF-8?B?RGV2cmltIEfDnE5Ew5xa?= <devrim@gunduz.org>
Cc: pgsql-pkg-yum <pgsql-pkg-yum@postgresql.org>
Content-Type: multipart/alternative; boundary=001a113fb96a3edeb90529bc57bf
Precedence: bulk
Sender: pgsql-pkg-yum-owner@postgresql.org

--001a113fb96a3edeb90529bc57bf
Content-Type: text/plain; charset=UTF-8

I've uploaded a branch with a couple of small improvements. See
https://github.com/2ndQuadrant/pgdg-pgrpms .

git remote add 2ndq https://github.com/2ndQuadrant/pgdg-pgrpms.git
git fetch 2ndq
# view it
git log -p remotes/2ndq/add-builddepends
# merge it
git merge remotes/2ndq/add-builddepends

This is the main patch of interest:

https://github.com/2ndQuadrant/pgdg-pgrpms/commit/60524156129b27b9cf3836621a0d05afb658d60e


A further suggested improvement, which I haven't put in that tree but
wanted to flag as an idea - detect the target based on the directory name
so there's no need to have a different Makefile for each target dir and
they can all just be symlinks.

For each dist's Makefile:

-DIST=.rhel5
 SPECFILE="postgresql-9.5.spec"
+# This gibberish gets the immediate parent directory's name, prepends
RPMDIST_
+# and looks it up as a Make variable lazily on first evaluation. That way
we
+# don't require a new Makefile for each build directory.
+#
+# The RPMDIST_ vars are defined in Makefile.global
+#
+DIST=$(RPMDIST_$(shell basename $(dir $(abspath $(lastword
$(MAKEFILE_LIST))))))

then in Makefile.global:

+# These mappings could be automated with $(foreach ...) and $(eval ...)
+# but there hardly seems any point.
+RPMDIST_EL-5=.rhel5
+RPMDIST_EL-6=.rhel6
+RPMDIST_EL-7=.rhel7
+RPMDIST_F-21=.fc21
+RPMDIST_F-22=.fc22
+RPMDIST_F-23=.fc23

Then EL-5, EL-6, EL-7, F-22 and F-23 can be deleted and replaced with
common/ which is symlinks to each of them. That shouldn't upset the build
system; otherwise I'd suggest switching moving all files up a level,
removing the dist subtrees, and using "make DIST=EL-5" or whatever to
control the target.

Less duplication in the source tree, no need to remember to copy files
around, easier to track history.

--001a113fb96a3edeb90529bc57bf
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><div>I&#39;ve uploaded a branch with a couple of small imp=
rovements. See=C2=A0<a href=3D"https://github.com/2ndQuadrant/pgdg-pgrpms">=
https://github.com/2ndQuadrant/pgdg-pgrpms</a> .</div><div><br></div><div>g=
it remote add 2ndq=C2=A0<a href=3D"https://github.com/2ndQuadrant/pgdg-pgrp=
ms.git">https://github.com/2ndQuadrant/pgdg-pgrpms.git</a></div><div>git fe=
tch 2ndq</div><div># view it</div><div>git log -p remotes/2ndq/add-builddep=
ends</div><div># merge it</div><div>git merge=C2=A0remotes/2ndq/add-buildde=
pends</div><div><br></div><div>This is the main patch of interest:</div><di=
v><br></div><div><a href=3D"https://github.com/2ndQuadrant/pgdg-pgrpms/comm=
it/60524156129b27b9cf3836621a0d05afb658d60e">https://github.com/2ndQuadrant=
/pgdg-pgrpms/commit/60524156129b27b9cf3836621a0d05afb658d60e</a><br></div><=
div><br></div><div><br></div><div><br></div><br>A further suggested improve=
ment, which I haven&#39;t put in that tree but wanted to flag as an idea - =
detect the target based on the directory name so there&#39;s no need to hav=
e a different Makefile for each target dir and they can all just be symlink=
s.<div><br></div><div>For each dist&#39;s Makefile:</div><div><br></div><di=
v><div>-DIST=3D.rhel5</div><div>=C2=A0SPECFILE=3D&quot;postgresql-9.5.spec&=
quot;</div><div>+# This gibberish gets the immediate parent directory&#39;s=
 name, prepends RPMDIST_</div><div>+# and looks it up as a Make variable la=
zily on first evaluation. That way we</div><div>+# don&#39;t require a new =
Makefile for each build directory.</div><div>+#</div><div>+# The RPMDIST_ v=
ars are defined in Makefile.global</div><div>+#</div><div>+DIST=3D$(RPMDIST=
_$(shell basename $(dir $(abspath $(lastword $(MAKEFILE_LIST))))))</div></d=
iv><div><br></div><div>then in Makefile.global:</div><div><br></div><div><d=
iv>+# These mappings could be automated with $(foreach ...) and $(eval ...)=
</div><div>+# but there hardly seems any point.</div><div>+RPMDIST_EL-5=3D.=
rhel5</div><div>+RPMDIST_EL-6=3D.rhel6</div><div>+RPMDIST_EL-7=3D.rhel7</di=
v><div>+RPMDIST_F-21=3D.fc21</div><div>+RPMDIST_F-22=3D.fc22</div><div>+RPM=
DIST_F-23=3D.fc23</div></div><div><br></div><div>Then EL-5, EL-6, EL-7, F-2=
2 and F-23 can be deleted and replaced with common/ which is symlinks to ea=
ch of them. That shouldn&#39;t upset the build system; otherwise I&#39;d su=
ggest switching moving all files up a level, removing the dist subtrees, an=
d using &quot;make DIST=3DEL-5&quot; or whatever to control the target.</di=
v><div><br></div><div>Less duplication in the source tree, no need to remem=
ber to copy files around, easier to track history.</div></div>

--001a113fb96a3edeb90529bc57bf--