Date: Fri, 20 Feb 2015 20:59:09 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379469 - in head/security: krb5 krb5-111 krb5-112 Message-ID: <201502202059.t1KKx93g085215@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Fri Feb 20 20:59:08 2015 New Revision: 379469 URL: https://svnweb.freebsd.org/changeset/ports/379469 QAT: https://qat.redports.org/buildarchive/r379469/ Log: Fix broken rpath. Submitted by: hrs Modified: head/security/krb5-111/Makefile head/security/krb5-112/Makefile head/security/krb5/Makefile Modified: head/security/krb5-111/Makefile ============================================================================== --- head/security/krb5-111/Makefile Fri Feb 20 20:26:23 2015 (r379468) +++ head/security/krb5-111/Makefile Fri Feb 20 20:59:08 2015 (r379469) @@ -3,7 +3,7 @@ PORTNAME= krb5 PORTVERSION= 1.11.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/ PKGNAMESUFFIX= -111 @@ -30,7 +30,7 @@ USE_PERL5= build USE_LDCONFIG= yes USE_CSTD= gnu99 GNU_CONFIGURE= yes -CONFIGURE_ARGS?= --without-system-verto +CONFIGURE_ARGS?= --without-system-verto --disable-rpath CONFIGURE_ENV= NSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" YACC="${YACC}" MAKE_ARGS= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" @@ -43,19 +43,29 @@ LDAP= Enable LDAP support .if defined(KRB5_HOME) PREFIX= ${KRB5_HOME} -CFLAGS+= -Wl,-rpath=${KRB5_HOME}/lib -LDFLAGS+= -Wl,-rpath=${KRB5_HOME}/lib .if ${KRB5_HOME} != ${LOCALBASE} BROKEN= LIB_DEPENDS when using KRB5_HOME is broken .endif .endif -LDFLAGS+= -L${LOCALBASE}/lib -CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB} +CFLAGS+= -I${LOCALBASE}/include -I${OPENSSLINC} USE_OPENSSL= yes .include <bsd.port.pre.mk> +.if !empty(KRB5_HOME) +_RPATH= ${KRB5_HOME}/lib: +.else +_RPATH= ${LOCALBASE}/lib: +.endif +.if !empty(LDFLAGS:M-Wl,-rpath,*) +.for F in ${LDFLAGS:M-Wl,-rpath,*} +LDFLAGS:= -Wl,-rpath,${_RPATH}${F:S/-Wl,-rpath,//} \ + ${LDFLAGS:N-Wl,-rpath,*} +.endfor +.endif + .if ${PORT_OPTIONS:MDNS_FOR_REALM} CONFIGURE_ARGS+= --enable-dns-for-realm .endif @@ -68,8 +78,6 @@ PLIST_SUB+= LDAP="" PLIST_SUB+= LDAP="@comment " .endif -.include "${PORTSDIR}/Mk/bsd.openssl.mk" - .if defined(PROGRAM_TRANSFORM_NAME) && ${PROGRAM_TRANSFORM_NAME} != "" CONFIGURE_ARGS+= --program-transform-name="${PROGRAM_TRANSFORM_NAME}" .endif @@ -79,8 +87,6 @@ WRKSRC= ${WRKDIR}/krb5-${PORTVERSION}/ HTML_DOC_DIR= ${WRKDIR}/krb5-${PORTVERSION}/doc/html PDF_DOC_DIR= ${WRKDIR}/krb5-${PORTVERSION}/doc/pdf -CONFIGURE_ARGS+= CPPFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB} -L${LOCALBASE}/include" - post-extract: @${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/krb5-${PORTVERSION}.tar.gz --no-same-owner --no-same-permissions @${RM} ${WRKDIR}/krb5-${PORTVERSION}.tar.gz ${WRKDIR}/krb5-${PORTVERSION}.tar.gz.asc Modified: head/security/krb5-112/Makefile ============================================================================== --- head/security/krb5-112/Makefile Fri Feb 20 20:26:23 2015 (r379468) +++ head/security/krb5-112/Makefile Fri Feb 20 20:59:08 2015 (r379469) @@ -3,7 +3,7 @@ PORTNAME= krb5 PORTVERSION= 1.12.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/ PKGNAMESUFFIX= -112 @@ -30,7 +30,8 @@ USE_LDCONFIG= yes USE_CSTD= gnu99 GNU_CONFIGURE= yes USES= gettext gmake perl5 libtool:build -CONFIGURE_ARGS?= --enable-shared --without-system-verto +CONFIGURE_ARGS?= --enable-shared --without-system-verto \ + --disable-rpath CONFIGURE_ENV= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" YACC="${YACC}" MAKE_ARGS= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" @@ -43,17 +44,28 @@ LDAP= Enable LDAP support .if defined(KRB5_HOME) PREFIX= ${KRB5_HOME} -CFLAGS+= -Wl,-rpath=${KRB5_HOME}/lib -LDFLAGS+= -Wl,-rpath=${KRB5_HOME}/lib .endif -LDFLAGS+= -L${LOCALBASE}/lib -CFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include -I${OPENSSLINC} +LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB} USE_OPENSSL= yes USE_RC_SUBR= kpropd .include <bsd.port.pre.mk> +# Fix up -Wl,-rpath in LDFLAGS +.if !empty(KRB5_HOME) +_RPATH= ${KRB5_HOME}/lib: +.else +_RPATH= ${LOCALBASE}/lib: +.endif +.if !empty(LDFLAGS:M-Wl,-rpath,*) +.for F in ${LDFLAGS:M-Wl,-rpath,*} +LDFLAGS:= -Wl,-rpath,${_RPATH}${F:S/-Wl,-rpath,//} \ + ${LDFLAGS:N-Wl,-rpath,*} +.endfor +.endif + .if defined(KRB5_HOME) && ${KRB5_HOME} != ${LOCALBASE} BROKEN= LIB_DEPENDS when using KRB5_HOME is broken .endif @@ -81,8 +93,6 @@ CONFIGURE_ARGS+= --with-readline .endif .endif -.include "${PORTSDIR}/Mk/bsd.openssl.mk" - .if defined(PROGRAM_TRANSFORM_NAME) && ${PROGRAM_TRANSFORM_NAME} != "" CONFIGURE_ARGS+= --program-transform-name="${PROGRAM_TRANSFORM_NAME}" .endif @@ -92,8 +102,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVE HTML_DOC_DIR= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc/html PDF_DOC_DIR= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc/pdf -CONFIGURE_ARGS+= CPPFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB} -L${LOCALBASE}/include" - post-extract: @${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz --no-same-owner --no-same-permissions @${RM} ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz.asc Modified: head/security/krb5/Makefile ============================================================================== --- head/security/krb5/Makefile Fri Feb 20 20:26:23 2015 (r379468) +++ head/security/krb5/Makefile Fri Feb 20 20:59:08 2015 (r379469) @@ -3,6 +3,7 @@ PORTNAME= krb5 PORTVERSION= 1.13.1 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/ DISTNAME= ${PORTNAME}-${PORTVERSION}-signed @@ -26,7 +27,8 @@ USE_LDCONFIG= yes USE_CSTD= gnu99 GNU_CONFIGURE= yes USES= gettext gmake perl5 libtool:build -CONFIGURE_ARGS?= --enable-shared --without-system-verto +CONFIGURE_ARGS?= --enable-shared --without-system-verto \ + --disable-rpath CONFIGURE_ENV= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" YACC="${YACC}" MAKE_ARGS= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" @@ -39,17 +41,28 @@ LDAP= Enable LDAP support .if defined(KRB5_HOME) PREFIX= ${KRB5_HOME} -CFLAGS+= -Wl,-rpath=${KRB5_HOME}/lib -LDFLAGS+= -Wl,-rpath=${KRB5_HOME}/lib .endif -LDFLAGS+= -L${LOCALBASE}/lib -CFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include -I${OPENSSLINC} +LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB} USE_OPENSSL= yes USE_RC_SUBR= kpropd .include <bsd.port.pre.mk> +# Fix up -Wl,-rpath in LDFLAGS +.if !empty(KRB5_HOME) +_RPATH= ${KRB5_HOME}/lib: +.else +_RPATH= ${LOCALBASE}/lib: +.endif +.if !empty(LDFLAGS:M-Wl,-rpath,*) +.for F in ${LDFLAGS:M-Wl,-rpath,*} +LDFLAGS:= -Wl,-rpath,${_RPATH}${F:S/-Wl,-rpath,//} \ + ${LDFLAGS:N-Wl,-rpath,*} +.endfor +.endif + .if defined(KRB5_HOME) && ${KRB5_HOME} != ${LOCALBASE} BROKEN= LIB_DEPENDS when using KRB5_HOME is broken .endif @@ -77,8 +90,6 @@ USES+= readline:port CONFIGURE_ARGS+= --with-readline .endif -.include "${PORTSDIR}/Mk/bsd.openssl.mk" - .if defined(PROGRAM_TRANSFORM_NAME) && ${PROGRAM_TRANSFORM_NAME} != "" CONFIGURE_ARGS+= --program-transform-name="${PROGRAM_TRANSFORM_NAME}" .endif @@ -88,8 +99,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVE HTML_DOC_DIR= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc/html PDF_DOC_DIR= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc/pdf -CONFIGURE_ARGS+= CPPFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB} -L${LOCALBASE}/include" - post-extract: @${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz --no-same-owner --no-same-permissions @${RM} ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz.asc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502202059.t1KKx93g085215>