Date: Fri, 23 Aug 2019 12:46:15 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r509644 - in head: Keywords Mk Message-ID: <201908231246.x7NCkFP2074136@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Fri Aug 23 12:46:14 2019 New Revision: 509644 URL: https://svnweb.freebsd.org/changeset/ports/509644 Log: Use keywords to simplify ldconfig code PR: 239226 Reviewed by: mat@ Differential Revision: https://reviews.freebsd.org/D20951 Added: head/Keywords/ldconfig-linux.ucl (contents, props changed) head/Keywords/ldconfig.ucl (contents, props changed) Modified: head/Mk/bsd.port.mk Added: head/Keywords/ldconfig-linux.ucl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/Keywords/ldconfig-linux.ucl Fri Aug 23 12:46:14 2019 (r509644) @@ -0,0 +1,15 @@ +# $FreeBSD$ +# +# MAINTAINER: portmgr@FreeBSD.org +# + +post-install: <<EOD + if [ -n "$(/sbin/sysctl -q compat.linux.osrelease)" ]; then + %@/sbin/ldconfig + fi +EOD +post-deinstall: <<EOD + if [ -n "$(/sbin/sysctl -q compat.linux.osrelease)" ]; then + %@/sbin/ldconfig + fi +EOD Added: head/Keywords/ldconfig.ucl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/Keywords/ldconfig.ucl Fri Aug 23 12:46:14 2019 (r509644) @@ -0,0 +1,19 @@ +# $FreeBSD$ +# +# MAINTAINER: portmgr@FreeBSD.org +# + +post-install: <<EOD + if ! /usr/sbin/service ldconfig restart >/dev/null; then + if [ -z "${INSTALL_AS_USER}" ]; then + exit 1 + fi + fi +EOD +post-deinstall: <<EOD + if ! /usr/sbin/service ldconfig restart >/dev/null; then + if [ -z "${INSTALL_AS_USER}" ]; then + exit 1 + fi + fi +EOD Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Fri Aug 23 12:45:11 2019 (r509643) +++ head/Mk/bsd.port.mk Fri Aug 23 12:46:14 2019 (r509644) @@ -1865,6 +1865,14 @@ USE_LDCONFIG= ${PREFIX}/lib IGNORE= has USE_LDCONFIG32 set to yes, which is not correct .endif +.if defined(USE_LDCONFIG) || defined(USE_LDCONFIG32) +.if defined(USE_LINUX_PREFIX) +PLIST_FILES+= "@ldconfig-linux ${LINUXBASE}" +.else +PLIST_FILES+= "@ldconfig" +.endif +.endif + PKG_IGNORE_DEPENDS?= 'this_port_does_not_exist' .if defined(_DESTDIR_VIA_ENV) @@ -4454,23 +4462,6 @@ generate-plist: ${WRKDIR} @${ECHO_CMD} ${dir} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} -e 's,^,@dir ,' >> ${TMPPLIST} .endfor -.if defined(USE_LINUX_PREFIX) -.if defined(USE_LDCONFIG) - @${ECHO_CMD} '@preexec [ -n "`/sbin/sysctl -q compat.linux.osrelease`" ] || ( echo "Cannot install package: kernel missing Linux support"; exit 1 )' >> ${TMPPLIST} - @${ECHO_CMD} "@postexec ${LINUXBASE}/sbin/ldconfig" >> ${TMPPLIST} - @${ECHO_CMD} "@postunexec ${LINUXBASE}/sbin/ldconfig" >> ${TMPPLIST} -.endif -.else -.if defined(USE_LDCONFIG) || defined(USE_LDCONFIG32) -.if !defined(INSTALL_AS_USER) - @${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 /usr/sbin/service ldconfig restart > /dev/null || ${TRUE}" >> ${TMPPLIST} - @${ECHO_CMD} "@postunexec /usr/sbin/service ldconfig restart > /dev/null || ${TRUE}" >> ${TMPPLIST} -.endif -.endif -.endif .endif ${TMPPLIST}:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908231246.x7NCkFP2074136>