archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Added --debug option to buildconf

Browse source
This commit is contained in:
foobar 2005-01-19 23:03:29 +00:00
parent ed25ab62f5
commit 52e00b8f03
2 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
build/build2.mk
View file

@ -32,6 +32,11 @@ acconfig_h_SOURCES = acconfig.h.in $(config_h_files)
targets = $(TOUCH_FILES) configure $(config_h_in) targets = $(TOUCH_FILES) configure $(config_h_in)
ifeq ($(SHOW_WARNINGS), no)
SUPPRESS_WARNINGS = 2>&1 | (egrep -v '(AC_TRY_RUN called without default to allow cross compiling|AC_PROG_CXXCPP was called before AC_PROG_CXX|defined in acinclude.m4 but never used|AC_PROG_LEX invoked multiple times|AC_DECL_YYTEXT is expanded from...|the top level)'||true)
libtoolize_flags = --automake
endif
all: $(targets) all: $(targets)
@ -39,14 +44,12 @@ acconfig.h: $(acconfig_h_SOURCES)
@echo rebuilding $@ @echo rebuilding $@
cat $(acconfig_h_SOURCES) > $@ cat $(acconfig_h_SOURCES) > $@
SUPPRESS_WARNINGS = (egrep -v '(AC_TRY_RUN called without default to allow cross compiling|AC_PROG_CXXCPP was called before AC_PROG_CXX|defined in acinclude.m4 but never used|AC_PROG_LEX invoked multiple times)'||true)
$(config_h_in): configure acconfig.h $(config_h_in): configure acconfig.h
# explicitly remove target since autoheader does not seem to work # explicitly remove target since autoheader does not seem to work
# correctly otherwise (timestamps are not updated) # correctly otherwise (timestamps are not updated)
@echo rebuilding $@ @echo rebuilding $@
@rm -f $@ @rm -f $@
@autoheader 2>&1 | $(SUPPRESS_WARNINGS) @autoheader $(SUPPRESS_WARNINGS)
$(TOUCH_FILES): $(TOUCH_FILES):
touch $(TOUCH_FILES) touch $(TOUCH_FILES)
@ -54,11 +57,11 @@ $(TOUCH_FILES):
aclocal.m4: configure.in acinclude.m4 aclocal.m4: configure.in acinclude.m4
@echo rebuilding $@ @echo rebuilding $@
@libtoolize=`./build/shtool path glibtoolize libtoolize`; \ @libtoolize=`./build/shtool path glibtoolize libtoolize`; \
$$libtoolize --copy --automake; \ $$libtoolize --copy $(libtoolize_flags); \
ltpath=`dirname $$libtoolize`; \ ltpath=`dirname $$libtoolize`; \
ltfile=`cd $$ltpath/../share/aclocal; pwd`/libtool.m4; \ ltfile=`cd $$ltpath/../share/aclocal; pwd`/libtool.m4; \
cat acinclude.m4 $$ltfile > $@ cat acinclude.m4 $$ltfile > $@
configure: aclocal.m4 configure.in $(config_m4_files) configure: aclocal.m4 configure.in $(config_m4_files)
@echo rebuilding $@ @echo rebuilding $@
@autoconf 2>&1 | $(SUPPRESS_WARNINGS) @autoconf $(SUPPRESS_WARNINGS)

9
buildconf
View file

@ -12,6 +12,7 @@ case "$EXTRA_VERSION" in
esac esac
devok=0 devok=0
debug=no
while test $# -gt 0; do while test $# -gt 0; do
if test "$1" = "--copy"; then if test "$1" = "--copy"; then
@ -23,6 +24,10 @@ while test $# -gt 0; do
echo "Forcing buildconf" echo "Forcing buildconf"
fi fi
if test "$1" = "--debug"; then
debug=yes
fi
shift shift
done done
@ -48,7 +53,7 @@ if test -z "$ZENDDIR"; then
fi fi
else else
if test -r "Zend/zend_execute_globals.h"; then if test -r "Zend/zend_execute_globals.h"; then
: :
else else
mv Zend ZendEngine2 2>/dev/null mv Zend ZendEngine2 2>/dev/null
mv ZendEngine1 Zend mv ZendEngine1 Zend
@ -61,4 +66,4 @@ fi
rm -f generated_lists rm -f generated_lists
${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags" ZENDDIR="$ZENDDIR" ${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags" ZENDDIR="$ZENDDIR" SHOW_WARNINGS="$debug"