| 1 |
the_paya 09/01/22 21:03:11 |
| 2 |
|
| 3 |
Added: freebsd-mk-defs-7.1-gentoo.patch |
| 4 |
freebsd-mk-defs-7.1-gnu.patch |
| 5 |
Log: |
| 6 |
Import of the 7.1 ebuilds from gentoo-bsd overlay. |
| 7 |
(Portage version: 2.2_rc23/cvs/FreeBSD i386) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-7.1-gentoo.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-7.1-gentoo.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-7.1-gentoo.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: freebsd-mk-defs-7.1-gentoo.patch |
| 16 |
=================================================================== |
| 17 |
Index: share/mk/bsd.doc.mk |
| 18 |
=================================================================== |
| 19 |
--- share.orig/mk/bsd.doc.mk |
| 20 |
+++ share/mk/bsd.doc.mk |
| 21 |
@@ -137,10 +137,12 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${ |
| 22 |
realinstall: |
| 23 |
.for _dev in ${PRINTERDEVICE:Mhtml} |
| 24 |
cd ${SRCDIR}; \ |
| 25 |
+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME} |
| 26 |
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ |
| 27 |
${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME} |
| 28 |
.endfor |
| 29 |
.for _dev in ${PRINTERDEVICE:Nhtml} |
| 30 |
+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME} |
| 31 |
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ |
| 32 |
${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME} |
| 33 |
.endfor |
| 34 |
Index: share/mk/bsd.files.mk |
| 35 |
=================================================================== |
| 36 |
--- share.orig/mk/bsd.files.mk |
| 37 |
+++ share/mk/bsd.files.mk |
| 38 |
@@ -39,6 +39,7 @@ ${group}NAME_${file:T}?= ${file:T} |
| 39 |
.endif |
| 40 |
installfiles: _${group}INS_${file:T} |
| 41 |
_${group}INS_${file:T}: ${file} |
| 42 |
+ ${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC}}/${${group}NAME_${.ALLSRC:T}:H} |
| 43 |
${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \ |
| 44 |
-g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ |
| 45 |
${.ALLSRC} \ |
| 46 |
@@ -51,10 +52,12 @@ _${group}FILES+= ${file} |
| 47 |
installfiles: _${group}INS |
| 48 |
_${group}INS: ${_${group}FILES} |
| 49 |
.if defined(${group}NAME) |
| 50 |
+ ${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME} |
| 51 |
${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ |
| 52 |
-m ${${group}MODE} ${.ALLSRC} \ |
| 53 |
${DESTDIR}${${group}DIR}/${${group}NAME} |
| 54 |
.else |
| 55 |
+ ${INSTALL} -d ${DESTDIR}${${group}DIR} |
| 56 |
${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ |
| 57 |
-m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR} |
| 58 |
.endif |
| 59 |
Index: share/mk/bsd.incs.mk |
| 60 |
=================================================================== |
| 61 |
--- share.orig/mk/bsd.incs.mk |
| 62 |
+++ share/mk/bsd.incs.mk |
| 63 |
@@ -41,6 +41,10 @@ ${group}NAME_${header:T}?= ${header:T} |
| 64 |
.endif |
| 65 |
installincludes: _${group}INS_${header:T} |
| 66 |
_${group}INS_${header:T}: ${header} |
| 67 |
+ |
| 68 |
+ ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \ |
| 69 |
+ -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ |
| 70 |
+ ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}} |
| 71 |
${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \ |
| 72 |
-g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ |
| 73 |
${.ALLSRC} \ |
| 74 |
@@ -53,9 +57,11 @@ _${group}INCS+= ${header} |
| 75 |
installincludes: _${group}INS |
| 76 |
_${group}INS: ${_${group}INCS} |
| 77 |
.if defined(${group}NAME) |
| 78 |
+ ${INSTALL} -d ${DESTDIR}${${group}DIR} |
| 79 |
${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ |
| 80 |
${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME} |
| 81 |
.else |
| 82 |
+ ${INSTALL} -d ${DESTDIR}${${group}DIR} |
| 83 |
${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ |
| 84 |
${.ALLSRC} ${DESTDIR}${${group}DIR} |
| 85 |
.endif |
| 86 |
Index: share/mk/bsd.info.mk |
| 87 |
=================================================================== |
| 88 |
--- share.orig/mk/bsd.info.mk |
| 89 |
+++ share/mk/bsd.info.mk |
| 90 |
@@ -83,6 +83,7 @@ INFO2HTML?= info2html |
| 91 |
TEX?= tex |
| 92 |
DVIPS?= dvips |
| 93 |
DVIPS2ASCII?= dvips2ascii |
| 94 |
+INSTALL?= install |
| 95 |
|
| 96 |
.SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html |
| 97 |
|
| 98 |
@@ -144,12 +145,14 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x} |
| 99 |
INSTALLINFODIRS+= ${x:S/$/-install/} |
| 100 |
${x:S/$/-install/}: |
| 101 |
.if !empty(.MAKEFLAGS:M-j) |
| 102 |
+ ${INSTALL} -d ${DESTDIR}${INFODIR}/${INFODIRFILE} |
| 103 |
lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \ |
| 104 |
${INSTALLINFO} ${INSTALLINFOFLAGS} \ |
| 105 |
--defsection=${INFOSECTION} \ |
| 106 |
--defentry=${INFOENTRY_${x}} \ |
| 107 |
${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} |
| 108 |
.else |
| 109 |
+ ${INSTALL} -d ${DESTDIR}${INFODIR}/${INFODIRFILE} |
| 110 |
${INSTALLINFO} ${INSTALLINFOFLAGS} \ |
| 111 |
--defsection=${INFOSECTION} \ |
| 112 |
--defentry=${INFOENTRY_${x}} \ |
| 113 |
Index: share/mk/bsd.lib.mk |
| 114 |
=================================================================== |
| 115 |
--- share.orig/mk/bsd.lib.mk |
| 116 |
+++ share/mk/bsd.lib.mk |
| 117 |
@@ -37,10 +37,6 @@ NO_WERROR= |
| 118 |
CFLAGS+= ${DEBUG_FLAGS} |
| 119 |
.endif |
| 120 |
|
| 121 |
-.if !defined(DEBUG_FLAGS) |
| 122 |
-STRIP?= -s |
| 123 |
-.endif |
| 124 |
- |
| 125 |
.include <bsd.libnames.mk> |
| 126 |
|
| 127 |
# prefer .s to a .c, add .po, remove stuff not used in the BSD libraries |
| 128 |
@@ -236,14 +232,17 @@ realinstall: _libinstall |
| 129 |
.ORDER: beforeinstall _libinstall |
| 130 |
_libinstall: |
| 131 |
.if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" |
| 132 |
+ ${INSTALL} -d ${DESTDIR}${LIBDIR} |
| 133 |
${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 134 |
${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR} |
| 135 |
.endif |
| 136 |
.if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) |
| 137 |
+ ${INSTALL} -d ${DESTDIR}${LIBDIR} |
| 138 |
${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 139 |
${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR} |
| 140 |
.endif |
| 141 |
.if defined(SHLIB_NAME) |
| 142 |
+ ${INSTALL} -d ${DESTDIR}${SHLIBDIR} |
| 143 |
${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 144 |
${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \ |
| 145 |
${SHLIB_NAME} ${DESTDIR}${SHLIBDIR} |
| 146 |
Index: share/mk/bsd.libnames.mk |
| 147 |
=================================================================== |
| 148 |
--- share.orig/mk/bsd.libnames.mk |
| 149 |
+++ share/mk/bsd.libnames.mk |
| 150 |
@@ -41,7 +41,7 @@ LIBDISK?= ${DESTDIR}${LIBDIR}/libdisk.a |
| 151 |
LIBDNS?= ${DESTDIR}${LIBDIR}/libdns.a |
| 152 |
LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a |
| 153 |
LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a |
| 154 |
-LIBFL?= "don't use LIBFL, use LIBL" |
| 155 |
+LIBFL?= ${DESTDIR}${LIBDOR}/libfl.a |
| 156 |
LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a |
| 157 |
LIBFTPIO?= ${DESTDIR}${LIBDIR}/libftpio.a |
| 158 |
LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a |
| 159 |
@@ -68,7 +68,7 @@ LIBKEYCAP?= ${DESTDIR}${LIBDIR}/libkeyca |
| 160 |
LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a |
| 161 |
LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a |
| 162 |
LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a |
| 163 |
-LIBL?= ${DESTDIR}${LIBDIR}/libl.a |
| 164 |
+LIBL?= ${DESTDIR}${LIBDOR}/libfl.a |
| 165 |
LIBLN?= "don't use LIBLN, use LIBL" |
| 166 |
.if ${MK_BIND} != "no" |
| 167 |
LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a |
| 168 |
Index: share/mk/bsd.man.mk |
| 169 |
=================================================================== |
| 170 |
--- share.orig/mk/bsd.man.mk |
| 171 |
+++ share/mk/bsd.man.mk |
| 172 |
@@ -165,9 +165,11 @@ _maninstall: ${MAN} |
| 173 |
.if defined(NO_MANCOMPRESS) |
| 174 |
.if defined(MANFILTER) |
| 175 |
.for __page in ${MAN} |
| 176 |
+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page} |
| 177 |
${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \ |
| 178 |
${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page} |
| 179 |
.if defined(MANBUILDCAT) && !empty(MANBUILDCAT) |
| 180 |
+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page} |
| 181 |
${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \ |
| 182 |
${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page} |
| 183 |
.endif |
| 184 |
@@ -181,11 +183,14 @@ _maninstall: ${MAN} |
| 185 |
esac; \ |
| 186 |
page=$$1; shift; sect=$$1; shift; \ |
| 187 |
d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \ |
| 188 |
+ ${ECHO} ${INSTALL} -d $${d}; \ |
| 189 |
+ ${INSTALL} -d $${d}; \ |
| 190 |
${ECHO} ${MINSTALL} $${page} $${d}; \ |
| 191 |
${MINSTALL} $${page} $${d}; \ |
| 192 |
done |
| 193 |
.if defined(MANBUILDCAT) && !empty(MANBUILDCAT) |
| 194 |
.for __page in ${MAN} |
| 195 |
+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T} |
| 196 |
${MINSTALL} ${__page:T:S/$/${CATEXT}/} \ |
| 197 |
${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T} |
| 198 |
.endfor |
| 199 |
@@ -193,9 +198,11 @@ _maninstall: ${MAN} |
| 200 |
.endif |
| 201 |
.else |
| 202 |
.for __page in ${MAN} |
| 203 |
+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR} |
| 204 |
${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \ |
| 205 |
${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR} |
| 206 |
.if defined(MANBUILDCAT) && !empty(MANBUILDCAT) |
| 207 |
+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}/} |
| 208 |
${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \ |
| 209 |
${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/} |
| 210 |
.endif |
| 211 |
Index: share/mk/bsd.prog.mk |
| 212 |
=================================================================== |
| 213 |
--- share.orig/mk/bsd.prog.mk |
| 214 |
+++ share/mk/bsd.prog.mk |
| 215 |
@@ -23,10 +23,6 @@ CFLAGS+=${DEBUG_FLAGS} |
| 216 |
CFLAGS+=${CRUNCH_CFLAGS} |
| 217 |
.endif |
| 218 |
|
| 219 |
-.if !defined(DEBUG_FLAGS) |
| 220 |
-STRIP?= -s |
| 221 |
-.endif |
| 222 |
- |
| 223 |
.if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO") |
| 224 |
LDFLAGS+= -static |
| 225 |
.endif |
| 226 |
@@ -142,9 +138,11 @@ realinstall: _proginstall |
| 227 |
_proginstall: |
| 228 |
.if defined(PROG) |
| 229 |
.if defined(PROGNAME) |
| 230 |
+ ${INSTALL} -d ${DESTDIR}${BINDIR} |
| 231 |
${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ |
| 232 |
${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME} |
| 233 |
.else |
| 234 |
+ ${INSTALL} -d ${DESTDIR}${BINDIR} |
| 235 |
${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ |
| 236 |
${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR} |
| 237 |
.endif |
| 238 |
@@ -172,6 +170,7 @@ SCRIPTSGRP_${script:T}?= ${SCRIPTSGRP} |
| 239 |
SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE} |
| 240 |
_scriptsinstall: _SCRIPTSINS_${script:T} |
| 241 |
_SCRIPTSINS_${script:T}: ${script} |
| 242 |
+ ${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}} |
| 243 |
${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \ |
| 244 |
-g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \ |
| 245 |
${.ALLSRC} \ |
| 246 |
Index: share/mk/bsd.sys.mk |
| 247 |
=================================================================== |
| 248 |
--- share.orig/mk/bsd.sys.mk |
| 249 |
+++ share/mk/bsd.sys.mk |
| 250 |
@@ -30,9 +30,6 @@ CFLAGS += -std=${CSTD} |
| 251 |
. if defined(WARNS) |
| 252 |
. if ${WARNS} >= 1 |
| 253 |
CWARNFLAGS += -Wsystem-headers |
| 254 |
-. if !defined(NO_WERROR) |
| 255 |
-CWARNFLAGS += -Werror |
| 256 |
-. endif |
| 257 |
. endif |
| 258 |
. if ${WARNS} >= 2 |
| 259 |
CWARNFLAGS += -Wall -Wno-format-y2k |
| 260 |
@@ -66,9 +63,6 @@ WFORMAT = 1 |
| 261 |
. if ${WFORMAT} > 0 |
| 262 |
#CWARNFLAGS += -Wformat-nonliteral -Wformat-security -Wno-format-extra-args |
| 263 |
CWARNFLAGS += -Wformat=2 -Wno-format-extra-args |
| 264 |
-. if !defined(NO_WERROR) |
| 265 |
-CWARNFLAGS += -Werror |
| 266 |
-. endif |
| 267 |
. endif |
| 268 |
. endif |
| 269 |
.endif |
| 270 |
Index: share/mk/sys.mk |
| 271 |
=================================================================== |
| 272 |
--- share.orig/mk/sys.mk |
| 273 |
+++ share/mk/sys.mk |
| 274 |
@@ -34,11 +34,11 @@ |
| 275 |
CC ?= c89 |
| 276 |
CFLAGS ?= -O |
| 277 |
.else |
| 278 |
-CC ?= cc |
| 279 |
+CC ?= gcc |
| 280 |
.if ${MACHINE_ARCH} == "arm" |
| 281 |
-CFLAGS ?= -O -fno-strict-aliasing -pipe |
| 282 |
+CFLAGS ?= -pipe |
| 283 |
.else |
| 284 |
-CFLAGS ?= -O2 -fno-strict-aliasing -pipe |
| 285 |
+CFLAGS ?= -pipe |
| 286 |
.endif |
| 287 |
.endif |
| 288 |
|
| 289 |
@@ -61,7 +61,7 @@ |
| 290 |
.endif |
| 291 |
.endif |
| 292 |
|
| 293 |
-CXX ?= c++ |
| 294 |
+CXX ?= g++ |
| 295 |
CXXFLAGS ?= ${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes:N-Wno-pointer-sign} |
| 296 |
|
| 297 |
CPP ?= cpp |
| 298 |
@@ -254,12 +254,6 @@ YFLAGS ?= -d |
| 299 |
${CC} ${CFLAGS} ${LDFLAGS} ${.PREFIX}.tmp.c ${LDLIBS} -ll -o ${.TARGET} |
| 300 |
rm -f ${.PREFIX}.tmp.c |
| 301 |
|
| 302 |
-# FreeBSD build pollution. Hide it in the non-POSIX part of the ifdef. |
| 303 |
-__MAKE_CONF?=/etc/make.conf |
| 304 |
-.if exists(${__MAKE_CONF}) |
| 305 |
-.include "${__MAKE_CONF}" |
| 306 |
-.endif |
| 307 |
- |
| 308 |
# Default executable format |
| 309 |
# XXX hint for bsd.port.mk |
| 310 |
OBJFORMAT?= elf |
| 311 |
Index: share/mk/bsd.links.mk |
| 312 |
=================================================================== |
| 313 |
--- share.orig/mk/bsd.links.mk |
| 314 |
+++ share/mk/bsd.links.mk |
| 315 |
@@ -15,6 +15,8 @@ _installlinks: |
| 316 |
t=${DESTDIR}$$1; \ |
| 317 |
shift; \ |
| 318 |
${ECHO} $$t -\> $$l; \ |
| 319 |
+ d=`dirname $$t`; \ |
| 320 |
+ test -d $$d || mkdir $$d; \ |
| 321 |
ln -f $$l $$t; \ |
| 322 |
done; true |
| 323 |
.endif |
| 324 |
@@ -26,6 +28,8 @@ _installlinks: |
| 325 |
t=${DESTDIR}$$1; \ |
| 326 |
shift; \ |
| 327 |
${ECHO} $$t -\> $$l; \ |
| 328 |
+ d=`dirname $$t`; \ |
| 329 |
+ test -d $$d || mkdir $$d; \ |
| 330 |
ln -fs $$l $$t; \ |
| 331 |
done; true |
| 332 |
.endif |
| 333 |
Index: share/mk/bsd.own.mk |
| 334 |
=================================================================== |
| 335 |
--- share.orig/mk/bsd.own.mk |
| 336 |
+++ share/mk/bsd.own.mk |
| 337 |
@@ -166,11 +166,6 @@ DEFAULT_THREAD_LIB?= libthr |
| 338 |
|
| 339 |
INCLUDEDIR?= /usr/include |
| 340 |
|
| 341 |
-# Common variables |
| 342 |
-.if !defined(DEBUG_FLAGS) |
| 343 |
-STRIP?= -s |
| 344 |
-.endif |
| 345 |
- |
| 346 |
COMPRESS_CMD?= gzip -cn |
| 347 |
COMPRESS_EXT?= .gz |
| 348 |
|
| 349 |
|
| 350 |
|
| 351 |
|
| 352 |
1.1 sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-7.1-gnu.patch |
| 353 |
|
| 354 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-7.1-gnu.patch?rev=1.1&view=markup |
| 355 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-7.1-gnu.patch?rev=1.1&content-type=text/plain |
| 356 |
|
| 357 |
Index: freebsd-mk-defs-7.1-gnu.patch |
| 358 |
=================================================================== |
| 359 |
Index: mk/bsd.incs.mk |
| 360 |
=================================================================== |
| 361 |
--- mk.orig/bsd.incs.mk |
| 362 |
+++ mk/bsd.incs.mk |
| 363 |
@@ -45,7 +45,7 @@ _${group}INS_${header:T}: ${header} |
| 364 |
${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \ |
| 365 |
-g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ |
| 366 |
${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}} |
| 367 |
- ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \ |
| 368 |
+ ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \ |
| 369 |
-g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ |
| 370 |
${.ALLSRC} \ |
| 371 |
${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}} |
| 372 |
@@ -58,11 +58,11 @@ installincludes: _${group}INS |
| 373 |
_${group}INS: ${_${group}INCS} |
| 374 |
.if defined(${group}NAME) |
| 375 |
${INSTALL} -d ${DESTDIR}${${group}DIR} |
| 376 |
- ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ |
| 377 |
+ ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ |
| 378 |
${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME} |
| 379 |
.else |
| 380 |
${INSTALL} -d ${DESTDIR}${${group}DIR} |
| 381 |
- ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ |
| 382 |
+ ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ |
| 383 |
${.ALLSRC} ${DESTDIR}${${group}DIR} |
| 384 |
.endif |
| 385 |
.endif |
| 386 |
Index: mk/bsd.lib.mk |
| 387 |
=================================================================== |
| 388 |
--- mk.orig/bsd.lib.mk |
| 389 |
+++ mk/bsd.lib.mk |
| 390 |
@@ -119,11 +119,7 @@ _LIBS= lib${LIB}.a |
| 391 |
lib${LIB}.a: ${OBJS} ${STATICOBJS} |
| 392 |
@${ECHO} building static ${LIB} library |
| 393 |
@rm -f ${.TARGET} |
| 394 |
-.if !defined(NM) |
| 395 |
- @${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} |
| 396 |
-.else |
| 397 |
- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} |
| 398 |
-.endif |
| 399 |
+ @${AR} cq ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD} |
| 400 |
${RANLIB} ${.TARGET} |
| 401 |
.endif |
| 402 |
|
| 403 |
@@ -136,11 +132,7 @@ POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o= |
| 404 |
lib${LIB}_p.a: ${POBJS} |
| 405 |
@${ECHO} building profiled ${LIB} library |
| 406 |
@rm -f ${.TARGET} |
| 407 |
-.if !defined(NM) |
| 408 |
- @${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD} |
| 409 |
-.else |
| 410 |
- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD} |
| 411 |
-.endif |
| 412 |
+ @${AR} cq ${.TARGET} ${POBJS} ${ARADD} |
| 413 |
${RANLIB} ${.TARGET} |
| 414 |
.endif |
| 415 |
|
| 416 |
@@ -195,15 +195,9 @@ |
| 417 |
.if defined(SHLIB_LINK) |
| 418 |
@ln -fs ${.TARGET} ${SHLIB_LINK} |
| 419 |
.endif |
| 420 |
-.if !defined(NM) |
| 421 |
@${CC} ${LDFLAGS} -shared -Wl,-x \ |
| 422 |
-o ${.TARGET} -Wl,-soname,${SONAME} \ |
| 423 |
- `lorder ${SOBJS} | tsort -q` ${LDADD} |
| 424 |
-.else |
| 425 |
- @${CC} ${LDFLAGS} -shared -Wl,-x \ |
| 426 |
- -o ${.TARGET} -Wl,-soname,${SONAME} \ |
| 427 |
- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD} |
| 428 |
-.endif |
| 429 |
+ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD} |
| 430 |
.if defined(CTFMERGE) |
| 431 |
${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} |
| 432 |
.endif |
| 433 |
@@ -211,13 +197,6 @@ _EXTRADEPEND: |
| 434 |
|
| 435 |
.if !target(install) |
| 436 |
|
| 437 |
-.if defined(PRECIOUSLIB) |
| 438 |
-.if !defined(NO_FSCHG) |
| 439 |
-SHLINSTALLFLAGS+= -fschg |
| 440 |
-.endif |
| 441 |
-SHLINSTALLFLAGS+= -S |
| 442 |
-.endif |
| 443 |
- |
| 444 |
_INSTALLFLAGS:= ${INSTALLFLAGS} |
| 445 |
.for ie in ${INSTALLFLAGS_EDIT} |
| 446 |
_INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} |
| 447 |
@@ -233,12 +212,12 @@ realinstall: _libinstall |
| 448 |
_libinstall: |
| 449 |
.if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" |
| 450 |
${INSTALL} -d ${DESTDIR}${LIBDIR} |
| 451 |
- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 452 |
+ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 453 |
${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR} |
| 454 |
.endif |
| 455 |
.if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) |
| 456 |
${INSTALL} -d ${DESTDIR}${LIBDIR} |
| 457 |
- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 458 |
+ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
| 459 |
${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR} |
| 460 |
.endif |
| 461 |
.if defined(SHLIB_NAME) |
| 462 |
Index: mk/bsd.prog.mk |
| 463 |
=================================================================== |
| 464 |
--- mk.orig/bsd.prog.mk |
| 465 |
+++ mk/bsd.prog.mk |
| 466 |
@@ -120,13 +120,6 @@ _EXTRADEPEND: |
| 467 |
|
| 468 |
.if !target(install) |
| 469 |
|
| 470 |
-.if defined(PRECIOUSPROG) |
| 471 |
-.if !defined(NO_FSCHG) |
| 472 |
-INSTALLFLAGS+= -fschg |
| 473 |
-.endif |
| 474 |
-INSTALLFLAGS+= -S |
| 475 |
-.endif |
| 476 |
- |
| 477 |
_INSTALLFLAGS:= ${INSTALLFLAGS} |
| 478 |
.for ie in ${INSTALLFLAGS_EDIT} |
| 479 |
_INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} |
Archives