diff options
author | Jon Tibble <meths@btinternet.com> | 2010-12-09 22:32:39 +0100 |
---|---|---|
committer | Jon Tibble <meths@btinternet.com> | 2010-12-09 22:32:39 +0100 |
commit | ac823a0f31ed9c8cbe505cee2def262ac92ea6cd (patch) | |
tree | 549e9c4f08a1e2772c233f727f9edb197c5d40c6 /usr | |
parent | 330db02c5e7190a78e55aa244e6463fc14828115 (diff) | |
download | illumos-joyent-ac823a0f31ed9c8cbe505cee2def262ac92ea6cd.tar.gz |
298 SPARC build fails in smt_pause.o
478 Build needs fixing for pkgdepend flag day
Reviewed by: gwr@nexenta.com
Reviewed by: trisk@nexenta.com
Reviewed by: richlowe@richlowe.net
Approved by: garrett@nexenta.com
Diffstat (limited to 'usr')
-rw-r--r-- | usr/src/Makefile.master | 1 | ||||
-rw-r--r-- | usr/src/lib/libc/Makefile | 8 | ||||
-rw-r--r-- | usr/src/lib/libc/amd64/Makefile | 9 | ||||
-rw-r--r-- | usr/src/lib/libc/capabilities/sun4v-hwcap1/sparc/Makefile | 7 | ||||
-rw-r--r-- | usr/src/lib/libc/capabilities/sun4v-hwcap1/sparcv9/Makefile | 7 | ||||
-rw-r--r-- | usr/src/lib/libc/capabilities/sun4v/common/smt_pause.s | 2 | ||||
-rw-r--r-- | usr/src/lib/libc/i386/Makefile.com | 8 | ||||
-rw-r--r-- | usr/src/lib/libc/sparc/Makefile.com | 10 | ||||
-rw-r--r-- | usr/src/lib/libc/sparcv9/Makefile.com | 8 | ||||
-rw-r--r-- | usr/src/pkg/Makefile | 9 |
10 files changed, 21 insertions, 48 deletions
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index 8ef4f464c3..062f9bdd19 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -504,6 +504,7 @@ DTEXTDOM=-DTEXT_DOMAIN=\"$(TEXT_DOMAIN)\" # For messaging. DTS_ERRNO=-D_TS_ERRNO CPPFLAGS.master=$(DTEXTDOM) $(DTS_ERRNO) \ $(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) $(ENVCPPFLAGS4) +CPPFLAGS.native=$(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) $(ENVCPPFLAGS4) CPPFLAGS= $(CPPFLAGS.master) AS_CPPFLAGS= $(CPPFLAGS.master) JAVAFLAGS= -deprecation diff --git a/usr/src/lib/libc/Makefile b/usr/src/lib/libc/Makefile index 768e320409..b75390cbcc 100644 --- a/usr/src/lib/libc/Makefile +++ b/usr/src/lib/libc/Makefile @@ -142,8 +142,6 @@ lib32: $(MACH_COMP) $(MACHLIBS) $(MACH)/$(LIB_PIC) $(VARIANTLIBS) exit 1; \ fi -$(MACHLIBS): $(MACH_COMP) $(MACH)/assym.h - lib64: $(MACH_COMP) $(MACHLIBS64) $(MACH64)/$(LIB_PIC) $(VARIANTLIBS64) @if $(ELFDUMP) -r $(MACH64)/$(DYNLIB) | $(GREP) -w environ ; then \ $(ECHO) "Error: Invalid reference to environ" ; \ @@ -151,8 +149,6 @@ lib64: $(MACH_COMP) $(MACHLIBS64) $(MACH64)/$(LIB_PIC) $(VARIANTLIBS64) exit 1; \ fi -$(MACHLIBS64): $(MACH_COMP) $(MACH64)/assym.h - $(MACH)/assym.h $(MACH64)/assym.h: @cd $(@D); $(MAKE) assym.h @@ -181,7 +177,9 @@ inslib64: $(ROOTFS_LIBS64) $(ROOTFS_LINKS64) \ $(ROOTFS_LINTLIB64) \ $(ROOTVARIANTLIBS64) -install_h: $(ROOTHDRS) +install_h: all_h $(ROOTHDRS) + +all_h: $(MACH)/assym.h $(MACH64)/assym.h check: $(CHECKHDRS) diff --git a/usr/src/lib/libc/amd64/Makefile b/usr/src/lib/libc/amd64/Makefile index 21ac0acc2e..1007da00eb 100644 --- a/usr/src/lib/libc/amd64/Makefile +++ b/usr/src/lib/libc/amd64/Makefile @@ -1190,14 +1190,9 @@ $(ASSYMDEP_OBJS:%=pics/%): assym.h GENASSYM_C = genassym.c -# XXX A hack. Perhaps this should be 'CPPFLAGS.native' and -# live in Makefile.master - -CPPFLAGS.genassym = \ - $(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) $(ENVCPPFLAGS4) - genassym: $(GENASSYM_C) - $(NATIVECC) -Iinc -I$(LIBCDIR)/inc $(CPPFLAGS.genassym) -o $@ $(GENASSYM_C) + $(NATIVECC) -Iinc -I$(LIBCDIR)/inc $(CPPFLAGS.native) \ + -o $@ $(GENASSYM_C) OFFSETS = $(LIBCDIR)/$(MACH)/offsets.in diff --git a/usr/src/lib/libc/capabilities/sun4v-hwcap1/sparc/Makefile b/usr/src/lib/libc/capabilities/sun4v-hwcap1/sparc/Makefile index 5f9092b14b..8c04c5db4a 100644 --- a/usr/src/lib/libc/capabilities/sun4v-hwcap1/sparc/Makefile +++ b/usr/src/lib/libc/capabilities/sun4v-hwcap1/sparc/Makefile @@ -29,11 +29,6 @@ ASFLAGS += -xarch=v8plus -I$(LIBCBASE)/$(MACH) .KEEP_STATE: -all install: $(LIBCBASE)/$(MACH)/assym.h $(SYMCAP) - -# We need assym.h, but it won't build directly. smt_pause.o depends on -# assym.h, so building it forces assym.h to be built. -$(LIBCBASE)/$(MACH)/assym.h: - @cd $(LIBCBASE)/$(MACH); $(MAKE) pics/smt_pause.o +all install: $(SYMCAP) include ../../Makefile.targ diff --git a/usr/src/lib/libc/capabilities/sun4v-hwcap1/sparcv9/Makefile b/usr/src/lib/libc/capabilities/sun4v-hwcap1/sparcv9/Makefile index f552f601b8..f035334bec 100644 --- a/usr/src/lib/libc/capabilities/sun4v-hwcap1/sparcv9/Makefile +++ b/usr/src/lib/libc/capabilities/sun4v-hwcap1/sparcv9/Makefile @@ -29,11 +29,6 @@ include $(SRC)/lib/Makefile.lib.64 AS_CPPFLAGS += -D__sparcv9 ASFLAGS += -xarch=v9 -I$(LIBCBASE)/$(MACH64) -all install: $(LIBCBASE)/$(MACH64)/assym.h $(SYMCAP) - -# We need assym.h, but it won't build directly. smt_pause.o depends on -# assym.h, so building it forces assym.h to be built. -$(LIBCBASE)/$(MACH64)/assym.h: - @cd $(LIBCBASE)/$(MACH64); $(MAKE) pics/smt_pause.o +all install: $(SYMCAP) include ../../Makefile.targ diff --git a/usr/src/lib/libc/capabilities/sun4v/common/smt_pause.s b/usr/src/lib/libc/capabilities/sun4v/common/smt_pause.s index 406f48fa83..02dc153ff3 100644 --- a/usr/src/lib/libc/capabilities/sun4v/common/smt_pause.s +++ b/usr/src/lib/libc/capabilities/sun4v/common/smt_pause.s @@ -38,7 +38,7 @@ #include <sys/stack.h> #if defined(NIAGARA_IMPL) -#include "assym.h" +#include <assym.h> #endif ENTRY(smt_pause) diff --git a/usr/src/lib/libc/i386/Makefile.com b/usr/src/lib/libc/i386/Makefile.com index 9d4de75de1..15dc9c21fe 100644 --- a/usr/src/lib/libc/i386/Makefile.com +++ b/usr/src/lib/libc/i386/Makefile.com @@ -1262,15 +1262,9 @@ $(ASSYMDEP_OBJS:%=pics/%): assym.h GENASSYM_C = $(LIBCDIR)/$(MACH)/genassym.c -# XXX A hack. Perhaps this should be 'CPPFLAGS.native' and -# live in Makefile.master - -CPPFLAGS.genassym = \ - $(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) $(ENVCPPFLAGS4) - genassym: $(GENASSYM_C) $(NATIVECC) -I$(LIBCBASE)/inc -I$(LIBCDIR)/inc \ - -D__EXTENSIONS__ $(CPPFLAGS.genassym) -o $@ $(GENASSYM_C) + -D__EXTENSIONS__ $(CPPFLAGS.native) -o $@ $(GENASSYM_C) OFFSETS = $(LIBCDIR)/$(MACH)/offsets.in diff --git a/usr/src/lib/libc/sparc/Makefile.com b/usr/src/lib/libc/sparc/Makefile.com index ca2888c9f5..4246d20de3 100644 --- a/usr/src/lib/libc/sparc/Makefile.com +++ b/usr/src/lib/libc/sparc/Makefile.com @@ -1339,19 +1339,13 @@ $(ASSYMDEP_OBJS:%=pics/%): assym.h # assym.h build rules -GENASSYM_C = $(LIBCDIR)/$(MACH)/genassym.c - -# XXX A hack. Perhaps this should be 'CPPFLAGS.native' and -# live in Makefile.master - assym.h := CFLAGS += -g -CPPFLAGS.genassym = \ - $(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) $(ENVCPPFLAGS4) -I. +GENASSYM_C = $(LIBCDIR)/$(MACH)/genassym.c genassym: $(GENASSYM_C) $(NATIVECC) -I$(LIBCBASE)/inc -I$(LIBCDIR)/inc \ - $(CPPFLAGS.genassym) -o $@ $(GENASSYM_C) + $(CPPFLAGS.native) -o $@ $(GENASSYM_C) OFFSETS = $(LIBCDIR)/$(MACH)/offsets.in diff --git a/usr/src/lib/libc/sparcv9/Makefile.com b/usr/src/lib/libc/sparcv9/Makefile.com index 0484269266..18d7070ed3 100644 --- a/usr/src/lib/libc/sparcv9/Makefile.com +++ b/usr/src/lib/libc/sparcv9/Makefile.com @@ -1267,15 +1267,9 @@ assym.h := CFLAGS64 += -g GENASSYM_C = $(LIBCDIR)/$(MACH)/genassym.c -# XXX A hack. Perhaps this should be 'CPPFLAGS.native' and -# live in Makefile.master - -CPPFLAGS.genassym = \ - $(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) $(ENVCPPFLAGS4) -I. - genassym: $(GENASSYM_C) $(NATIVECC) -I$(LIBCBASE)/inc -I$(LIBCDIR)/inc \ - $(CPPFLAGS.genassym) -o $@ $(GENASSYM_C) + $(CPPFLAGS.native) -o $@ $(GENASSYM_C) OFFSETS = $(LIBCDIR)/$(MACH)/offsets.in diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile index 49bd8b8ef3..2cbc1a2bf1 100644 --- a/usr/src/pkg/Makefile +++ b/usr/src/pkg/Makefile @@ -227,6 +227,12 @@ DEP_SYNTH_PKGS= $(SYNTH_PKGS:%=$(PDIR)/%.dep) PROC_SYNTH_PKGS= $(SYNTH_PKGS:%=$(PDIR)/%.mog) # +# Root of pkg image to use for dependency resolution +# Normally / on the machine used to build the binaries +# +PKGDEP_RESOLVE_IMAGE = / + +# # For each package, we determine the target repository based on # manifest-embedded metadata. Because we make that determination on # the fly, the publication target cannot be expressed as a @@ -364,7 +370,8 @@ $(PDIR)/gendeps: $(DEP_SYNTH_PKGS) $(DEP_PKGS) done; \ else \ print "Resolving dependencies"; \ - pkgdepend resolve -m $(DEP_SYNTH_PKGS) $(DEP_PKGS); \ + pkgdepend -R $(PKGDEP_RESOLVE_IMAGE) resolve \ + -m $(DEP_SYNTH_PKGS) $(DEP_PKGS); \ for p in $(DEP_SYNTH_PKGS:%.dep=%) $(DEP_PKGS:%.dep=%); do \ if [ "$$(print $$p.metadata.*)" = \ "$$(print $$p.metadata.noincorp.*)" ]; \ |