Mercurial Mercurial > patch-queues > mq_vpanels / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
vpanels-pkgdepend-153-fix
author Jon Tibble <meths@btinternet.com>
Thu, 02 Dec 2010 12:39:52 +0000
changeset 8 f949115789a8
permissions -rw-r--r--
Fix builds with pkg 153
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
8
f949115789a8 Fix builds with pkg 153
Jon Tibble <meths@btinternet.com>
parents:
diff changeset 
     1
 
diff -r e06e787fb463 usr/src/pkg/Makefile
f949115789a8 Fix builds with pkg 153
Jon Tibble <meths@btinternet.com>
parents:
diff changeset 
     2
 
--- a/usr/src/pkg/Makefile	Wed Nov 24 15:02:13 2010 -0800
f949115789a8 Fix builds with pkg 153
Jon Tibble <meths@btinternet.com>
parents:
diff changeset 
     3
 
+++ b/usr/src/pkg/Makefile	Thu Dec 02 04:34:32 2010 -0800
f949115789a8 Fix builds with pkg 153
Jon Tibble <meths@btinternet.com>
parents:
diff changeset 
     4
 
@@ -36,6 +36,10 @@
f949115789a8 Fix builds with pkg 153
Jon Tibble <meths@btinternet.com>
parents:
diff changeset 
     5
 
 PKGARCH64_sparc=sparcv9
f949115789a8 Fix builds with pkg 153
Jon Tibble <meths@btinternet.com>
parents:
diff changeset 
     6
 
 PKGARCH64_i386=amd64
f949115789a8 Fix builds with pkg 153
Jon Tibble <meths@btinternet.com>
parents:
diff changeset 
     7
f949115789a8 Fix builds with pkg 153
Jon Tibble <meths@btinternet.com>
parents:
diff changeset 
     8
 
+# Root of pkg image to use for dependency resolution
f949115789a8 Fix builds with pkg 153
Jon Tibble <meths@btinternet.com>
parents:
diff changeset 
     9
 
+# Normally / on the machine used to build the binaries
f949115789a8 Fix builds with pkg 153
Jon Tibble <meths@btinternet.com>
parents:
diff changeset 
    10
 
+PKGDEP_RESOLVE_IMAGE = /
f949115789a8 Fix builds with pkg 153
Jon Tibble <meths@btinternet.com>
parents:
diff changeset 
    11
 
+
f949115789a8 Fix builds with pkg 153
Jon Tibble <meths@btinternet.com>
parents:
diff changeset 
    12
 
 # The name of the package repo in $(PKG_DIR)
f949115789a8 Fix builds with pkg 153
Jon Tibble <meths@btinternet.com>
parents:
diff changeset 
    13
 
 PKGPUBLISHER_normal :sh= /usr/bin/uname -n
f949115789a8 Fix builds with pkg 153
Jon Tibble <meths@btinternet.com>
parents:
diff changeset 
    14
 
 PKGPUBLISHER_wos = vpanels
f949115789a8 Fix builds with pkg 153
Jon Tibble <meths@btinternet.com>
parents:
diff changeset 
    15
 
@@ -162,7 +166,7 @@
f949115789a8 Fix builds with pkg 153
Jon Tibble <meths@btinternet.com>
parents:
diff changeset 
    16
 
 #
f949115789a8 Fix builds with pkg 153
Jon Tibble <meths@btinternet.com>
parents:
diff changeset 
    17
f949115789a8 Fix builds with pkg 153
Jon Tibble <meths@btinternet.com>
parents:
diff changeset 
    18
 
 $(RESS): $(DEPS)
f949115789a8 Fix builds with pkg 153
Jon Tibble <meths@btinternet.com>
parents:
diff changeset 
    19
 
-	pkgdepend resolve -m $(DEPS)
f949115789a8 Fix builds with pkg 153
Jon Tibble <meths@btinternet.com>
parents:
diff changeset 
    20
 
+	pkgdepend -R $(PKGDEP_RESOLVE_IMAGE) resolve -m $(DEPS)
f949115789a8 Fix builds with pkg 153
Jon Tibble <meths@btinternet.com>
parents:
diff changeset 
    21
f949115789a8 Fix builds with pkg 153
Jon Tibble <meths@btinternet.com>
parents:
diff changeset 
    22
 
 #
f949115789a8 Fix builds with pkg 153
Jon Tibble <meths@btinternet.com>
parents:
diff changeset 
    23
 
 # Step 5a
patch-queues/mq_vpanels