com php-fuzzing-sapi: Generalize build configs: Makefile.frag config.m4

From: Date: Thu, 07 Mar 2019 07:49:20 +0000
Subject: com php-fuzzing-sapi: Generalize build configs: Makefile.frag config.m4
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-105118@lists.php.net to get a copy of this message
Commit: 69ffaf2606df66b33a522ce4f9757551c93a29d0 Author: Stanislav Malyshev <smalyshev@gmail.com> Wed, 6 Mar 2019 23:49:20 -0800 Parents: caa9bfbd8ec9bdcd6fa21a627d86eb2666ff14f5 Branches: master Link: http://git.php.net/?p=php-fuzzing-sapi.git;a=commitdiff;h=69ffaf2606df66b33a522ce4f9757551c93a29d0 Log: Generalize build configs Eventually I hope to learn enough autoconf magic to reduce the boilerplate even more. Changed paths: M Makefile.frag M config..m4 Diff: diff --git a/Makefile.frag b/Makefile.frag index 2f5a7dd..35ca37c 100644 --- a/Makefile.frag +++ b/Makefile.frag @@ -1,13 +1,15 @@ fuzzer: $(PHP_FUZZER_BINARIES) +FUZZER_BUILD = $(LIBTOOL) --mode=link $(FUZZING_CC) -export-dynamic $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS_PROGRAM) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) $(FUZZING_LIB) + $(SAPI_FUZZER_PATH)/php-fuzz-parser: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(PHP_FUZZER_PARSER_OBJS) - $(LIBTOOL) --mode=link $(FUZZING_CC) -export-dynamic $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS_PROGRAM) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FUZZER_PARSER_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) $(FUZZING_LIB) -o $(SAPI_FUZZER_PATH)/php-fuzz-parser + $(FUZZER_BUILD) $(PHP_FUZZER_PARSER_OBJS) -o $@ $(SAPI_FUZZER_PATH)/php-fuzz-unserialize: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(PHP_FUZZER_UNSERIALIZE_OBJS) - $(LIBTOOL) --mode=link $(FUZZING_CC) -export-dynamic $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS_PROGRAM) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FUZZER_UNSERIALIZE_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) $(FUZZING_LIB) -o $(SAPI_FUZZER_PATH)/php-fuzz-unserialize + $(FUZZER_BUILD) $(PHP_FUZZER_UNSERIALIZE_OBJS) -o $@ $(SAPI_FUZZER_PATH)/php-fuzz-json: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(PHP_FUZZER_JSON_OBJS) - $(LIBTOOL) --mode=link $(FUZZING_CC) -export-dynamic $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS_PROGRAM) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FUZZER_JSON_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) $(FUZZING_LIB) -o $(SAPI_FUZZER_PATH)/php-fuzz-json + $(FUZZER_BUILD) $(PHP_FUZZER_JSON_OBJS) -o $@ $(SAPI_FUZZER_PATH)/php-fuzz-exif: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(PHP_FUZZER_EXIF_OBJS) - $(LIBTOOL) --mode=link $(FUZZING_CC) -export-dynamic $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS_PROGRAM) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FUZZER_EXIF_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) $(FUZZING_LIB) -o $(SAPI_FUZZER_PATH)/php-fuzz-exif + $(FUZZER_BUILD) $(PHP_FUZZER_EXIF_OBJS) -o $@ diff --git a/config.m4 b/config.m4 index 78e3e16..0a937d4 100644 --- a/config.m4 +++ b/config.m4 @@ -6,6 +6,15 @@ PHP_ARG_ENABLE(fuzzer,, dnl For newer clang versions see https://llvm.org/docs/LibFuzzer.html#fuzzer-usage dnl for relevant flags. +dnl Macro to define fuzzing target +dnl FUZZER_TARGET(name, target-var) +dnl +AC_DEFUN([FUZZER_TARGET], [ + PHP_FUZZER_BINARIES="$PHP_FUZZER_BINARIES $SAPI_FUZZER_PATH/php-fuzz-$1" + PHP_SUBST($2) + PHP_ADD_SOURCES_X([sapi/fuzzer],[fuzzer-$1.c fuzzer-sapi.c],[],$2) +]) + if test "$PHP_FUZZER" != "no"; then PHP_REQUIRE_CXX() PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/fuzzer/Makefile.frag) @@ -32,25 +41,16 @@ if test "$PHP_FUZZER" != "no"; then PHP_ADD_BUILD_DIR([sapi/fuzzer]) PHP_BINARIES="$PHP_BINARIES fuzzer" + PHP_FUZZER_BINARIES="" PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS fuzzer" - PHP_FUZZER_BINARIES="$SAPI_FUZZER_PATH/php-fuzz-parser" - PHP_SUBST(PHP_FUZZER_PARSER_OBJS) - PHP_ADD_SOURCES_X([sapi/fuzzer],[fuzzer-parser.c fuzzer-sapi.c],[],PHP_FUZZER_PARSER_OBJS) + FUZZER_TARGET([parser], PHP_FUZZER_PARSER_OBJS) + FUZZER_TARGET([unserialize], PHP_FUZZER_UNSERIALIZE_OBJS) + FUZZER_TARGET([exif], PHP_FUZZER_EXIF_OBJS) - PHP_FUZZER_BINARIES="$PHP_FUZZER_BINARIES $SAPI_FUZZER_PATH/php-fuzz-unserialize" - PHP_SUBST(PHP_FUZZER_UNSERIALIZE_OBJS) - PHP_ADD_SOURCES_X([sapi/fuzzer],[fuzzer-unserialize.c fuzzer-sapi.c],[],PHP_FUZZER_UNSERIALIZE_OBJS) - - PHP_FUZZER_BINARIES="$PHP_FUZZER_BINARIES $SAPI_FUZZER_PATH/php-fuzz-exif" - PHP_SUBST(PHP_FUZZER_EXIF_OBJS) - PHP_ADD_SOURCES_X([sapi/fuzzer],[fuzzer-exif..c fuzzer-sapi.c],[],PHP_FUZZER_EXIF_OBJS) - dnl This check doesn't work, as PHP_ARG_ENABLE(json) comes later ... if test "$PHP_JSON" != "no"; then - PHP_FUZZER_BINARIES="$PHP_FUZZER_BINARIES $SAPI_FUZZER_PATH/php-fuzz-json" - PHP_SUBST(PHP_FUZZER_JSON_OBJS) - PHP_ADD_SOURCES_X([sapi/fuzzer],[fuzzer-json.c fuzzer-sapi.c],[],PHP_FUZZER_JSON_OBJS) + FUZZER_TARGET([json], PHP_FUZZER_JSON_OBJS) fi PHP_SUBST(PHP_FUZZER_BINARIES)

« previous php.cvs (#105118) next »