diff options
author | dim <dim@FreeBSD.org> | 2011-04-17 21:03:23 +0000 |
---|---|---|
committer | dim <dim@FreeBSD.org> | 2011-04-17 21:03:23 +0000 |
commit | d9e6052d4ec703f14849c7b8cad2795fc141edec (patch) | |
tree | 5fe8b25843e2a335b0bb3410998d4b4363031e4a /share | |
parent | 34f2672a905032e05414032bd2669880fe72ddb4 (diff) | |
download | FreeBSD-src-d9e6052d4ec703f14849c7b8cad2795fc141edec.zip FreeBSD-src-d9e6052d4ec703f14849c7b8cad2795fc141edec.tar.gz |
Remove libobjc and other Objective-C related components, as these are
extremely outdated, and not used by anything in the base system.
Silence from: current@
Diffstat (limited to 'share')
-rw-r--r-- | share/mk/bsd.dep.mk | 6 | ||||
-rw-r--r-- | share/mk/bsd.lib.mk | 14 | ||||
-rw-r--r-- | share/mk/bsd.libnames.mk | 1 | ||||
-rw-r--r-- | share/mk/bsd.own.mk | 2 | ||||
-rw-r--r-- | share/mk/bsd.prog.mk | 10 |
5 files changed, 1 insertions, 32 deletions
diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk index 7921ea7..459a9c3 100644 --- a/share/mk/bsd.dep.mk +++ b/share/mk/bsd.dep.mk @@ -128,11 +128,9 @@ depend: beforedepend ${DEPENDFILE} afterdepend .if ${CC:T:Micc} == "icc" MKDEP_CFLAGS= ${CFLAGS:M-X*} ${CFLAGS:M-[BIDU]*} MKDEP_CXXFLAGS= ${CXXFLAGS:M-X*} ${CXXFLAGS:M-[BIDU]*} -MKDEP_OBJCFLAGS=${OBJCFLAGS:M-X*} ${OBJCFLAGS:M-[BIDU]*} .else MKDEP_CFLAGS= ${CFLAGS:M-nostdinc*} ${CFLAGS:M-[BIDU]*} MKDEP_CXXFLAGS= ${CXXFLAGS:M-nostdinc*} ${CXXFLAGS:M-[BIDU]*} -MKDEP_OBJCFLAGS=${OBJCFLAGS:M-nostdinc*} ${OBJCFLAGS:M-[BIDU]*} ${OBJCFLAGS:M-Wno-import*} .endif DPSRCS+= ${SRCS} @@ -148,10 +146,6 @@ ${DEPENDFILE}: ${DPSRCS} ${MKDEP_CXXFLAGS} \ ${.ALLSRC:M*.cc} ${.ALLSRC:M*.C} ${.ALLSRC:M*.cpp} ${.ALLSRC:M*.cxx} .endif -.if !empty(DPSRCS:M*.m) - ${MKDEPCMD} -f ${DEPENDFILE} -a ${MKDEP} \ - ${MKDEP_OBJCFLAGS} ${.ALLSRC:M*.m} -.endif .if target(_EXTRADEPEND) _EXTRADEPEND: .USE ${DEPENDFILE}: _EXTRADEPEND diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index bef1cbe..9d655b6 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -55,7 +55,7 @@ STRIP?= -s # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries # .So used for PIC object files .SUFFIXES: -.SUFFIXES: .out .o .po .So .S .asm .s .c .cc .cpp .cxx .m .C .f .y .l .ln +.SUFFIXES: .out .o .po .So .S .asm .s .c .cc .cpp .cxx .C .f .y .l .ln .if !defined(PICFLAG) .if ${MACHINE_CPUARCH} == "sparc64" @@ -101,18 +101,6 @@ PO_FLAG=-pg (${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \ ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}) -.m.po: - ${OBJC} ${OBJCFLAGS} -pg -c ${.IMPSRC} -o ${.TARGET} - @[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || \ - (${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \ - ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}) - -.m.So: - ${OBJC} ${PICFLAG} -DPIC ${OBJCFLAGS} -c ${.IMPSRC} -o ${.TARGET} - @[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || \ - (${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \ - ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}) - .s.po .s.So: ${AS} ${AFLAGS} -o ${.TARGET} ${.IMPSRC} @[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || \ diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index 041984b..9a948ff 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 -LIBOBJC?= ${DESTDIR}${LIBDIR}/libobjc.a LIBODIALOG?= ${DESTDIR}${LIBDIR}/libodialog.a LIBOPIE?= ${DESTDIR}${LIBDIR}/libopie.a diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index eb51232..62b4392 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -248,7 +248,6 @@ WITHOUT_${var}= NLS \ NLS_CATALOGS \ NS_CACHING \ - OBJC \ OPENSSH \ OPENSSL \ PAM \ @@ -356,7 +355,6 @@ __DEFAULT_YES_OPTIONS = \ NLS_CATALOGS \ NS_CACHING \ NTP \ - OBJC \ OPENSSH \ OPENSSL \ PAM \ diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 9489e34..e71ce01 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -48,16 +48,6 @@ PROG= ${PROG_CXX} .if defined(PROG) .if defined(SRCS) -# If there are Objective C sources, link with Objective C libraries. -.if !empty(SRCS:M*.m) -.if defined(OBJCLIBS) -LDADD+= ${OBJCLIBS} -.else -DPADD+= ${LIBOBJC} ${LIBPTHREAD} -LDADD+= -lobjc -lpthread -.endif -.endif - OBJS+= ${SRCS:N*.h:R:S/$/.o/g} .if target(beforelinking) |