Permalink
Browse files

OS-1370 pass V=1 or equivalent to -extra components whenever possible

OS-1371 node 0.8 disregards build environment that worked in 0.6
  • Loading branch information...
1 parent d417a6e commit d6b1b5489f14531a734d82bc7f2e2870b457d23a @wesolows wesolows committed Jul 5, 2012
Showing with 15 additions and 1 deletion.
  1. +2 −0 .gitignore
  2. +3 −0 Makefile.defs
  3. +10 −1 node.js/Makefile
View
2 .gitignore
@@ -1,6 +1,7 @@
/bash/bash-4.1-32
/bind/bind-9.8.0-32
/bzip2/bzip2-1.0.6
+/bzip2/bzgrep.tmp
/coreutils/coreutils-8.13-32
/curl/curl-7.21.2-32
/dialog/dialog-1.1-20111020-32
@@ -21,6 +22,7 @@
/gnupg/gnupg-1.4.11-32
/gtar/tar-1.23-32
/gzip/gzip-1.3.5-32
+/ipmitool/ipmitool-1.8.11-32
/less/less-436-32
/libexpat/expat-2.0.1-32
/libexpat/expat-2.0.1-64
View
3 Makefile.defs
@@ -30,6 +30,7 @@ PATH = $(DESTDIR)/usr/bin:/usr/bin:/usr/sbin:/sbin:/opt/local/bin
MAKE = gmake
PARALLEL = -j128
+MAKE_VERBOSE = V=1
GCC = $(DESTDIR)/usr/bin/gcc
GXX = $(DESTDIR)/usr/bin/g++
GCC.64 = $(GCC) -m64
@@ -87,6 +88,8 @@ AUTOCONF_OPTS = \
AUTOCONF_OPTS.64 = \
$(AUTOCONF_OPTS)
+OVERRIDES = $(MAKE_VERBOSE)
+
TARBALL = $(VER).tar.gz
TARBALL_COMPRESS = -z
View
11 node.js/Makefile
@@ -26,6 +26,8 @@ VER = node-v0.8.0
include ../Makefile.defs
+CFLAGS += -Wno-unknown-pragmas
+
AUTOCONF_OPTS += \
--with-dtrace \
--openssl-use-sys \
@@ -36,6 +38,12 @@ AUTOCONF_OPTS += \
--shared-zlib-includes=$(DESTDIR)/usr/include \
--prefix=/usr/node/$(MAJOR_VER)
+AUTOCONF_CFLAGS = CFLAGS="$(CPPFLAGS) $(CFLAGS)"
+AUTOCONF_LIBS =
+AUTOCONF_ENV += CXXFLAGS="$(CPPFLAGS) $(CFLAGS)"
+
+OVERRIDES += $(AUTOCONF_ENV)
+
AUTOCONF_OUT = build/default/config.h
# - platform_node_version.js is autogenerated with the current node version
@@ -46,7 +54,8 @@ install: all
$(DESTDIR)/usr/node/$(MAJOR_VER)/bin/node \
$(DESTDIR)/usr/node/$(MAJOR_VER)/node_modules/platform_node_version.js
rm -rf $(DESTDIR)/usr/node/$(MAJOR_VER)/man
- mv $(DESTDIR)/usr/node/$(MAJOR_VER)/share/man $(DESTDIR)/usr/node/$(MAJOR_VER)/
+ mv $(DESTDIR)/usr/node/$(MAJOR_VER)/share/man \
+ $(DESTDIR)/usr/node/$(MAJOR_VER)/
include ../Makefile.targ
include ../Makefile.targ.autoconf

0 comments on commit d6b1b54

Please sign in to comment.