diff options
| -rw-r--r-- | devel/mingw32-binutils/Makefile | 12 | ||||
| -rw-r--r-- | devel/mingw32-binutils/pkg-plist | 27 |
2 files changed, 11 insertions, 28 deletions
diff --git a/devel/mingw32-binutils/Makefile b/devel/mingw32-binutils/Makefile index 6b824a7cabd3..7a21871f99d0 100644 --- a/devel/mingw32-binutils/Makefile +++ b/devel/mingw32-binutils/Makefile @@ -30,8 +30,6 @@ PATCHVERSION= 90.20040222.1 WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} -BROKEN= "Incorrect pkg-plist" - #USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes @@ -51,12 +49,22 @@ MAN1= ${PKGNAMEPREFIX}addr2line.1 ${PKGNAMEPREFIX}ar.1 \ ${PKGNAMEPREFIX}size.1 ${PKGNAMEPREFIX}strings.1 \ ${PKGNAMEPREFIX}strip.1 ${PKGNAMEPREFIX}windres.1 +INFO= as bfd binutils ld configure standards +INFO_PATH= ${PKGNAMEPREFIX:S/-$//}/info + PLIST_SUB+= BINUTILS_TARG=${PKGNAMEPREFIX:S/-$//} BINARIES= addr2line ar as c++filt ld nm objcopy objdump ranlib \ readelf size strings strip dlltool dllwrap windres post-install: +# Register these too + install-info ${PREFIX}/${INFO_PATH}/configure.info ${PREFIX}/${INFO_PATH}/dir + install-info ${PREFIX}/${INFO_PATH}/standards.info ${PREFIX}/${INFO_PATH}/dir +# Add this after all quto-generated info etries + echo "@unexec rm %D/${PKGNAMEPREFIX:S/-$//}/info/dir" >> ${TMPPLIST} + echo "@unexec rmdir %D/${PKGNAMEPREFIX:S/-$//}/info 2> /dev/null || true" >> ${TMPPLIST} + echo "@unexec rmdir %D/${PKGNAMEPREFIX:S/-$//} 2> /dev/null || true" >> ${TMPPLIST} .for F in ${BINARIES} @${STRIP_CMD} ${PREFIX}/bin/${PKGNAMEPREFIX}$F @${LN} -f ${PREFIX}/bin/${PKGNAMEPREFIX}$F \ diff --git a/devel/mingw32-binutils/pkg-plist b/devel/mingw32-binutils/pkg-plist index 8cbe42e28a78..5aad37397e6e 100644 --- a/devel/mingw32-binutils/pkg-plist +++ b/devel/mingw32-binutils/pkg-plist @@ -36,32 +36,7 @@ bin/%%BINUTILS_TARG%%-strip bin/%%BINUTILS_TARG%%-size bin/%%BINUTILS_TARG%%-strings bin/%%BINUTILS_TARG%%-windres -@unexec install-info --delete %D/%%BINUTILS_TARG%%/info/as.info %D/%%BINUTILS_TARG%%/info/dir -@unexec install-info --delete %D/%%BINUTILS_TARG%%/info/bfd.info %D/%%BINUTILS_TARG%%/info/dir -@unexec install-info --delete %D/%%BINUTILS_TARG%%/info/binutils.info %D/%%BINUTILS_TARG%%/info/dir -@unexec install-info --delete %D/%%BINUTILS_TARG%%/info/configure.info %D/%%BINUTILS_TARG%%/info/dir 2> /dev/null -@unexec install-info --delete %D/%%BINUTILS_TARG%%/info/ld.info %D/%%BINUTILS_TARG%%/info/dir -@unexec install-info --delete %D/%%BINUTILS_TARG%%/info/standards.info %D/%%BINUTILS_TARG%%/info/dir 2> /dev/null -@unexec rm -f %D/%%BINUTILS_TARG%%/info/dir -%%BINUTILS_TARG%%/info/as.info -%%BINUTILS_TARG%%/info/as.info-1 -%%BINUTILS_TARG%%/info/bfd.info -%%BINUTILS_TARG%%/info/bfd.info-1 -%%BINUTILS_TARG%%/info/binutils.info -%%BINUTILS_TARG%%/info/binutils.info-1 -%%BINUTILS_TARG%%/info/configure.info -%%BINUTILS_TARG%%/info/configure.info-1 -%%BINUTILS_TARG%%/info/ld.info -%%BINUTILS_TARG%%/info/ld.info-1 -%%BINUTILS_TARG%%/info/standards.info -@exec install-info %D/%%BINUTILS_TARG%%/info/as.info %D/info/dir -@exec install-info %D/%%BINUTILS_TARG%%/info/bfd.info %D/%%BINUTILS_TARG%%/info/dir -@exec install-info %D/%%BINUTILS_TARG%%/info/binutils.info %D/%%BINUTILS_TARG%%/info/dir -@exec install-info %D/%%BINUTILS_TARG%%/info/configure.info %D/%%BINUTILS_TARG%%/info/dir -@exec install-info %D/%%BINUTILS_TARG%%/info/ld.info %D/%%BINUTILS_TARG%%/info/dir -@exec install-info %D/%%BINUTILS_TARG%%/info/standards.info %D/%%BINUTILS_TARG%%/info/dir @dirrm %%BINUTILS_TARG%%/bin @dirrm %%BINUTILS_TARG%%/lib/ldscripts @dirrm %%BINUTILS_TARG%%/lib -@dirrm %%BINUTILS_TARG%%/info -@dirrm %%BINUTILS_TARG%% + |