Loading...
--- Libc/Libc-391.5.18/BSDmakefile
+++ Libc/Libc-583/BSDmakefile
@@ -1,42 +1,84 @@
+.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}
+.ifdef DSTROOT
+DESTDIR = $(DSTROOT)
+.else
+.ifdef DESTDIR
+DSTROOT = $(DESTDIR)
+.else
+DSTROOT = /
+DESTDIR = /
+.endif
+.endif
.ifndef OBJROOT
-OBJROOT != pwd
+OBJROOT = $(TOP)/OBJROOT
+.endif
+.ifndef SRCROOT
+SRCROOT = $(TOP)
.endif
.ifndef SYMROOT
-SYMROOT != pwd
-.endif
-ARCH != arch
+SYMROOT = $(TOP)/SYMROOT
+.endif
+MYARCH != ${ARCH}
.ifndef RC_ARCHS
-RC_ARCHS = $(ARCH)
+RC_ARCHS = $(MYARCH)
RC_$(RC_ARCHS) = 1
.endif
-NARCHS != echo $(RC_ARCHS) | wc -w
+FIRST_ARCH != ${PERL} -e 'print $$ARGV[0]' ${RC_ARCHS}
+.ifndef RC_NONARCH_CFLAGS
+RC_NONARCH_CFLAGS = -pipe
+.endif
.ifdef ALTUSRLOCALLIBSYSTEM
LIBSYS = $(ALTUSRLOCALLIBSYSTEM)
.else
-LIBSYS = $(NEXT_ROOT)/usr/local/lib/system
-.endif
-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)
-BSDMAKEJ = $(BSDMAKE) -j $(NJOBS) -P
-
-# This variables are to guarantee that the left-hand side of an expression is
+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)
+
+# Set the DONT-BUILD-arch-form variable to non-empty to turn off building
+#DONT-BUILD-x86_64-static = 1
+
+# These variables are to guarantee that the left-hand side of an expression is
# always a variable
dynamic = dynamic
static = static
-# Remove the arch stuff, since we know better here.
-LOCAL_CFLAGS != echo $(RC_CFLAGS) | sed 's/ *-arch [^ ][^ ]*//g'
+# Map RC_ARCHS to MACHINE_ARCH
+.for A in $(RC_ARCHS) $(MYARCH) # {
+MACHINE_ARCH-$(A) = $(A:C/^armv.*/arm/)
+.endfor # RC_ARCHS }
FORMS := dynamic debug profile static
+OBJSUFFIX-dynamic = So
+OBJSUFFIX-debug = do
+OBJSUFFIX-profile = po
+OBJSUFFIX-static = o
+
all: build
+
+ROOTS := DSTROOT OBJROOT SYMROOT
+.for R in $(ROOTS) # {
+roots: $($(R))
+$($(R)):
+ ${MKDIR} '$($(R))'
+.endfor # ROOTS }
# These are the non B&I defaults
.ifndef RC_ProjectName
-installhdrs: installhdrs-real
-build: build-static build-profile build-debug build-dynamic
-install: installhdrs install-all
+
+installhdrs: roots installhdrs-real
+build: roots build-static build-profile build-debug build-dynamic
+install: roots installhdrs install-all
.else # RC_ProjectName
@@ -44,127 +86,184 @@
# based on RC_ProjectName.
.if $(RC_ProjectName) == Libc
installhdrs:
-build: build-dynamic
-install: BI-install-dynamic
+build: roots build-dynamic
+install: roots BI-install-dynamic
.endif
.if $(RC_ProjectName) == Libc_headers
-installhdrs: installhdrs-real
+installhdrs: roots installhdrs-real
build:
-install: installhdrs-real
+install: roots installhdrs-real
.endif
.if $(RC_ProjectName) == Libc_man
installhdrs:
build:
-install: install-man
+install: roots install-man
.endif
.if $(RC_ProjectName) == Libc_static
installhdrs:
-build: build-static
-install: BI-install-static
+build: roots build-static
+install: roots BI-install-static
.endif
.if $(RC_ProjectName) == Libc_debug
installhdrs:
-build: build-debug
-install: BI-install-debug
+build: roots build-debug
+install: roots BI-install-debug
.endif
.if $(RC_ProjectName) == Libc_profile
installhdrs:
-build: build-profile
-install: BI-install-profile
+build: roots build-profile
+install: roots BI-install-profile
.endif
.endif # RC_ProjectName
-# Because of 3780028, there are random failures on HFS because the
-# CC_PRINT_OPTIONS_FILE can't be created. So we touch it first.
-.if !empty $(CC_PRINT_OPTIONS_FILE)
-$(CC_PRINT_OPTIONS_FILE):
- touch $(CC_PRINT_OPTIONS_FILE)
-.endif # CC_PRINT_OPTIONS_FILE
-
-.for F in $(FORMS)
-.if $(dynamic) == $(F)
-SUFFIX$(F) =
-.else
-SUFFIX$(F) = _$(F)
-.endif
-LIPOARGS$(F) != perl -e 'printf "%s\n", join(" ", map(qq(-arch $$_ \"$(OBJROOT)/obj.$$_/libc$(SUFFIX$(F)).a\"), qw($(RC_ARCHS))))'
-
-build-$(F): autopatch $(CC_PRINT_OPTIONS_FILE)
-.for A in $(RC_ARCHS)
+# Make a copy of System.framework/Versions/B/PrivateHeaders, with headers
+# patched so that we can build variant symbols independently
+SYSTEMFRAMEWORK = System.framework
+VERSIONSB = Versions/B
+PRIVATEHEADERPATH = $(SYSTEMFRAMEWORK)/$(VERSIONSB)/PrivateHeaders
+FRAMEWORKS = $(OBJROOT)/Frameworks
+.ifdef ALTFRAMEWORKSPATH
+FRAMEWORKPATH = ${ALTFRAMEWORKSPATH}
+.else
+FRAMEWORKPATH = ${SDKROOT}/System/Library/Frameworks
+.endif
+$(FRAMEWORKS):
+ $(SRCROOT)/patchHeaders $(FRAMEWORKPATH)/$(PRIVATEHEADERPATH) $(FRAMEWORKS)/$(PRIVATEHEADERPATH:H)
+ ${LN} -fs $(VERSIONSB)/PrivateHeaders $(FRAMEWORKS)/$(SYSTEMFRAMEWORK)/PrivateHeaders
+
+AUTOPATCHED = $(SRCROOT)/.autopatched
+PARTIAL = -partial
+.for F in $(FORMS) # {
+.if $(dynamic) == $(F) # {
+SUFFIX-$(F) =
+.else # } {
+SUFFIX-$(F) = _$(F)
+.endif # }
+PSUFFIX-$(F) = $(PARTIAL)$(SUFFIX-$(F))
+
+.for A in $(RC_ARCHS) # {
+.if empty(DONT-BUILD-$(A)-$(F)) # {
+ARCHS-$(F) += $(A)
+build-$(A)-$(F):
+ ${MKDIR} $(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
+.else # } {
+build-$(A)-$(F):
+ @echo Not building libc$(PSUFFIX-$(F)).a for $(A)
+.endif # }
+.endfor # RC_ARCHS }
+
+NARCHS-$(F) != ${ECHO} $(ARCHS-$(F)) | ${WC} -w
+
+build-$(F): $(FRAMEWORKS) $(AUTOPATCHED)
+.for A in $(RC_ARCHS) # {
build-$(F): build-$(A)-$(F)
-.endfor # RC_ARCHS
+.endfor # RC_ARCHS }
+.if $(NARCHS-$(F)) == 0 # {
build-$(F):
-.if $(NARCHS) == 1
- cp -p "$(OBJROOT)/obj.$(RC_ARCHS)/libc$(SUFFIX$(F)).a" "$(SYMROOT)"
-.else
- lipo -create $(LIPOARGS$(F)) -output $(SYMROOT)/libc$(SUFFIX$(F)).a
-.endif
-
-.for A in $(RC_ARCHS)
-build-$(A)-$(F):
- mkdir -p $(OBJROOT)/obj.$(A) && \
- MAKEOBJDIR="$(OBJROOT)/obj.$(A)" MACHINE_ARCH="$(A)" \
- MAKEFLAGS="" CFLAGS="-arch $(A) $(LOCAL_CFLAGS)" $(BSDMAKEJ) libc$(SUFFIX$(F)).a
-.endfor # RC_ARCHS
-.endfor # FORMS
-
-# We have to separately call bsdmake to patch the FreeBSD files, because of
-# the way its cache works, it would otherwise pick A file in ${SYMROOT}, even
-# over A .s file.
-autopatch:
-.for A in $(RC_ARCHS)
- MACHINE_ARCH="$(A)" $(BSDMAKEJ) autopatch
-.endfor # RC_ARCHS
-
-installsrc:
- pax -rw . "$(SRCROOT)"
-
-installhdrs-real: $(CC_PRINT_OPTIONS_FILE)
+ @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 # }
+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 # }
+.endif # }
+.endif # }
+.endfor # FORMS }
+
+# We autopatch the files into the directory containing the Makefile.inc. This
+# will happen at installsrc.
+$(AUTOPATCHED):
+.for A in $(ALLARCHS) # {
+ MACHINE_ARCH=$(A) SRCROOT="$(SRCROOT)" \
+ $(MYBSDMAKE) -C "$(SRCROOT)" autopatch
+.endfor # ALLARCHS # }
+ touch $(AUTOPATCHED)
+
+copysrc:
+ ${PAX} -rw -p p . "$(SRCROOT)"
+
+installsrc: copysrc $(AUTOPATCHED)
+
+installhdrs-real:
MAKEOBJDIR="$(OBJROOT)" DESTDIR="$(DSTROOT)" MAKEFLAGS="" \
- $(BSDMAKEJ) installhdrs
-.for A in $(RC_ARCHS)
- mkdir -p "$(OBJROOT)/obj.$(A)" && \
- MAKEOBJDIR="$(OBJROOT)/obj.$(A)" MACHINE_ARCH="$(A)" \
- MAKEFLAGS="" $(BSDMAKEJ) installhdrs-md
-.endfor # RC_ARCHS
-
-.for F in $(FORMS)
+ DSTROOT=$(DSTROOT) OBJROOT=$(OBJROOT) SYMROOT=$(SYMROOT) \
+ $(MYBSDMAKEJ) installhdrs
+.for A in $(RC_ARCHS) # {
+ ${MKDIR} "$(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
+.endfor # RC_ARCHS # }
+
+.for F in $(FORMS) # {
BI-install-$(F): build-$(F)
- mkdir -p $(DSTROOT)/usr/local/lib/system
- if [ -f "$(SYMROOT)/libc$(SUFFIX$(F)).a" ]; then \
- echo "Installing libc$(SUFFIX$(F)).a" && \
- install -c -m 444 "$(SYMROOT)/libc$(SUFFIX$(F)).a" \
+ ${MKDIR} $(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" \
$(DSTROOT)/usr/local/lib/system && \
- ranlib "$(DSTROOT)/usr/local/lib/system/libc$(SUFFIX$(F)).a"; \
+ ${RANLIB} "$(DSTROOT)/usr/local/lib/system/libc$(PSUFFIX-$(F)).a" || exit 1; \
fi
-.if !empty $(RC_ppc) && ($(static) != $(F))
- if [ -f "$(OBJROOT)/obj.ppc/libc-ldbl128$(SUFFIX$(F)).a" ]; then \
- echo "Installing libldbl128$(SUFFIX$(F)).a" ; \
- $(SRCROOT)/make_libldbl128 "$(OBJROOT)/obj.ppc/libc-ldbl128$(SUFFIX$(F)).a" \
- "$(SUFFIX$(F))" "$(DSTROOT)/usr/local/lib/system" $(LIBSYS) ; \
+.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
-.endif # RC_ppc && !static
-.endfor # FORMS
+.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
+.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
install-man:
- 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)" NOMANCOMPRESS=1 \
- MACHINE_ARCH="$(ARCH)" MAKEFLAGS="" $(BSDMAKE) autopatchman maninstall
+ ${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
+ MAKEOBJDIR="$(OBJROOT)" DESTDIR="$(DSTROOT)" \
+ DSTROOT='$(DSTROOT)' OBJROOT='$(OBJROOT)' SYMROOT='$(SYMROOT)' \
+ MACHINE_ARCH="$(MACHINE_ARCH-$(FIRST_ARCH))" CCARCH=$(FIRST_ARCH) MAKEFLAGS="" \
+ RC_NONARCH_CFLAGS="$(RC_NONARCH_CFLAGS)" \
+ $(MYBSDMAKE) all-man maninstall $(MANARGS)
install-all: build install-man
-.for F in $(FORMS)
+.for F in $(FORMS) # {
install-all: BI-install-$(F)
-.endfor # FORMS
+.endfor # FORMS }
clean:
-.for F in $(FORMS)
- rm -f $(OBJROOT)/libc$(SUFFIX$(F)).a
-.endfor # FORMS
-.for A in $(RC_ARCHS)
- rm -rf $(OBJROOT)/obj.$(A)
-.endfor # RC_ARCHS
+.for F in $(FORMS) # {
+ ${RM} $(SYMROOT)/libc$(PSUFFIX-$(F)).a
+.endfor # FORMS }
+.for A in $(RC_ARCHS) # {
+ ${RMDIR} $(OBJROOT)/obj.$(A)
+.endfor # RC_ARCHS # }