diff options
author | ru <ru@FreeBSD.org> | 2003-09-07 14:15:40 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2003-09-07 14:15:40 +0000 |
commit | 34673ebfc37763889cbbdea9a6682a0ec1a559e1 (patch) | |
tree | 67ca4df69f43ec1ec358a95d5d73b1c99ee30232 | |
parent | 0f87237d888065c7893cba5cac93acc18b3803de (diff) | |
download | FreeBSD-src-34673ebfc37763889cbbdea9a6682a0ec1a559e1.zip FreeBSD-src-34673ebfc37763889cbbdea9a6682a0ec1a559e1.tar.gz |
- No need to create libfoo.so -> libfoo.so.X symlinks in /lib,
as it was decided that our toolchain will revert to looking
for libraries in /usr/lib only.
- Make /usr/lib/libfoo.so -> /lib/libfoo.so.X symlinks absolute
so that they still work if /usr is symlinked.
- Remove stale /usr/lib/libfoo.so.X libraries during install.
Discussed with: gordon, obrien, peter
-rw-r--r-- | Makefile.inc1 | 1 | ||||
-rw-r--r-- | share/mk/bsd.lib.mk | 11 |
2 files changed, 9 insertions, 3 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index abf4c18..ba1ee13 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -227,6 +227,7 @@ XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} -DNO_FORTRAN -DNO_GDB # world stage WMAKEENV= ${CROSSENV} \ DESTDIR=${WORLDTMP} \ + _SHLIBDIRPREFIX=${WORLDTMP} \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 58bce19..a13df73 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -208,10 +208,15 @@ _libinstall: ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \ ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR} .if defined(SHLIB_LINK) - ln -fs ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}/${SHLIB_LINK} -.if (${LIBDIR} != ${SHLIBDIR}) - ln -fs ${LIBDIR:C|/[^/]+|/..|g:S|^/||}${SHLIBDIR}/${SHLIB_NAME} \ +.if ${SHLIBDIR} == ${LIBDIR} + ln -fs ${SHLIB_NAME} ${DESTDIR}${LIBDIR}/${SHLIB_LINK} +.else + ln -fs ${_SHLIBDIRPREFIX}${SHLIBDIR}/${SHLIB_NAME} \ ${DESTDIR}${LIBDIR}/${SHLIB_LINK} +.if exists(${DESTDIR}${LIBDIR}/${SHLIB_NAME}) + -chflags noschg ${DESTDIR}${LIBDIR}/${SHLIB_NAME} + rm -f ${DESTDIR}${LIBDIR}/${SHLIB_NAME} +.endif .endif .endif .endif |