diff options
| author | Gerald Pfeifer <gerald@FreeBSD.org> | 2005-07-14 13:14:32 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@FreeBSD.org> | 2005-07-14 13:14:32 +0000 |
| commit | bc72904229f1a8a008907b21a0b2f5c09333d361 (patch) | |
| tree | d1d60ae9b4c6be814675d44937e932d29c210f55 /lang | |
| parent | - Remove WITH_CJK knob and patch, it was merged into 2.1.7 (diff) | |
Directly install libraries into a port-specific location instead of
moving them there after the original installation. This is simpler
and also avoids the problem where the port would overwrite/remove an
existing copy of libiberty.a, which boils down to a true conflict.
No longer put target specific files and include files at the very
end of pkg-plist since that broke the /sbin/ldconfig invocations the
ports machinery added there (before we'd get a chance).[1]
Reported by: dinoex [1]
Notes
Notes:
svn path=/head/; revision=139205
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/gcc33/Makefile | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile index f79f84210b64..c26c4d7e2a34 100644 --- a/lang/gcc33/Makefile +++ b/lang/gcc33/Makefile @@ -52,6 +52,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-nls \ --with-system-zlib \ --program-suffix=${SUFFIX} \ + --libdir=${TARGLIB} \ --with-gxx-include-dir=${TARGLIB}/include/c++/ \ --enable-languages=c,c++,objc,f77 MAKE_ARGS+= MAKEINFOFLAGS="--no-split" @@ -59,7 +60,6 @@ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" CONFIGURE_ARGS+= --enable-shared INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib ${TARGLIB} -EXTRA_LIBS= libgcc_s .else CONFIGURE_ARGS+= --disable-shared .endif @@ -98,12 +98,6 @@ post-install: for mp in ${_MANPAGES}; do \ ${TEST} -e $${mp} || ${TOUCH} ${TOUCH_FLAGS} $${mp}; \ done - @(for prog in \ - ${TARGLIB}/cc1 ${TARGLIB}/cc1obj ${TARGLIB}/cc1plus \ - ${TARGLIB}/collect2 ${TARGLIB}/f771 ; \ - do \ - ${STRIP_CMD} $$prog ; \ - done ) .for f in c++ g77 gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ # gij and jv-convert, for example, are not built on all platforms. if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \ @@ -116,12 +110,7 @@ post-install: .endfor ${MV} -f ${PREFIX}/bin/g77${SUFFIX} ${PREFIX}/bin/g77-${SUFFIX} -${MV} -f ${PREFIX}/man/man1/g77${SUFFIX}.1 ${PREFIX}/man/man1/g77-${SUFFIX}.1 - # These libraries are moved from PREFIX/lib to avoid conflicts with - # the stock compiler. -.for f in libstdc++ libsupc++ libg2c libfrtbegin libobjc ${EXTRA_LIBS} - ${MV} -f ${PREFIX}/lib/${f}.* ${TARGLIB} -.endfor - ${RM} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}/*.la + ${RM} -f ${TARGLIB}/*.la ${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \ ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7 # Add target libraries and include files to packaging list. @@ -133,9 +122,9 @@ post-install: | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\ fi .endfor - ${CAT} ${WRKDIR}/PLIST.lib >> ${TMPPLIST} - ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc-lib/${CONFIGURE_TARGET} 2>&1 || true" >> ${TMPPLIST} - ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc-lib 2>&1 || true" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc-lib/${CONFIGURE_TARGET} 2>&1 || true" >> ${WRKDIR}/PLIST.lib + ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc-lib 2>&1 || true" >> ${WRKDIR}/PLIST.lib + cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST} cklatest: .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/ |