svn commit: r469956 - in head: Mk lang/gcc47 lang/gcc48 lang/gcc49 lang/gcc5 lang/gcc6 lang/gcc6-devel lang/gcc7 lang/gcc7-devel lang/gcc8-devel lang/gcc9-devel

Tijl Coosemans tijl at FreeBSD.org
Mon May 14 19:15:39 UTC 2018 

Author: tijl
Date: Mon May 14 19:15:36 2018
New Revision: 469956
URL: https://svnweb.freebsd.org/changeset/ports/469956

Log:
  Run "/usr/sbin/service ldconfig restart" for USE_LDCONFIG instead of
  "ldconfig -m <path>" so the order of ldconfig search directories after
  package installation is the same as after a reboot.  The original command
  simply appends the path to the list of directories while the ldconfig rc.d
  script uses "sort -u".
  
  Bump lang/gcc* which are known to install libraries with exactly the same
  name so the library loaded at runtime depends on the order of the search
  directories.
  
  PR:		228046
  Approved by:	portmgr (antoine)

Modified:
  head/Mk/bsd.port.mk
  head/lang/gcc47/Makefile
  head/lang/gcc48/Makefile
  head/lang/gcc49/Makefile
  head/lang/gcc5/Makefile
  head/lang/gcc6-devel/Makefile
  head/lang/gcc6/Makefile
  head/lang/gcc7-devel/Makefile
  head/lang/gcc7/Makefile
  head/lang/gcc8-devel/Makefile
  head/lang/gcc9-devel/Makefile

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Mon May 14 19:12:54 2018	(r469955)
+++ head/Mk/bsd.port.mk	Mon May 14 19:15:36 2018	(r469956)
@@ -4512,22 +4512,13 @@ generate-plist: ${WRKDIR}
 	@${ECHO_CMD} "@postunexec ${LINUXBASE}/sbin/ldconfig" >> ${TMPPLIST}
 .endif
 .else
-.if defined(USE_LDCONFIG)
+.if defined(USE_LDCONFIG) || defined(USE_LDCONFIG32)
 .if !defined(INSTALL_AS_USER)
-	@${ECHO_CMD} "@postexec ${LDCONFIG} -m ${USE_LDCONFIG}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@postunexec ${LDCONFIG} -R" >> ${TMPPLIST}
+	@${ECHO_CMD} "@postexec /usr/sbin/service ldconfig restart > /dev/null" >> ${TMPPLIST}
+	@${ECHO_CMD} "@postunexec /usr/sbin/service ldconfig restart > /dev/null" >> ${TMPPLIST}
 .else
-	@${ECHO_CMD} "@postexec ${LDCONFIG} -m ${USE_LDCONFIG} || ${TRUE}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@postunexec ${LDCONFIG} -R || ${TRUE}" >> ${TMPPLIST}
-.endif
-.endif
-.if defined(USE_LDCONFIG32)
-.if !defined(INSTALL_AS_USER)
-	@${ECHO_CMD} "@postexec ${LDCONFIG} -32 -m ${USE_LDCONFIG32}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@postunexec ${LDCONFIG} -32 -R" >> ${TMPPLIST}
-.else
-	@${ECHO_CMD} "@postexec ${LDCONFIG} -32 -m ${USE_LDCONFIG32} || ${TRUE}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@postunexec ${LDCONFIG} -32 -R || ${TRUE}" >> ${TMPPLIST}
+	@${ECHO_CMD} "@postexec /usr/sbin/service ldconfig restart > /dev/null || ${TRUE}" >> ${TMPPLIST}
+	@${ECHO_CMD} "@postunexec /usr/sbin/service ldconfig restart > /dev/null || ${TRUE}" >> ${TMPPLIST}
 .endif
 .endif
 .endif

Modified: head/lang/gcc47/Makefile
==============================================================================
--- head/lang/gcc47/Makefile	Mon May 14 19:12:54 2018	(r469955)
+++ head/lang/gcc47/Makefile	Mon May 14 19:15:36 2018	(r469956)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.7.4
-PORTREVISION=	9
+PORTREVISION=	10
 PORTEPOCH=	1
 CATEGORIES=	lang
 MASTER_SITES=	GCC

Modified: head/lang/gcc48/Makefile
==============================================================================
--- head/lang/gcc48/Makefile	Mon May 14 19:12:54 2018	(r469955)
+++ head/lang/gcc48/Makefile	Mon May 14 19:15:36 2018	(r469956)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.8.5
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	lang
 MASTER_SITES=	GCC
 PKGNAMESUFFIX=	${SUFFIX}

Modified: head/lang/gcc49/Makefile
==============================================================================
--- head/lang/gcc49/Makefile	Mon May 14 19:12:54 2018	(r469955)
+++ head/lang/gcc49/Makefile	Mon May 14 19:15:36 2018	(r469956)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.9.4
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	lang
 MASTER_SITES=	GCC
 PKGNAMESUFFIX=	${SUFFIX}

Modified: head/lang/gcc5/Makefile
==============================================================================
--- head/lang/gcc5/Makefile	Mon May 14 19:12:54 2018	(r469955)
+++ head/lang/gcc5/Makefile	Mon May 14 19:15:36 2018	(r469956)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	5.5.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang
 MASTER_SITES=	GCC
 PKGNAMESUFFIX=	${SUFFIX}

Modified: head/lang/gcc6-devel/Makefile
==============================================================================
--- head/lang/gcc6-devel/Makefile	Mon May 14 19:12:54 2018	(r469955)
+++ head/lang/gcc6-devel/Makefile	Mon May 14 19:15:36 2018	(r469956)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	6.4.1.s20180509
+PORTREVISION=	1
 CATEGORIES=	lang java
 MASTER_SITES=	GCC/snapshots/${DIST_VERSION}
 PKGNAMESUFFIX=	${SUFFIX}-devel

Modified: head/lang/gcc6/Makefile
==============================================================================
--- head/lang/gcc6/Makefile	Mon May 14 19:12:54 2018	(r469955)
+++ head/lang/gcc6/Makefile	Mon May 14 19:15:36 2018	(r469956)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	6.4.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	lang java
 MASTER_SITES=	GCC/releases/gcc-${DISTVERSION}
 PKGNAMESUFFIX=	${SUFFIX}

Modified: head/lang/gcc7-devel/Makefile
==============================================================================
--- head/lang/gcc7-devel/Makefile	Mon May 14 19:12:54 2018	(r469955)
+++ head/lang/gcc7-devel/Makefile	Mon May 14 19:15:36 2018	(r469956)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	7.3.1.s20180503
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	GCC/snapshots/${DIST_VERSION}
 PKGNAMESUFFIX=	${SUFFIX}-devel

Modified: head/lang/gcc7/Makefile
==============================================================================
--- head/lang/gcc7/Makefile	Mon May 14 19:12:54 2018	(r469955)
+++ head/lang/gcc7/Makefile	Mon May 14 19:15:36 2018	(r469956)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	7.3.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang
 MASTER_SITES=	GCC
 PKGNAMESUFFIX=	${SUFFIX}

Modified: head/lang/gcc8-devel/Makefile
==============================================================================
--- head/lang/gcc8-devel/Makefile	Mon May 14 19:12:54 2018	(r469955)
+++ head/lang/gcc8-devel/Makefile	Mon May 14 19:15:36 2018	(r469956)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	8.1.1.s20180511
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	GCC/snapshots/${DIST_VERSION}
 PKGNAMESUFFIX=	${SUFFIX}-devel

Modified: head/lang/gcc9-devel/Makefile
==============================================================================
--- head/lang/gcc9-devel/Makefile	Mon May 14 19:12:54 2018	(r469955)
+++ head/lang/gcc9-devel/Makefile	Mon May 14 19:15:36 2018	(r469956)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	9.0.0.s20180506
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	GCC/snapshots/${DIST_VERSION}
 PKGNAMESUFFIX=	${SUFFIX}-devel

More information about the svn-ports-head mailing list