You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
344 lines
13 KiB
344 lines
13 KiB
diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
|
|
index 9baa335..8cb61e2 100644
|
|
--- a/share/mk/bsd.doc.mk
|
|
+++ b/share/mk/bsd.doc.mk
|
|
@@ -144,10 +144,12 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${DCOMPRESS_EXT} \
|
|
realinstall:
|
|
.if ${PRINTERDEVICE:Mhtml}
|
|
cd ${SRCDIR}; \
|
|
+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
|
|
${INSTALL} ${TAG_ARGS:D${TAG_ARGS},docs} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
|
|
${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}/
|
|
.endif
|
|
.for _dev in ${PRINTERDEVICE:Nhtml}
|
|
+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
|
|
${INSTALL} ${TAG_ARGS:D${TAG_ARGS},docs} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
|
|
${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}/
|
|
.endfor
|
|
diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
|
|
index 111a7f1..cde2568 100644
|
|
--- a/share/mk/bsd.files.mk
|
|
+++ b/share/mk/bsd.files.mk
|
|
@@ -61,6 +61,7 @@ stage_as.${file:T}: ${file}
|
|
|
|
installfiles-${group}: _${group}INS_${file:T}
|
|
_${group}INS_${file:T}: ${file}
|
|
+ ${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
|
|
${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN_${.ALLSRC:T}} \
|
|
-g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
|
|
${.ALLSRC} \
|
|
@@ -75,10 +76,12 @@ stage_files.${group}: ${_${group}FILES}
|
|
installfiles-${group}: _${group}INS
|
|
_${group}INS: ${_${group}FILES}
|
|
.if defined(${group}NAME)
|
|
+ ${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME}
|
|
${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN} -g ${${group}GRP} \
|
|
-m ${${group}MODE} ${.ALLSRC} \
|
|
${DESTDIR}${${group}DIR}/${${group}NAME}
|
|
.else
|
|
+ ${INSTALL} -d ${DESTDIR}${${group}DIR}
|
|
${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN} -g ${${group}GRP} \
|
|
-m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}/
|
|
.endif
|
|
diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk
|
|
index 04c1407..06ddde3 100644
|
|
--- a/share/mk/bsd.incs.mk
|
|
+++ b/share/mk/bsd.incs.mk
|
|
@@ -60,6 +60,9 @@ stage_includes: stage_as.${header:T}
|
|
|
|
installincludes: _${group}INS_${header:T}
|
|
_${group}INS_${header:T}: ${header}
|
|
+ ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \
|
|
+ -g ${${group}GRP_${.ALLSRC:T}} \
|
|
+ ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
|
|
${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
|
|
-g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
|
|
${.ALLSRC} \
|
|
@@ -75,9 +78,13 @@ stage_includes: stage_files.${group}
|
|
installincludes: _${group}INS
|
|
_${group}INS: ${_${group}INCS}
|
|
.if defined(${group}NAME)
|
|
+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
|
|
+ ${DESTDIR}${${group}DIR}
|
|
${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
|
|
${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
|
|
.else
|
|
+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
|
|
+ ${DESTDIR}${${group}DIR}
|
|
${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
|
|
${.ALLSRC} ${DESTDIR}${${group}DIR}/
|
|
.endif
|
|
diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk
|
|
index 46498fa..7b673f8 100644
|
|
--- a/share/mk/bsd.info.mk
|
|
+++ b/share/mk/bsd.info.mk
|
|
@@ -83,6 +83,7 @@ INFO2HTML?= info2html
|
|
TEX?= tex
|
|
DVIPS?= dvips
|
|
DVIPS2ASCII?= dvips2ascii
|
|
+INSTALL?= install
|
|
|
|
.SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html
|
|
|
|
@@ -141,15 +142,17 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x}
|
|
INSTALLINFODIRS+= ${x:S/$/-install/}
|
|
${x:S/$/-install/}:
|
|
.if !empty(.MAKEFLAGS:M-j)
|
|
+ ${INSTALL} -d ${DESTDIR}${INFODIR}
|
|
lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \
|
|
${INSTALLINFO} ${INSTALLINFOFLAGS} \
|
|
- --defsection=${INFOSECTION} \
|
|
- --defentry=${INFOENTRY_${x}} \
|
|
+ --section=${INFOSECTION} \
|
|
+ --entry=${INFOENTRY_${x}} \
|
|
${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
|
|
.else
|
|
+ ${INSTALL} -d ${DESTDIR}${INFODIR}
|
|
${INSTALLINFO} ${INSTALLINFOFLAGS} \
|
|
- --defsection=${INFOSECTION} \
|
|
- --defentry=${INFOENTRY_${x}} \
|
|
+ --section=${INFOSECTION} \
|
|
+ --entry=${INFOENTRY_${x}} \
|
|
${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
|
|
.endif
|
|
.endfor
|
|
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
|
|
index c59027c..f996c35 100644
|
|
--- a/share/mk/bsd.lib.mk
|
|
+++ b/share/mk/bsd.lib.mk
|
|
@@ -52,8 +52,6 @@ CFLAGS+= ${DEBUG_FLAGS}
|
|
.if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != ""
|
|
CTFFLAGS+= -g
|
|
.endif
|
|
-.else
|
|
-STRIP?= -s
|
|
.endif
|
|
|
|
.if ${SHLIBDIR:M*lib32*}
|
|
@@ -336,14 +334,17 @@ realinstall: _libinstall
|
|
.ORDER: beforeinstall _libinstall
|
|
_libinstall:
|
|
.if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
|
|
+ ${INSTALL} -d ${DESTDIR}${_LIBDIR}
|
|
${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
|
|
${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}.a ${DESTDIR}${_LIBDIR}/
|
|
.endif
|
|
.if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
|
|
+ ${INSTALL} -d ${DESTDIR}${_LIBDIR}
|
|
${INSTALL} ${TAG_ARGS:D${TAG_ARGS},profile} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
|
|
${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}_p.a ${DESTDIR}${_LIBDIR}/
|
|
.endif
|
|
.if defined(SHLIB_NAME)
|
|
+ ${INSTALL} -d ${DESTDIR}${_SHLIBDIR}
|
|
${INSTALL} ${TAG_ARGS} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
|
|
${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
|
|
${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR}/
|
|
@@ -388,10 +389,12 @@ _libinstall:
|
|
.endif # SHLIB_LINK
|
|
.endif # SHIB_NAME
|
|
.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
|
|
+ ${INSTALL} -d ${DESTDIR}${_LIBDIR}
|
|
${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
|
|
${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${_LIBDIR}/
|
|
.endif
|
|
.if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB)
|
|
+ ${INSTALL} -d ${DESTDIR}${LINTLIBDIR}
|
|
${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
|
|
${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}/
|
|
.endif
|
|
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
|
|
index 98746fa..5c541ab 100644
|
|
--- a/share/mk/bsd.libnames.mk
|
|
+++ b/share/mk/bsd.libnames.mk
|
|
@@ -64,7 +64,7 @@ LIBELF?= ${DESTDIR}${LIBDIR_BASE}/libelf.a
|
|
LIBEXECINFO?= ${DESTDIR}${LIBDIR_BASE}/libexecinfo.a
|
|
LIBFETCH?= ${DESTDIR}${LIBDIR_BASE}/libfetch.a
|
|
LIBFIGPAR?= ${DESTDIR}${LIBDIR_BASE}/libfigpar.a
|
|
-LIBFL?= "don't use LIBFL, use LIBL"
|
|
+LIBFL?= ${DESTDIR}${LIBDIR_BASE}/libfl.a
|
|
LIBFORM?= ${DESTDIR}${LIBDIR_BASE}/libform.a
|
|
LIBG2C?= ${DESTDIR}${LIBDIR_BASE}/libg2c.a
|
|
LIBGEOM?= ${DESTDIR}${LIBDIR_BASE}/libgeom.a
|
|
@@ -93,7 +93,7 @@ LIBKEYCAP?= ${DESTDIR}${LIBDIR_BASE}/libkeycap.a
|
|
LIBKICONV?= ${DESTDIR}${LIBDIR_BASE}/libkiconv.a
|
|
LIBKRB5?= ${DESTDIR}${LIBDIR_BASE}/libkrb5.a
|
|
LIBKVM?= ${DESTDIR}${LIBDIR_BASE}/libkvm.a
|
|
-LIBL?= ${DESTDIR}${LIBDIR_BASE}/libl.a
|
|
+LIBL?= ${DESTDIR}${LIBDIR_BASE}/libfl.a
|
|
LIBLN?= "don't use LIBLN, use LIBL"
|
|
LIBLZMA?= ${DESTDIR}${LIBDIR_BASE}/liblzma.a
|
|
LIBM?= ${DESTDIR}${LIBDIR_BASE}/libm.a
|
|
diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk
|
|
index 75acbe1..b662439 100644
|
|
--- a/share/mk/bsd.links.mk
|
|
+++ b/share/mk/bsd.links.mk
|
|
@@ -16,9 +16,11 @@ afterinstall: _installlinks
|
|
_installlinks:
|
|
.for s t in ${LINKS}
|
|
@${ECHO} "${t} -> ${s}" ;\
|
|
+ test -d ${DESTDIR}/`dirname ${t}` || mkdir ${DESTDIR}/`dirname ${t}`;\
|
|
${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}${s} ${DESTDIR}${t}
|
|
.endfor
|
|
.for s t in ${SYMLINKS}
|
|
@${ECHO} "${t} -> ${s}" ;\
|
|
+ test -d ${DESTDIR}/`dirname ${t}` || mkdir ${DESTDIR}/`dirname ${t}`;\
|
|
${INSTALL_SYMLINK} ${TAG_ARGS} ${s} ${DESTDIR}/${t}
|
|
.endfor
|
|
diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
|
|
index 7306453..5fcd4f7 100644
|
|
--- a/share/mk/bsd.man.mk
|
|
+++ b/share/mk/bsd.man.mk
|
|
@@ -188,9 +188,11 @@ maninstall: ${MAN}
|
|
.if ${MK_MANCOMPRESS} == "no"
|
|
.if defined(MANFILTER)
|
|
.for __page in ${MAN}
|
|
+ ${INSTALL} -d ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page}
|
|
${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \
|
|
${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page}
|
|
.if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
|
|
+ ${INSTALL} -d ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page}
|
|
${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \
|
|
${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page}
|
|
.endif
|
|
@@ -204,11 +206,14 @@ maninstall: ${MAN}
|
|
esac; \
|
|
page=$$1; shift; sect=$$1; shift; \
|
|
d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \
|
|
+ ${ECHO} ${INSTALL} -d $${d}; \
|
|
+ ${INSTALL} -d $${d}; \
|
|
${ECHO} ${MINSTALL} $${page} $${d}; \
|
|
${MINSTALL} $${page} $${d}; \
|
|
done
|
|
.if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
|
|
.for __page in ${MAN}
|
|
+ ${INSTALL} -d ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T}
|
|
${MINSTALL} ${__page:T:S/$/${CATEXT}/} \
|
|
${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T}
|
|
.endfor
|
|
@@ -216,9 +221,11 @@ maninstall: ${MAN}
|
|
.endif # defined(MANFILTER)
|
|
.else # ${MK_MANCOMPRESS} == "yes"
|
|
.for __page in ${MAN}
|
|
+ ${INSTALL} -d ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}
|
|
${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \
|
|
${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/
|
|
.if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
|
|
+ ${INSTALL} -d ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}
|
|
${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \
|
|
${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/}
|
|
.endif
|
|
diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk
|
|
index 6f769d3..1679973 100644
|
|
--- a/share/mk/bsd.nls.mk
|
|
+++ b/share/mk/bsd.nls.mk
|
|
@@ -71,7 +71,8 @@ STAGE_SYMLINKS_DIR.NLS= ${STAGE_OBJTOP}
|
|
SYMLINKS+= ${NLSSYMLINKS}
|
|
.endif
|
|
.for file in ${NLS}
|
|
-NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat
|
|
+NLSDIR_${file:T}= ${SHAREDIR}/nls/${file:T:R}/
|
|
+NLSNAME_${file:T}= ${NLSNAME}.cat
|
|
.if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R})
|
|
.if !empty(NLSLINKS_${file:R}:M${file:R})
|
|
.error NLSLINKS_${file:R} contains itself: ${file:R}
|
|
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
|
|
index 3450a01..8ad3e69 100644
|
|
--- a/share/mk/bsd.own.mk
|
|
+++ b/share/mk/bsd.own.mk
|
|
@@ -217,9 +217,6 @@ INSTALL_SYMLINK?= ${INSTALL} ${SYMLINK}
|
|
INSTALL_RSYMLINK?= ${INSTALL} ${RSYMLINK}
|
|
|
|
# Common variables
|
|
-.if !defined(DEBUG_FLAGS)
|
|
-STRIP?= -s
|
|
-.endif
|
|
|
|
COMPRESS_CMD?= gzip -cn
|
|
COMPRESS_EXT?= .gz
|
|
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
|
|
index e4727ac..775fd8a 100644
|
|
--- a/share/mk/bsd.prog.mk
|
|
+++ b/share/mk/bsd.prog.mk
|
|
@@ -44,10 +44,6 @@ CTFFLAGS+= -g
|
|
.endif
|
|
.endif
|
|
|
|
-.if !defined(DEBUG_FLAGS)
|
|
-STRIP?= -s
|
|
-.endif
|
|
-
|
|
.if defined(NO_ROOT)
|
|
.if !defined(TAGS) || ! ${TAGS:Mpackage=*}
|
|
TAGS+= package=${PACKAGE:Uruntime}
|
|
@@ -217,6 +213,7 @@ realinstall: _proginstall
|
|
.ORDER: beforeinstall _proginstall
|
|
_proginstall:
|
|
.if defined(PROG)
|
|
+ ${INSTALL} -d ${DESTDIR}${BINDIR}
|
|
${INSTALL} ${TAG_ARGS} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
|
|
${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
|
|
.if ${MK_DEBUG_FILES} != "no"
|
|
@@ -255,6 +252,7 @@ SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE}
|
|
STAGE_AS_${script:T}= ${SCRIPTSDIR_${script:T}}/${SCRIPTSNAME_${script:T}}
|
|
_scriptsinstall: _SCRIPTSINS_${script:T}
|
|
_SCRIPTSINS_${script:T}: ${script}
|
|
+ ${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}}
|
|
${INSTALL} ${TAG_ARGS} -o ${SCRIPTSOWN_${.ALLSRC:T}} \
|
|
-g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \
|
|
${.ALLSRC} \
|
|
diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
|
|
index cb79bf1..3cad05f 100644
|
|
--- a/share/mk/bsd.sys.mk
|
|
+++ b/share/mk/bsd.sys.mk
|
|
@@ -29,9 +29,6 @@ CFLAGS+= -std=${CSTD}
|
|
.if defined(WARNS)
|
|
.if ${WARNS} >= 1
|
|
CWARNFLAGS+= -Wsystem-headers
|
|
-.if !defined(NO_WERROR) && !defined(NO_WERROR.${COMPILER_TYPE})
|
|
-CWARNFLAGS+= -Werror
|
|
-.endif # !NO_WERROR && !NO_WERROR.${COMPILER_TYPE}
|
|
.endif # WARNS >= 1
|
|
.if ${WARNS} >= 2
|
|
CWARNFLAGS+= -Wall -Wno-format-y2k
|
|
@@ -103,9 +100,6 @@ CWARNFLAGS+= -Wformat=2 -Wno-format-extra-args
|
|
.if ${WARNS} <= 3
|
|
CWARNFLAGS.clang+= -Wno-format-nonliteral
|
|
.endif # WARNS <= 3
|
|
-.if !defined(NO_WERROR) && !defined(NO_WERROR.${COMPILER_TYPE})
|
|
-CWARNFLAGS+= -Werror
|
|
-.endif # !NO_WERROR && !NO_WERROR.${COMPILER_TYPE}
|
|
.endif # WFORMAT > 0
|
|
.endif # WFORMAT
|
|
.if defined(NO_WFORMAT) || defined(NO_WFORMAT.${COMPILER_TYPE})
|
|
@@ -154,6 +148,13 @@ CFLAGS.clang+= -fno-dwarf2-cfi-asm
|
|
# but not yet.
|
|
CXXFLAGS.clang+= -Wno-c++11-extensions
|
|
|
|
+.if ${MK_SSP} == "no"
|
|
+# gcc-4.9, -fstack-protector-strong is enabled by default.
|
|
+# Add -fno-stack-protector to disable it. Gentoo Bug #511698.
|
|
+SSP_CFLAGS?= -fno-stack-protector
|
|
+CFLAGS+= ${SSP_CFLAGS}
|
|
+.endif
|
|
+
|
|
.if ${MK_SSP} != "no" && \
|
|
${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
|
|
.if (${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 30500) || \
|
|
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
|
|
index 91d5a9a..7786edb 100644
|
|
--- a/share/mk/sys.mk
|
|
+++ b/share/mk/sys.mk
|
|
@@ -422,12 +422,6 @@ YFLAGS ?= -d
|
|
rm -f ${.PREFIX}.tmp.c
|
|
${CTFCONVERT_CMD}
|
|
|
|
-# Pull in global settings.
|
|
-__MAKE_CONF?=/etc/make.conf
|
|
-.if exists(${__MAKE_CONF})
|
|
-.include "${__MAKE_CONF}"
|
|
-.endif
|
|
-
|
|
# late include for customization
|
|
.sinclude <local.sys.mk>
|
|
|