Attachment #356738 for bug #425132

Lines 5-13 Link Here

(-)a/deps/eleveldb/rebar.config (-3 / +3 lines)
5		5
6	{port_env, [	6	{port_env, [
7	%% Make sure to set -fPIC when compiling leveldb	7	%% Make sure to set -fPIC when compiling leveldb
8	{"CFLAGS", "$CFLAGS -Wall -O3 -fPIC"},	8	{"CFLAGS", "$CFLAGS -fPIC"},
9	{"CXXFLAGS", "$CXXFLAGS -Wall -O3 -fPIC"},	9	{"CXXFLAGS", "$CXXFLAGS -fPIC"},
10	{"DRV_CFLAGS", "$DRV_CFLAGS -O3 -Wall -I c_src/leveldb/include"},	10	{"DRV_CFLAGS", "$DRV_CFLAGS -I c_src/leveldb/include"},
11	{"DRV_LDFLAGS", "$DRV_LDFLAGS c_src/leveldb/libleveldb.a c_src/system/lib/libsnappy.a -lstdc++"}	11	{"DRV_LDFLAGS", "$DRV_LDFLAGS c_src/leveldb/libleveldb.a c_src/system/lib/libsnappy.a -lstdc++"}
12	]}.	12	]}.

Lines 9-17 Link Here

(-)a/deps/eleveldb/c_src/leveldb/Makefile (-1 / +2 lines)
9	# Uncomment exactly one of the lines labelled (A), (B), and (C) below	9	# Uncomment exactly one of the lines labelled (A), (B), and (C) below
10	# to switch between compilation modes.	10	# to switch between compilation modes.
11		11
12	OPT ?= -O2 -g -DNDEBUG # (A) Production use (optimized mode)	12	# OPT ?= -O2 -g -DNDEBUG # (A) Production use (optimized mode)
13	# OPT ?= -g2 # (B) Debug mode, w/ full line-level debugging symbols	13	# OPT ?= -g2 # (B) Debug mode, w/ full line-level debugging symbols
14	# OPT ?= -O2 -g2 -DNDEBUG # (C) Profiling mode: opt, but w/debugging symbols	14	# OPT ?= -O2 -g2 -DNDEBUG # (C) Profiling mode: opt, but w/debugging symbols
		15	OPT ?= # (D) Honor system flags mode
15	#-----------------------------------------------	16	#-----------------------------------------------
16		17
17	# detect what platform we're building on	18	# detect what platform we're building on
18		19




  CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
  if test "$GCC" = yes; then
    CFLAGS=
  else
    CFLAGS="-g"
  fi
else
  if test "$GCC" = yes; then
    CFLAGS=
  else
    CFLAGS=
  fi

  CXXFLAGS=$ac_save_CXXFLAGS
elif test $ac_cv_prog_cxx_g = yes; then
  if test "$GXX" = yes; then
    CXXFLAGS=
  else
    CXXFLAGS="-g"
  fi
else
  if test "$GXX" = yes; then
    CXXFLAGS=
  else
    CXXFLAGS=
  fi

  CXXFLAGS=$ac_save_CXXFLAGS
elif test $ac_cv_prog_cxx_g = yes; then
  if test "$GXX" = yes; then
    CXXFLAGS=
  else
    CXXFLAGS="-g"
  fi
else
  if test "$GXX" = yes; then
    CXXFLAGS=
  else
    CXXFLAGS=
  fi

Lines 56-65 Link Here

(-)a/deps/eleveldb/c_src/build_deps.sh (-2 / +1 lines)
56	*)	56	*)
57	if [ ! -d snappy-$SNAPPY_VSN ]; then	57	if [ ! -d snappy-$SNAPPY_VSN ]; then
58	tar -xzf snappy-$SNAPPY_VSN.tar.gz	58	tar -xzf snappy-$SNAPPY_VSN.tar.gz
59	(cd snappy-$SNAPPY_VSN && ./configure --prefix=$BASEDIR/system --with-pic)
60	fi	59	fi
61		60
62	(cd snappy-$SNAPPY_VSN && $MAKE && $MAKE install)	61	(cd snappy-$SNAPPY_VSN && ./configure --prefix=$BASEDIR/system --with-pic && $MAKE && $MAKE install)
63		62
64	export CFLAGS="$CFLAGS -I $BASEDIR/system/include"	63	export CFLAGS="$CFLAGS -I $BASEDIR/system/include"
65	export CXXFLAGS="$CXXFLAGS -I $BASEDIR/system/include"	64	export CXXFLAGS="$CXXFLAGS -I $BASEDIR/system/include"




js: $(LIB_DIR)/libjs.a

$(LIB_DIR)/libjs.a: $(LIB_DIR)/libnspr4.a
	$(GUNZIP) -c js-$(SMONKEY_VER).tar.gz | $(TAR) xf -
	@for I in patches/js-*.patch; do \
		($(PATCH) -p1 < $${I} || echo "Skipping patch"); \
	done
	@$(MAKE) -C $(JS_DIR)/src JS_DIST=$(SYSTEM_DIR) \
		JS_THREADSAFE=1 \
		XCFLAGS="-DHAVE_VA_COPY -DVA_COPY=va_copy $(CFLAGS)" \
		XLDFLAGS="$(LDFLAGS)" \
		-f Makefile.ref
	@mkdir $(INC_DIR)/js
	@cp $(JS_DIR)/src/*.h $(INC_DIR)/js
	@cp $(JS_DIR)/src/*.tbl $(INC_DIR)/js
	@cp $(JS_DIR)/src/*_DBG.OBJ/*.h $(INC_DIR)/js
	@cp $(JS_DIR)/src/*_DBG.OBJ/libjs.a $(LIB_DIR)

$(LIB_DIR)/libnspr4.a:
	$(GUNZIP) -c nsprpub-$(NSPR_VER).tar.gz | $(TAR) xf -

		($(PATCH) -p1 < $${I} || echo "Skipping patch"); \
	done
	(cd $(NSPR_DIR) && \
	 ./configure --disable-debug \
                     --prefix=$(SYSTEM_DIR) $(NSPR_SIXTYFOUR) && \
         $(MAKE) all install)




INTERP_OPTIMIZER = -O2 -GL
LDFLAGS    += -LTCG
else
OPTIMIZER  =
INTERP_OPTIMIZER =
endif
DEFINES    += -UDEBUG -DNDEBUG -UDEBUG_$(USER)
OBJDIR_TAG = _OPT

OPTIMIZER  = -Zi
INTERP_OPTIMIZER = -Zi
else
OPTIMIZER  =
INTERP_OPTIMIZER =
endif
DEFINES    += -DDEBUG -DDEBUG_$(USER)
OBJDIR_TAG = _DB

Return to bug 425132

Lines 3930-3942 Link Here

(-)a/deps/eleveldb/c_src/snappy-1.0.4/configure (-6 / +6 lines)
3930	CFLAGS=$ac_save_CFLAGS	3930	CFLAGS=$ac_save_CFLAGS
3931	elif test $ac_cv_prog_cc_g = yes; then	3931	elif test $ac_cv_prog_cc_g = yes; then
3932	if test "$GCC" = yes; then	3932	if test "$GCC" = yes; then
3933	CFLAGS="-g -O2"	3933	CFLAGS=
3934	else	3934	else
3935	CFLAGS="-g"	3935	CFLAGS="-g"
3936	fi	3936	fi
3937	else	3937	else
3938	if test "$GCC" = yes; then	3938	if test "$GCC" = yes; then
3939	CFLAGS="-O2"	3939	CFLAGS=
3940	else	3940	else
3941	CFLAGS=	3941	CFLAGS=
3942	fi	3942	fi
Lines 10934-10946 Link Here
10934	CXXFLAGS=$ac_save_CXXFLAGS	10934	CXXFLAGS=$ac_save_CXXFLAGS
10935	elif test $ac_cv_prog_cxx_g = yes; then	10935	elif test $ac_cv_prog_cxx_g = yes; then
10936	if test "$GXX" = yes; then	10936	if test "$GXX" = yes; then
10937	CXXFLAGS="-g -O2"	10937	CXXFLAGS=
10938	else	10938	else
10939	CXXFLAGS="-g"	10939	CXXFLAGS="-g"
10940	fi	10940	fi
10941	else	10941	else
10942	if test "$GXX" = yes; then	10942	if test "$GXX" = yes; then
10943	CXXFLAGS="-O2"	10943	CXXFLAGS=
10944	else	10944	else
10945	CXXFLAGS=	10945	CXXFLAGS=
10946	fi	10946	fi
Lines 11319-11331 Link Here
11319	CXXFLAGS=$ac_save_CXXFLAGS	11319	CXXFLAGS=$ac_save_CXXFLAGS
11320	elif test $ac_cv_prog_cxx_g = yes; then	11320	elif test $ac_cv_prog_cxx_g = yes; then
11321	if test "$GXX" = yes; then	11321	if test "$GXX" = yes; then
11322	CXXFLAGS="-g -O2"	11322	CXXFLAGS=
11323	else	11323	else
11324	CXXFLAGS="-g"	11324	CXXFLAGS="-g"
11325	fi	11325	fi
11326	else	11326	else
11327	if test "$GXX" = yes; then	11327	if test "$GXX" = yes; then
11328	CXXFLAGS="-O2"	11328	CXXFLAGS=
11329	else	11329	else
11330	CXXFLAGS=	11330	CXXFLAGS=
11331	fi	11331	fi

Lines 122-129 Link Here

(-)a/deps/erlang_js/c_src/js/src/config.mk (-4 / +4 lines)
122	INTERP_OPTIMIZER = -O2 -GL	122	INTERP_OPTIMIZER = -O2 -GL
123	LDFLAGS += -LTCG	123	LDFLAGS += -LTCG
124	else	124	else
125	OPTIMIZER = -Os	125	OPTIMIZER =
126	INTERP_OPTIMIZER = -Os	126	INTERP_OPTIMIZER =
127	endif	127	endif
128	DEFINES += -UDEBUG -DNDEBUG -UDEBUG_$(USER)	128	DEFINES += -UDEBUG -DNDEBUG -UDEBUG_$(USER)
129	OBJDIR_TAG = _OPT	129	OBJDIR_TAG = _OPT
Lines 132-139 Link Here
132	OPTIMIZER = -Zi	132	OPTIMIZER = -Zi
133	INTERP_OPTIMIZER = -Zi	133	INTERP_OPTIMIZER = -Zi
134	else	134	else
135	OPTIMIZER = -g3	135	OPTIMIZER =
136	INTERP_OPTIMIZER = -g3	136	INTERP_OPTIMIZER =
137	endif	137	endif
138	DEFINES += -DDEBUG -DDEBUG_$(USER)	138	DEFINES += -DDEBUG -DDEBUG_$(USER)
139	OBJDIR_TAG = _DB	139	OBJDIR_TAG = _DB

Lines 25-44 Link Here

(-)a/deps/erlang_js/c_src/Makefile (-6 / +4 lines)
25	js: $(LIB_DIR)/libjs.a	25	js: $(LIB_DIR)/libjs.a
26		26
27	$(LIB_DIR)/libjs.a: $(LIB_DIR)/libnspr4.a	27	$(LIB_DIR)/libjs.a: $(LIB_DIR)/libnspr4.a
28	$(GUNZIP) -c js-$(SMONKEY_VER).tar.gz \| $(TAR) xf -
29	@for I in patches/js-*.patch; do \	28	@for I in patches/js-*.patch; do \
30	($(PATCH) -p1 < $${I} \|\| echo "Skipping patch"); \	29	($(PATCH) -p1 < $${I} \|\| echo "Skipping patch"); \
31	done	30	done
32	@$(MAKE) -C $(JS_DIR)/src BUILD_OPT=1 JS_DIST=$(SYSTEM_DIR) \	31	@$(MAKE) -C $(JS_DIR)/src JS_DIST=$(SYSTEM_DIR) \
33	JS_THREADSAFE=1 \	32	JS_THREADSAFE=1 \
34	XCFLAGS="-DHAVE_VA_COPY -DVA_COPY=va_copy $(CFLAGS)" \	33	XCFLAGS="-DHAVE_VA_COPY -DVA_COPY=va_copy $(CFLAGS)" \
35	XLDFLAGS="$(LDFLAGS)" \
36	-f Makefile.ref	34	-f Makefile.ref
37	@mkdir $(INC_DIR)/js	35	@mkdir $(INC_DIR)/js
38	@cp $(JS_DIR)/src/*.h $(INC_DIR)/js	36	@cp $(JS_DIR)/src/*.h $(INC_DIR)/js
39	@cp $(JS_DIR)/src/*.tbl $(INC_DIR)/js	37	@cp $(JS_DIR)/src/*.tbl $(INC_DIR)/js
40	@cp $(JS_DIR)/src/_OPT.OBJ/.h $(INC_DIR)/js	38	@cp $(JS_DIR)/src/_DBG.OBJ/.h $(INC_DIR)/js
41	@cp $(JS_DIR)/src/*_OPT.OBJ/libjs.a $(LIB_DIR)	39	@cp $(JS_DIR)/src/*_DBG.OBJ/libjs.a $(LIB_DIR)
42		40
43	$(LIB_DIR)/libnspr4.a:	41	$(LIB_DIR)/libnspr4.a:
44	$(GUNZIP) -c nsprpub-$(NSPR_VER).tar.gz \| $(TAR) xf -	42	$(GUNZIP) -c nsprpub-$(NSPR_VER).tar.gz \| $(TAR) xf -
Lines 46-52 Link Here
46	($(PATCH) -p1 < $${I} \|\| echo "Skipping patch"); \	44	($(PATCH) -p1 < $${I} \|\| echo "Skipping patch"); \
47	done	45	done
48	(cd $(NSPR_DIR) && \	46	(cd $(NSPR_DIR) && \
49	./configure --disable-debug --enable-optimize \	47	./configure --disable-debug \
50	--prefix=$(SYSTEM_DIR) $(NSPR_SIXTYFOUR) && \	48	--prefix=$(SYSTEM_DIR) $(NSPR_SIXTYFOUR) && \
51	$(MAKE) all install)	49	$(MAKE) all install)