[cpp-linbuild] 01/02: Sort lists of things in the Makefile

[John W. O'Brien]

This is an automated email from the git hooks/post-receive script.

obrienjw pushed a commit to branch main
in repository cpp-linbuild.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-linbuild.git;a=commit;h=0bc4fc838a1bef48650587f6798f7b1fc4343e3e

commit 0bc4fc838a1bef48650587f6798f7b1fc4343e3e
Author: John W. O'Brien <john at saltant.com>
AuthorDate: Thu Jul 13 00:23:19 2023 +0000

    Sort lists of things in the Makefile
---
 Makefile | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 347c29c..cb9416e 100644
--- a/Makefile
+++ b/Makefile
@@ -42,15 +42,15 @@ BASETAG=base
 # All components
 
 COMPONENTS=\
-	SHIBEDS \
-	LOG4SHIB \
-	XERCESC \
-	XMLSECURITYC \
 	CURLOPENSSL \
-	XMLTOOLING \
+	LOG4SHIB \
 	OPENSAML \
 	SHIBBOLETH \
-	SHIBRESOLVER
+	SHIBEDS \
+	SHIBRESOLVER \
+	XERCESC \
+	XMLSECURITYC \
+	XMLTOOLING
 
 # Per-component variables
 
@@ -100,7 +100,7 @@ CURLOPENSSL_DISTNAME=curl
 CURLOPENSSL_VERSION=7.86.0
 CURLOPENSSL_DISTFILE=$(CURLOPENSSL_DISTNAME)-$(CURLOPENSSL_VERSION).$(DEFAULT_DIST_EXT)
 CURLOPENSSL_URL=https://curl.haxx.se/download/$(CURLOPENSSL_DISTFILE)
-CURLOPENSSL_VALID_PLATFORMS=centos7 amazonlinux2
+CURLOPENSSL_VALID_PLATFORMS=amazonlinux2 centos7
 
 # Look closely: these variables refer to the OPENSAML variables
 XMLTOOLING_COMPNAME=xmltooling
@@ -122,7 +122,7 @@ SHIBBOLETH_DISTNAME=shibboleth-sp
 SHIBBOLETH_VERSION=3.4.1
 SHIBBOLETH_DISTFILE=$(SHIBBOLETH_DISTNAME)-$(SHIBBOLETH_VERSION).$(DEFAULT_DIST_EXT)
 SHIBBOLETH_URL=https://shibboleth.net/downloads/service-provider/$(SHIBBOLETH_VERSION)/$(SHIBBOLETH_DISTFILE)
-SHIBBOLETH_DEPENDS=LOG4SHIB XERCESC XMLSECURITYC XMLTOOLING OPENSAML
+SHIBBOLETH_DEPENDS=LOG4SHIB OPENSAML XERCESC XMLSECURITYC XMLTOOLING
 SHIBBOLETH_DEPENDS_centos7=CURLOPENSSL
 SHIBBOLETH_DEPENDS_amazonlinux2=CURLOPENSSL
 
@@ -131,7 +131,8 @@ SHIBRESOLVER_DISTNAME=shibboleth-resolver
 SHIBRESOLVER_VERSION=3.4.0
 SHIBRESOLVER_DISTFILE=$(SHIBRESOLVER_DISTNAME)-$(SHIBRESOLVER_VERSION).$(DEFAULT_DIST_EXT)
 SHIBRESOLVER_URL=https://shibboleth.net/downloads/service-provider/extensions/$(SHIBRESOLVER_COMPNAME)/$(SHIBRESOLVER_VERSION)/$(SHIBRESOLVER_DISTFILE)
-SHIBRESOLVER_DEPENDS=LOG4SHIB XERCESC XMLSECURITYC XMLTOOLING OPENSAML SHIBBOLETH
+SHIBRESOLVER_DEPENDS=LOG4SHIB OPENSAML SHIBBOLETH XERCESC XMLSECURITYC XMLTOOLING
+
 
 #
 # Platform-neutral variables and rules
@@ -161,10 +162,10 @@ distfiles: $(foreach component,$(COMPONENTS),$(SOURCEDIR)/$($(component)_DISTFIL
 #
 
 PLATFORMS=\
-	centos7 \
-	centos8 \
 	amazonlinux2 \
 	amazonlinux2023 \
+	centos7 \
+	centos8 \
 	rockylinux8 \
 	rockylinux9
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.