diff options
| author | fjoe <fjoe@FreeBSD.org> | 2011-11-24 20:31:06 +0000 |
|---|---|---|
| committer | fjoe <fjoe@FreeBSD.org> | 2011-11-24 20:31:06 +0000 |
| commit | 6b1253786db1ae2f5aececb06fc2c6aa974392ff (patch) | |
| tree | 9ca0153dd1b67cb603e798e5d2dc851053281aa1 | |
| parent | 8594dfe0c067d7d5eae2ce15f72c85cfa451d92d (diff) | |
| download | FreeBSD-src-6b1253786db1ae2f5aececb06fc2c6aa974392ff.zip FreeBSD-src-6b1253786db1ae2f5aececb06fc2c6aa974392ff.tar.gz | |
libodialog: disconnect from the build and obsolete.
| -rw-r--r-- | ObsoleteFiles.inc | 11 | ||||
| -rw-r--r-- | gnu/lib/Makefile | 3 | ||||
| -rw-r--r-- | share/mk/bsd.libnames.mk | 1 |
3 files changed, 12 insertions, 3 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 8744e2f..f4d8e2c 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -38,6 +38,17 @@ # xargs -n1 | sort | uniq -d; # done +# 20111125: libodialog removed +OLD_FILES+=usr/lib/libodialog.a +OLD_FILES+=usr/lib/libodialog.so +OLD_LIBS+=usr/lib/libodialog.so.7 +OLD_FILES+=usr/lib/libodialog_p.a +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" +OLD_FILES+=usr/lib32/libodialog.a +OLD_FILES+=usr/lib32/libodialog.so +OLD_LIBS+=usr/lib32/libodialog.so.7 +OLD_FILES+=usr/lib32/libodialog_p.a +.endif # 20110930: sysinstall removed OLD_FILES+=usr/sbin/sysinstall OLD_FILES+=usr/share/man/man8/sysinstall.8.gz diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index c33cef6..80039e2 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -2,8 +2,7 @@ .include <bsd.own.mk> -SUBDIR= csu libgcc libgcov libdialog libgomp libodialog libregex libreadline \ - libssp +SUBDIR= csu libgcc libgcov libdialog libgomp libregex libreadline libssp # libsupc++ uses libstdc++ headers, although 'make includes' should # have taken care of that already. diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index d3fb51a..c1fd38b 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -100,7 +100,6 @@ LIBNCURSESW?= ${DESTDIR}${LIBDIR}/libncursesw.a LIBNETGRAPH?= ${DESTDIR}${LIBDIR}/libnetgraph.a LIBNGATM?= ${DESTDIR}${LIBDIR}/libngatm.a LIBNVPAIR?= ${DESTDIR}${LIBDIR}/libnvpair.a -LIBODIALOG?= ${DESTDIR}${LIBDIR}/libodialog.a LIBOPIE?= ${DESTDIR}${LIBDIR}/libopie.a # The static PAM library doesn't know its secondary dependencies, |
