diff options
author | attilio <attilio@FreeBSD.org> | 2013-02-03 20:13:33 +0000 |
---|---|---|
committer | attilio <attilio@FreeBSD.org> | 2013-02-03 20:13:33 +0000 |
commit | 0d3b58aee00948d85d75a9d3d222deb454afc98e (patch) | |
tree | 865d112b57519913a8de64b2d9ca8787633c95a2 /share/mk | |
parent | 561dd1163dbb481d204da7a526739ac6e43d08f2 (diff) | |
parent | 2d2c37fb592dfc24f15e4bf14c2f109b5d4b5a83 (diff) | |
download | FreeBSD-src-0d3b58aee00948d85d75a9d3d222deb454afc98e.zip FreeBSD-src-0d3b58aee00948d85d75a9d3d222deb454afc98e.tar.gz |
MFC
Diffstat (limited to 'share/mk')
-rw-r--r-- | share/mk/Makefile | 1 | ||||
-rw-r--r-- | share/mk/bsd.README | 2 | ||||
-rw-r--r-- | share/mk/bsd.compat.mk | 41 | ||||
-rw-r--r-- | share/mk/bsd.incs.mk | 2 | ||||
-rw-r--r-- | share/mk/bsd.info.mk | 2 | ||||
-rw-r--r-- | share/mk/bsd.init.mk | 1 | ||||
-rw-r--r-- | share/mk/bsd.lib.mk | 13 | ||||
-rw-r--r-- | share/mk/bsd.libnames.mk | 1 | ||||
-rw-r--r-- | share/mk/bsd.links.mk | 4 | ||||
-rw-r--r-- | share/mk/bsd.man.mk | 6 | ||||
-rw-r--r-- | share/mk/bsd.own.mk | 99 | ||||
-rw-r--r-- | share/mk/bsd.prog.mk | 3 | ||||
-rw-r--r-- | share/mk/sys.mk | 1 |
13 files changed, 38 insertions, 138 deletions
diff --git a/share/mk/Makefile b/share/mk/Makefile index 81f943c..2110b26 100644 --- a/share/mk/Makefile +++ b/share/mk/Makefile @@ -6,7 +6,6 @@ FILES= \ bsd.README \ bsd.arch.inc.mk \ - bsd.compat.mk \ bsd.compiler.mk \ bsd.cpu.mk \ bsd.crunchgen.mk \ diff --git a/share/mk/bsd.README b/share/mk/bsd.README index f09142e..a9adc1f 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -356,6 +356,8 @@ SHLIB_LDSCRIPT Template file to generate shared library linker script. Unless used, a simple symlink is created to the real shared object. +LIBRARIES_ONLY Do not build or install files other than the library. + The include file <bsd.lib.mk> includes the file named "../Makefile.inc" if it exists, as well as the include file <bsd.man.mk>. diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk deleted file mode 100644 index 6a86871..0000000 --- a/share/mk/bsd.compat.mk +++ /dev/null @@ -1,41 +0,0 @@ -# $FreeBSD$ - -.if !defined(BURN_BRIDGES) -.for oldnew in \ - NOATM:NO_ATM \ - NOCLEANDIR:NO_CLEANDIR \ - NOCRYPT:NO_CRYPT \ - NODOCCOMPRESS:NO_DOCCOMPRESS \ - NOEXTRADEPEND:NO_EXTRADEPEND \ - NOFORTH:NO_FORTH \ - NOFSCHG:NO_FSCHG \ - NOGAMES:NO_GAMES \ - NOHTML:NO_HTML \ - NOINET6:NO_INET6 \ - NOINFO:NO_INFO \ - NOINFOCOMPRESS:NO_INFOCOMPRESS \ - NOINSTALLLIB:NO_INSTALLLIB \ - NOLIBPTHREAD:NO_LIBPTHREAD \ - NOLIBTHR:NO_LIBTHR \ - NOLINT:NO_LINT \ - NOMAN:NO_MAN \ - NOMANCOMPRESS:NO_MANCOMPRESS \ - NOMLINKS:NO_MLINKS \ - NOOBJ:NO_OBJ \ - NOPAM:NO_PAM \ - NOPIC:NO_PIC \ - NOPROFILE:NO_PROFILE \ - NO_RCMNDS:NO_RCMDS \ - NOSHARE:NO_SHARE \ - NOSHARED:NO_SHARED \ - NOTAGS:NO_TAGS -.for old in ${oldnew:C/:.*//} -.for new in ${oldnew:C/.*://} -.if defined(${old}) && !defined(${new}) -.warning ${old} is deprecated in favour of ${new} -${new}= ${${old}} -.endif -.endfor -.endfor -.endfor -.endif diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk index d51fb17..74c378b 100644 --- a/share/mk/bsd.incs.mk +++ b/share/mk/bsd.incs.mk @@ -73,7 +73,7 @@ installincludes: t=${DESTDIR}$$1; \ shift; \ ${ECHO} $$t -\> $$l; \ - ln -fs $$l $$t; \ + ${INSTALL_SYMLINK} $$l $$t; \ done; true .endif .endif # !target(installincludes) diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk index 9c3220d..c54b435 100644 --- a/share/mk/bsd.info.mk +++ b/share/mk/bsd.info.mk @@ -113,7 +113,7 @@ DVIPS2ASCII?= dvips2ascii .info.html: ${INFO2HTML} ${.IMPSRC} - ln -f ${.TARGET:R}.info.Top.html ${.TARGET} + ${INSTALL_LINK} ${.TARGET:R}.info.Top.html ${.TARGET} .PATH: ${.CURDIR} ${SRCDIR} diff --git a/share/mk/bsd.init.mk b/share/mk/bsd.init.mk index 72a6de0..f5f4c66 100644 --- a/share/mk/bsd.init.mk +++ b/share/mk/bsd.init.mk @@ -9,7 +9,6 @@ __<bsd.init.mk>__: .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" .endif -.include <bsd.compat.mk> .include <bsd.own.mk> .MAIN: all .endif # !target(__<bsd.init.mk>__) diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 1335964..f406c23 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -184,7 +184,7 @@ ${SHLIB_NAME_FULL}: ${SOBJS} @${ECHO} building shared library ${SHLIB_NAME} @rm -f ${SHLIB_NAME} ${SHLIB_LINK} .if defined(SHLIB_LINK) - @ln -fs ${SHLIB_NAME} ${SHLIB_LINK} + @${INSTALL_SYMLINK} ${SHLIB_NAME} ${SHLIB_LINK} .endif .if !defined(NM) @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \ @@ -309,9 +309,9 @@ _libinstall: ${_INSTALLFLAGS} lib${LIB}.ld ${DESTDIR}${LIBDIR}/${SHLIB_LINK} .else .if ${SHLIBDIR} == ${LIBDIR} - ln -fs ${SHLIB_NAME} ${DESTDIR}${LIBDIR}/${SHLIB_LINK} + ${INSTALL_SYMLINK} ${SHLIB_NAME} ${DESTDIR}${LIBDIR}/${SHLIB_LINK} .else - ln -fs ${_SHLIBDIRPREFIX}${SHLIBDIR}/${SHLIB_NAME} \ + ${INSTALL_SYMLINK} ${_SHLIBDIRPREFIX}${SHLIBDIR}/${SHLIB_NAME} \ ${DESTDIR}${LIBDIR}/${SHLIB_LINK} .if exists(${DESTDIR}${LIBDIR}/${SHLIB_NAME}) -chflags noschg ${DESTDIR}${LIBDIR}/${SHLIB_NAME} @@ -331,12 +331,15 @@ _libinstall: .endif .endif # !defined(INTERNALLIB) +.if !defined(LIBRARIES_ONLY) .include <bsd.nls.mk> .include <bsd.files.mk> .include <bsd.incs.mk> +.endif + .include <bsd.links.mk> -.if ${MK_MAN} != "no" +.if ${MK_MAN} != "no" && !defined(LIBRARIES_ONLY) realinstall: _maninstall .ORDER: beforeinstall _maninstall .endif @@ -348,7 +351,7 @@ lint: ${SRCS:M*.c} ${LINT} ${LINTFLAGS} ${CFLAGS:M-[DIU]*} ${.ALLSRC} .endif -.if ${MK_MAN} != "no" +.if ${MK_MAN} != "no" && !defined(LIBRARIES_ONLY) .include <bsd.man.mk> .endif diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index 4f8bedd..95f9064 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -162,6 +162,7 @@ LIBULOG?= ${DESTDIR}${LIBDIR}/libulog.a LIBUTIL?= ${DESTDIR}${LIBDIR}/libutil.a LIBUUTIL?= ${DESTDIR}${LIBDIR}/libuutil.a LIBVGL?= ${DESTDIR}${LIBDIR}/libvgl.a +LIBVMMAPI?= ${DESTDIR}${LIBDIR}/libvmmapi.a LIBWIND?= ${DESTDIR}${LIBDIR}/libwind.a LIBWRAP?= ${DESTDIR}${LIBDIR}/libwrap.a LIBXPG4?= ${DESTDIR}${LIBDIR}/libxpg4.a diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk index 49f557a..1e4d57e 100644 --- a/share/mk/bsd.links.mk +++ b/share/mk/bsd.links.mk @@ -15,7 +15,7 @@ _installlinks: t=${DESTDIR}$$1; \ shift; \ ${ECHO} $$t -\> $$l; \ - ln -f $$l $$t; \ + ${INSTALL_LINK} $$l $$t; \ done; true .endif .if defined(SYMLINKS) && !empty(SYMLINKS) @@ -26,6 +26,6 @@ _installlinks: t=${DESTDIR}$$1; \ shift; \ ${ECHO} $$t -\> $$l; \ - ln -fs $$l $$t; \ + ${INSTALL_SYMLINK} $$l $$t; \ done; true .endif diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk index 8602b55..6445ba3 100644 --- a/share/mk/bsd.man.mk +++ b/share/mk/bsd.man.mk @@ -62,7 +62,7 @@ MROFF_CMD?= groff -Tascii -mtty-char -man -t MCOMPRESS_CMD?= ${COMPRESS_CMD} MCOMPRESS_EXT?= ${COMPRESS_EXT} -SECTIONS= 1 1aout 2 3 4 5 6 7 8 9 +SECTIONS= 1 2 3 4 5 6 7 8 9 .SUFFIXES: ${SECTIONS:S/^/./g} # Backwards compatibility. @@ -216,7 +216,7 @@ _maninstall: ${MAN} t=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}/$$name; \ ${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \ rm -f $${t} $${t}${MCOMPRESS_EXT}; \ - ln $${l}${ZEXT} $${t}${ZEXT}; \ + ${INSTALL_LINK} $${l}${ZEXT} $${t}${ZEXT}; \ done .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) @set ${MLINKS:C/\.([^.]*)$/.\1 \1/}; \ @@ -231,7 +231,7 @@ _maninstall: ${MAN} t=${DESTDIR}${CATDIR}$${sect}${MANSUBDIR}/$$name; \ ${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \ rm -f $${t} $${t}${MCOMPRESS_EXT}; \ - ln $${l}${ZEXT} $${t}${ZEXT}; \ + ${INSTALL_LINK} $${l}${ZEXT} $${t}${ZEXT}; \ done .endif .endif diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 78af8fb..aea33d3 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -181,6 +181,15 @@ NLSMODE?= ${NOBINMODE} INCLUDEDIR?= /usr/include +# +# install(1) parameters. +# +HRDLINK?= -l h +SYMLINK?= -l s + +INSTALL_LINK?= ${INSTALL} ${HRDLINK} +INSTALL_SYMLINK?= ${INSTALL} ${SYMLINK} + # Common variables .if !defined(DEBUG_FLAGS) STRIP?= -s @@ -216,80 +225,6 @@ WITHOUT_${var}= .endfor # -# Compat NO_* options (same as above, except their use is deprecated). -# -.if !defined(BURN_BRIDGES) -.for var in \ - ACPI \ - ATM \ - AUDIT \ - AUTHPF \ - BIND \ - BIND_DNSSEC \ - BIND_ETC \ - BIND_LIBS_LWRES \ - BIND_MTREE \ - BIND_NAMED \ - BIND_UTILS \ - BLUETOOTH \ - BOOT \ - CALENDAR \ - CPP \ - CRYPT \ - CVS \ - CXX \ - DICT \ - DYNAMICROOT \ - EXAMPLES \ - FORTH \ - FP_LIBC \ - GAMES \ - GCOV \ - GDB \ - GNU \ - GPIB \ - GROFF \ - HTML \ - INET6 \ - INFO \ - IPFILTER \ - IPX \ - KDUMP \ - KERBEROS \ - LIB32 \ - LIBPTHREAD \ - LIBTHR \ - LOCALES \ - LPR \ - MAILWRAPPER \ - NETCAT \ - NIS \ - NLS \ - NLS_CATALOGS \ - NS_CACHING \ - OPENSSH \ - OPENSSL \ - PAM \ - PF \ - RCMDS \ - RCS \ - RESCUE \ - SENDMAIL \ - SETUID_LOGIN \ - SHAREDOCS \ - SYSCONS \ - TCSH \ - TOOLCHAIN \ - USB \ - WPA_SUPPLICANT_EAPOL -.if defined(NO_${var}) -#.warning NO_${var} is deprecated in favour of WITHOUT_${var}= -WITHOUT_${var}= -.endif -.endfor -.endif # !defined(BURN_BRIDGES) - -# # Older-style variables that enabled behaviour when set. # .if defined(YES_HESIOD) @@ -383,6 +318,7 @@ __DEFAULT_YES_OPTIONS = \ OPENSSH \ OPENSSL \ PAM \ + PC_SYSINSTALL \ PF \ PKGBOOTSTRAP \ PKGTOOLS \ @@ -417,6 +353,8 @@ __DEFAULT_YES_OPTIONS = \ ZONEINFO __DEFAULT_NO_OPTIONS = \ + ARM_EABI \ + BSD_PATCH \ BIND_IDN \ BIND_LARGE_FILE \ BIND_LIBS \ @@ -427,12 +365,15 @@ __DEFAULT_NO_OPTIONS = \ BSD_GREP \ CLANG_EXTRAS \ CTF \ + GPL_DTC \ HESIOD \ ICONV \ IDEA \ INSTALL_AS_USER \ + NMTREE \ NAND \ OFED \ + OPENSSH_NONE_CIPHER \ SHARED_TOOLCHAIN # @@ -450,9 +391,9 @@ __T=${MACHINE_ARCH} .endif # Clang is only for x86 and powerpc right now, by default. .if ${__T} == "amd64" || ${__T} == "i386" || ${__T:Mpowerpc*} -__DEFAULT_YES_OPTIONS+=CLANG +__DEFAULT_YES_OPTIONS+=CLANG CLANG_FULL .else -__DEFAULT_NO_OPTIONS+=CLANG +__DEFAULT_NO_OPTIONS+=CLANG CLANG_FULL .endif # Clang the default system compiler only on x86. .if ${__T} == "amd64" || ${__T} == "i386" @@ -540,10 +481,6 @@ MK_ZFS:= no MK_CTF:= no .endif -.if ${MK_CLANG} == "no" -MK_CLANG_EXTRAS:= no -.endif - .if ${MK_CRYPT} == "no" MK_OPENSSL:= no MK_OPENSSH:= no @@ -586,6 +523,8 @@ MK_GDB:= no .endif .if ${MK_CLANG} == "no" +MK_CLANG_EXTRAS:= no +MK_CLANG_FULL:= no MK_CLANG_IS_CC:= no .endif diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index cfa07a3..801f804 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -95,8 +95,7 @@ ${PROG}: ${OBJS} .if ${MK_MAN} != "no" && !defined(MAN) && \ !defined(MAN1) && !defined(MAN2) && !defined(MAN3) && \ !defined(MAN4) && !defined(MAN5) && !defined(MAN6) && \ - !defined(MAN7) && !defined(MAN8) && !defined(MAN9) && \ - !defined(MAN1aout) + !defined(MAN7) && !defined(MAN8) && !defined(MAN9) MAN= ${PROG}.1 MAN1= ${MAN} .endif diff --git a/share/mk/sys.mk b/share/mk/sys.mk index 2f67903..8b8a5ce 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -346,5 +346,4 @@ OBJFORMAT?= elf .endif -.include <bsd.compat.mk> .include <bsd.cpu.mk> |