Loading...
--- Libc/Libc-583/BSDmakefile
+++ Libc/Libc-498.1.7/BSDmakefile
@@ -1,8 +1,5 @@
-.include <CoreOS/Standard/Commands.mk>
-.include <CoreOS/Standard/Variables.mk>
-
ALLARCHS = arm i386 ppc ppc64 x86_64 # installsrc doesn't set RC_ARCHS
-TOP != ${PWD}
+PWD != pwd
.ifdef DSTROOT
DESTDIR = $(DSTROOT)
.else
@@ -14,20 +11,19 @@
.endif
.endif
.ifndef OBJROOT
-OBJROOT = $(TOP)/OBJROOT
+OBJROOT = $(PWD)/OBJROOT
.endif
.ifndef SRCROOT
-SRCROOT = $(TOP)
+SRCROOT = $(PWD)
.endif
.ifndef SYMROOT
-SYMROOT = $(TOP)/SYMROOT
-.endif
-MYARCH != ${ARCH}
+SYMROOT = $(PWD)/SYMROOT
+.endif
+ARCH != arch
.ifndef RC_ARCHS
-RC_ARCHS = $(MYARCH)
+RC_ARCHS = $(ARCH)
RC_$(RC_ARCHS) = 1
.endif
-FIRST_ARCH != ${PERL} -e 'print $$ARGV[0]' ${RC_ARCHS}
.ifndef RC_NONARCH_CFLAGS
RC_NONARCH_CFLAGS = -pipe
.endif
@@ -36,13 +32,10 @@
.else
LIBSYS = $(SDKROOT)/usr/local/lib/system
.endif
-NJOBS != ${PERL} -e '$$n = `$(SYSCTL) -n hw.ncpu`; printf "%d\n", $$n < 2 ? 2 : ($$n * 1.5)'
-.ifdef DEBUG
-MYBSDMAKE = $(BSDMAKE) -f Makefile -P
-.else
-MYBSDMAKE = $(BSDMAKE) -f Makefile
-.endif
-MYBSDMAKEJ = $(MYBSDMAKE) -j $(NJOBS)
+NJOBS != perl -e '$$n = `/usr/sbin/sysctl -n hw.ncpu`; printf "%d\n", $$n < 2 ? 2 : ($$n * 1.5)'
+BSDMAKE = bsdmake -f Makefile
+#BSDMAKEJ = $(BSDMAKE) -j $(NJOBS) -P
+BSDMAKEJ = $(BSDMAKE) -j $(NJOBS)
# Set the DONT-BUILD-arch-form variable to non-empty to turn off building
#DONT-BUILD-x86_64-static = 1
@@ -53,7 +46,7 @@
static = static
# Map RC_ARCHS to MACHINE_ARCH
-.for A in $(RC_ARCHS) $(MYARCH) # {
+.for A in $(RC_ARCHS) $(ARCH) # {
MACHINE_ARCH-$(A) = $(A:C/^armv.*/arm/)
.endfor # RC_ARCHS }
@@ -70,7 +63,7 @@
.for R in $(ROOTS) # {
roots: $($(R))
$($(R)):
- ${MKDIR} '$($(R))'
+ mkdir -p '$($(R))'
.endfor # ROOTS }
# These are the non B&I defaults
@@ -129,7 +122,7 @@
.endif
$(FRAMEWORKS):
$(SRCROOT)/patchHeaders $(FRAMEWORKPATH)/$(PRIVATEHEADERPATH) $(FRAMEWORKS)/$(PRIVATEHEADERPATH:H)
- ${LN} -fs $(VERSIONSB)/PrivateHeaders $(FRAMEWORKS)/$(SYSTEMFRAMEWORK)/PrivateHeaders
+ ln -fs $(VERSIONSB)/PrivateHeaders $(FRAMEWORKS)/$(SYSTEMFRAMEWORK)/PrivateHeaders
AUTOPATCHED = $(SRCROOT)/.autopatched
PARTIAL = -partial
@@ -145,19 +138,19 @@
.if empty(DONT-BUILD-$(A)-$(F)) # {
ARCHS-$(F) += $(A)
build-$(A)-$(F):
- ${MKDIR} $(OBJROOT)/obj.$(A) && \
+ mkdir -p $(OBJROOT)/obj.$(A) && \
MAKEOBJDIR="$(OBJROOT)/obj.$(A)" MACHINE_ARCH=$(MACHINE_ARCH-$(A)) CCARCH=$(A) \
DSTROOT=$(DSTROOT) OBJROOT=$(OBJROOT) SYMROOT=$(SYMROOT) \
RC_NONARCH_CFLAGS="$(RC_NONARCH_CFLAGS)" MAKEFLAGS="" \
OBJSUFFIX="$(OBJSUFFIX-$(F))" \
- $(MYBSDMAKEJ) libc$(SUFFIX-$(F)).a
+ $(BSDMAKEJ) libc$(SUFFIX-$(F)).a
.else # } {
build-$(A)-$(F):
@echo Not building libc$(PSUFFIX-$(F)).a for $(A)
.endif # }
.endfor # RC_ARCHS }
-NARCHS-$(F) != ${ECHO} $(ARCHS-$(F)) | ${WC} -w
+NARCHS-$(F) != echo $(ARCHS-$(F)) | wc -w
build-$(F): $(FRAMEWORKS) $(AUTOPATCHED)
.for A in $(RC_ARCHS) # {
@@ -167,21 +160,12 @@
build-$(F):
@echo No libc$(PSUFFIX-$(F)).a built
.else # } {
-LIPOARGS-$(F) != ${PERL} -e 'printf "%s\n", join(" ", map(qq(-arch $$_ \"$(OBJROOT)/obj.$$_/libc$(SUFFIX-$(F)).a\"), qw($(ARCHS-$(F)))))'
-.if $(dynamic) == $(F) # {
-LIPODYLDARGS-$(F) != ${PERL} -e 'printf "%s\n", join(" ", map(qq(-arch $$_ \"$(OBJROOT)/obj.$$_/libc-dyld.a\"), qw($(ARCHS-$(F)))))'
-.endif # }
+LIPOARGS-$(F) != perl -e 'printf "%s\n", join(" ", map(qq(-arch $$_ \"$(OBJROOT)/obj.$$_/libc$(SUFFIX-$(F)).a\"), qw($(ARCHS-$(F)))))'
build-$(F):
.if $(NARCHS-$(F)) == 1 # {
- ${CP} "$(OBJROOT)/obj.$(RC_ARCHS)/libc$(SUFFIX-$(F)).a" "$(SYMROOT)/libc$(PSUFFIX-$(F)).a"
-.if $(dynamic) == $(F) # {
- ${CP} "$(OBJROOT)/obj.$(RC_ARCHS)/libc-dyld.a" "$(SYMROOT)/libc-dyld.a"
-.endif # }
-.else # } {
- ${LIPO} -create $(LIPOARGS-$(F)) -output "$(SYMROOT)/libc$(PSUFFIX-$(F)).a"
-.if $(dynamic) == $(F) # {
- ${LIPO} -create $(LIPODYLDARGS-$(F)) -output "$(SYMROOT)/libc-dyld.a"
-.endif # }
+ cp -p "$(OBJROOT)/obj.$(RC_ARCHS)/libc$(SUFFIX-$(F)).a" "$(SYMROOT)/libc$(PSUFFIX-$(F)).a"
+.else # } {
+ lipo -create $(LIPOARGS-$(F)) -output "$(SYMROOT)/libc$(PSUFFIX-$(F)).a"
.endif # }
.endif # }
.endfor # FORMS }
@@ -191,69 +175,60 @@
$(AUTOPATCHED):
.for A in $(ALLARCHS) # {
MACHINE_ARCH=$(A) SRCROOT="$(SRCROOT)" \
- $(MYBSDMAKE) -C "$(SRCROOT)" autopatch
+ $(BSDMAKE) -C "$(SRCROOT)" autopatch
.endfor # ALLARCHS # }
touch $(AUTOPATCHED)
copysrc:
- ${PAX} -rw -p p . "$(SRCROOT)"
+ pax -rw -p p . "$(SRCROOT)"
installsrc: copysrc $(AUTOPATCHED)
installhdrs-real:
MAKEOBJDIR="$(OBJROOT)" DESTDIR="$(DSTROOT)" MAKEFLAGS="" \
DSTROOT=$(DSTROOT) OBJROOT=$(OBJROOT) SYMROOT=$(SYMROOT) \
- $(MYBSDMAKEJ) installhdrs
-.for A in $(RC_ARCHS) # {
- ${MKDIR} "$(OBJROOT)/obj.$(A)" && \
+ $(BSDMAKEJ) installhdrs
+.for A in $(RC_ARCHS) # {
+ mkdir -p "$(OBJROOT)/obj.$(A)" && \
MAKEOBJDIR="$(OBJROOT)/obj.$(A)" MACHINE_ARCH=$(MACHINE_ARCH-$(A)) CCARCH=$(A) \
DSTROOT=$(DSTROOT) OBJROOT=$(OBJROOT) SYMROOT=$(SYMROOT) \
MAKEFLAGS="" RC_NONARCH_CFLAGS="$(RC_NONARCH_CFLAGS)" \
- $(MYBSDMAKEJ) installhdrs-md
+ $(BSDMAKEJ) installhdrs-md
.endfor # RC_ARCHS # }
.for F in $(FORMS) # {
BI-install-$(F): build-$(F)
- ${MKDIR} $(DSTROOT)/usr/local/lib/system
+ mkdir -p $(DSTROOT)/usr/local/lib/system
if [ -f "$(SYMROOT)/libc$(PSUFFIX-$(F)).a" ]; then \
- ${ECHO} "Installing libc$(PSUFFIX-$(F)).a" && \
- ${INSTALL} -m 444 "$(SYMROOT)/libc$(PSUFFIX-$(F)).a" \
+ echo "Installing libc$(PSUFFIX-$(F)).a" && \
+ install -c -m 444 "$(SYMROOT)/libc$(PSUFFIX-$(F)).a" \
$(DSTROOT)/usr/local/lib/system && \
- ${RANLIB} "$(DSTROOT)/usr/local/lib/system/libc$(PSUFFIX-$(F)).a" || exit 1; \
+ ranlib "$(DSTROOT)/usr/local/lib/system/libc$(PSUFFIX-$(F)).a" || exit 1; \
fi
.if $(dynamic) == $(F) # {
- if [ -f "$(SYMROOT)/libc-dyld.a" ]; then \
- ${ECHO} "Installing libc-dyld.a" && \
- ${INSTALL} -m 444 "$(SYMROOT)/libc-dyld.a" \
- $(DSTROOT)/usr/local/lib/system && \
- ${RANLIB} "$(DSTROOT)/usr/local/lib/system/libc-dyld.a" || exit 1; \
- fi
.for A in $(RC_ARCHS) # {
MAKEOBJDIR="$(OBJROOT)/obj.$(A)" MACHINE_ARCH=$(MACHINE_ARCH-$(A)) CCARCH=$(A) \
DSTROOT=$(DSTROOT) OBJROOT=$(OBJROOT) SYMROOT=$(SYMROOT) \
DSTROOT=$(DSTROOT) OBJROOT=$(OBJROOT) SYMROOT=$(SYMROOT) \
MAKEFLAGS="" RC_NONARCH_CFLAGS="$(RC_NONARCH_CFLAGS)" \
- $(MYBSDMAKE) copyfiles
+ $(BSDMAKE) copyfiles
.endfor # RC_ARCHS # }
.endif # }
.endfor # FORMS }
# Don't use -j here; it may try to make links before the files are copied
-MANARGS != ${TEST} `id -u` -eq 0 || ${ECHO} MINSTALL=/usr/bin/install
-# Variables.mk defines MANDIR=${SHAREDIR}/man, but bsd.man.mk expects that
-# MANDIR=${SHAREDIR}/man/man, so we override.
-MANARGS += MANDIR=${SHAREDIR}/man/man
+MANARGS != test `id -u` -eq 0 || echo MINSTALL=/usr/bin/install
install-man:
- ${MKDIR} $(DSTROOT)/usr/share/man/man2
- ${MKDIR} $(DSTROOT)/usr/share/man/man3
- ${MKDIR} $(DSTROOT)/usr/share/man/man4
- ${MKDIR} $(DSTROOT)/usr/share/man/man5
- ${MKDIR} $(DSTROOT)/usr/share/man/man7
+ mkdir -p $(DSTROOT)/usr/share/man/man2
+ mkdir -p $(DSTROOT)/usr/share/man/man3
+ mkdir -p $(DSTROOT)/usr/share/man/man4
+ mkdir -p $(DSTROOT)/usr/share/man/man5
+ mkdir -p $(DSTROOT)/usr/share/man/man7
MAKEOBJDIR="$(OBJROOT)" DESTDIR="$(DSTROOT)" \
DSTROOT='$(DSTROOT)' OBJROOT='$(OBJROOT)' SYMROOT='$(SYMROOT)' \
- MACHINE_ARCH="$(MACHINE_ARCH-$(FIRST_ARCH))" CCARCH=$(FIRST_ARCH) MAKEFLAGS="" \
+ MACHINE_ARCH="$(MACHINE_ARCH-$(ARCH))" CCARCH=$(ARCH) MAKEFLAGS="" \
RC_NONARCH_CFLAGS="$(RC_NONARCH_CFLAGS)" \
- $(MYBSDMAKE) all-man maninstall $(MANARGS)
+ $(BSDMAKE) all-man maninstall $(MANARGS)
install-all: build install-man
.for F in $(FORMS) # {
@@ -262,8 +237,8 @@
clean:
.for F in $(FORMS) # {
- ${RM} $(SYMROOT)/libc$(PSUFFIX-$(F)).a
-.endfor # FORMS }
-.for A in $(RC_ARCHS) # {
- ${RMDIR} $(OBJROOT)/obj.$(A)
+ rm -f $(SYMROOT)/libc$(PSUFFIX-$(F)).a
+.endfor # FORMS }
+.for A in $(RC_ARCHS) # {
+ rm -rf $(OBJROOT)/obj.$(A)
.endfor # RC_ARCHS # }