diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2001-03-02 10:09:40 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2001-03-02 10:09:40 +0000 |
| commit | b9f823ab2b6365b94ff160496d98f76686c196fd (patch) | |
| tree | 1577d78d37acffc37883c6499b54667347e68630 /lang/gcc43 | |
| parent | Update to 1.36. (diff) | |
Fix nits in the auto lib-gcc PLIST generation.
Notes
Notes:
svn path=/head/; revision=38969
Diffstat (limited to 'lang/gcc43')
| -rw-r--r-- | lang/gcc43/Makefile | 12 | ||||
| -rw-r--r-- | lang/gcc43/pkg-plist | 28 |
2 files changed, 14 insertions, 26 deletions
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile index 563f511f9edb..32c120ed9938 100644 --- a/lang/gcc43/Makefile +++ b/lang/gcc43/Makefile @@ -122,14 +122,18 @@ post-install: ${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1 ${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1 ${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1 -.if defined(WANT_SHAREDLIBS) - ${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB} -.endif +#.if defined(WANT_SHAREDLIBS) +# ${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB} +#.endif .for info in cpp g77 gcc install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir .endfor cd ${PREFIX} ;\ - find ${TARGLIB} -type f -o -type l >${WRKDIR}/PLIST.gcc-lib + find ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l \ + >${WRKDIR}/PLIST.gcc-lib + cd ${PREFIX} ;\ + find ${TARGLIB:S/^${PREFIX}\///} -type d \ + | sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib ${ECHO} "r ${TMPPLIST}" > ${WRKDIR}/ex.script ${ECHO} "/Insert PLIST.gcc-lib" >> ${WRKDIR}/ex.script ${ECHO} "d" >> ${WRKDIR}/ex.script diff --git a/lang/gcc43/pkg-plist b/lang/gcc43/pkg-plist index 264f8e69036e..4391d82b9824 100644 --- a/lang/gcc43/pkg-plist +++ b/lang/gcc43/pkg-plist @@ -6,12 +6,12 @@ bin/ggcc bin/%%GNU_HOST%%-gcc bin/%%GNU_HOST%%-g++ bin/gccbug-%%SNAPVER%% -bin/gcj -bin/gcjh -bin/gcov -bin/jv-scan -bin/jcf-dump -%%GNU_HOST%%/include/_G_config.h +@comment not working on FreeBSD post-libstdc++-v3: bin/gcj +@comment not working on FreeBSD post-libstdc++-v3: bin/gcjh +@comment not working on FreeBSD post-libstdc++-v3: bin/gcov +@comment not working on FreeBSD post-libstdc++-v3: bin/jv-scan +@comment not working on FreeBSD post-libstdc++-v3: bin/jcf-dump +@comment not needed post-libstdc++-v3: %%GNU_HOST%%/include/_G_config.h %%GNU_HOST%%/include/assert.h @comment Insert PLIST.gcc-lib here @comment -=[ begin PLIST.gcc-lib ]=- @@ -83,19 +83,3 @@ info/gcc.info-9 @exec install-info %D/info/gcc.info %D/info/dir @dirrm %%GNU_HOST%%/include @dirrm %%GNU_HOST%% -@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net -@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm -@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet -@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx -@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns -@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/machine -@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc -@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security -@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys -@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc -@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std -@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++ -@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include -@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%% -@dirrm lib/gcc-lib/%%GNU_HOST%% -@dirrm lib/gcc-lib |